userdetect2alarmingautosfxaysaliacalllibchecksum-toolscolormanagercryptochatcurrency_converterdecoderdelphiutilsdistributeddpcstudiodpg2fastphpfileformatsfilter_foundryforestgridgameht46f47_simulatorindexer_suiteipe_artfile_utilsjavautilsjumperlightgamelogviewermusikboxmystic_houseoidconverteroidinfo_apioidinfo_new_designoidpluspersonal-webbasephp_antispamphp_clientchallengephp_guestbookphp_utilsplumbersprependrecyclebinunitsimple_log_eventsokobanspacemissionstackmanuuid_mac_utilsvgwhoisvnagwebcounterwinbugtrackeryt_downloader

BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /trunk/UserDetect2/UD2_Main.pas @ 80

  → /trunk/UserDetect2/UD2_Main.pas @ 81

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 80 → Rev 81

/trunk/UserDetect2/UD2_Main.pas
8,6 → 8,10
{$INCLUDE 'UserDetect2.inc'}
{$WARN UNSAFE_CODE OFF}
{$WARN UNSAFE_TYPE OFF}
{$WARN UNSAFE_CAST OFF}
uses
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
Dialogs, StdCtrls, Grids, ValEdit, UD2_Obj, ComCtrls, ImgList, ExtCtrls,
60,6 → 64,8
VersionLabel: TLabel;
LoadedPluginsPopupMenu: TPopupMenu;
MenuItem1: TMenuItem;
Panel2: TPanel;
Image2: TImage;
procedure FormDestroy(Sender: TObject);
procedure FormShow(Sender: TObject);
procedure TasksListViewDblClick(Sender: TObject);
85,6 → 91,8
function GetIniFileName: string;
procedure DoRun(ShortTaskName: string);
procedure CheckForErrors;
public
procedure Run;
end;
var
125,7 → 133,7
resourcestring
LNG_FILE_NOT_FOUND = 'File "%s" not found.';
begin
if ParamCount >= 1 then
if (ParamCount >= 1) and not CheckBoolParam(1, 'C') then
begin
if FileExists(ParamStr(1)) then
begin
222,9 → 230,7
try
ud2.GetCommandList(ShortTaskName, slCmds);
if (slCmds.Count = 0) and
ud2.ReadMetatagBool(ShortTaskName,
TagWarnIfNothingMatches, DefaultWarnIfNothingMatches) then
if (slCmds.Count = 0) and ud2.ReadMetatagBool(ShortTaskName, TagWarnIfNothingMatches, DefaultWarnIfNothingMatches) then
begin
MessageDlg(LNG_NOTHING_MATCHES, mtWarning, [mbOK], 0);
ExitCode := EXITCODE_TASK_NOTHING_MATCHES;
234,7 → 240,7
begin
cmd := slCmds.Strings[i];
if cmd = '' then continue;
UD2_RunCMD(cmd, SW_NORMAL); // Idea: let SW_NORMAL be configurable by the user?
UD2_RunCMD(cmd, SW_NORMAL); // Idea: Let SW_NORMAL be configurable by the user?
end;
finally
slCmds.Free;
352,52 → 358,11
end;
procedure TUD2MainForm.FormShow(Sender: TObject);
resourcestring
LNG_SYNTAX = 'Syntax: %s [TaskDefinitionFile [TaskName]]';
var
LoadedIniFile: string;
begin
ExitCode := EXITCODE_OK;
// To avoid accidental changes from the GUI designer
// To avoid accidental change of the default tab from the IDE VCL Designer
PageControl1.ActivePage := TasksTabSheet;
if ((ParamCount = 1) and (ParamStr(1) = '/?')) or (ParamCount >= 3) then
begin
ExitCode := EXTICODE_SYNTAX_ERROR;
MessageDlg(Format(LNG_SYNTAX, [GetOwnCmdName]), mtInformation, [mbOK], 0);
Close;
Exit;
end;
LoadedIniFile := GetIniFileName;
if LoadedIniFile = '' then
begin
Close;
Exit;
end;
ud2 := TUD2.Create(LoadedIniFile);
ud2.HandlePluginDir('', '*.smp');
ud2.HandlePluginDir('Plugins', '*.smp');
ud2.HandlePluginDir('Plugins', '*.dll');
if ParamCount >= 2 then
begin
DoRun(ParamStr(2));
Close;
Exit;
end
else
begin
LoadTaskList;
LoadDetectedIDs;
LoadINITemplate;
LoadLoadedPluginList;
CheckForErrors;
end;
end;
procedure TUD2MainForm.TasksListViewDblClick(Sender: TObject);
var
obj: TUD2ListViewEntry;
518,4 → 483,76
Clipboard.AsText := s;
end;
procedure TUD2MainForm.Run;
resourcestring
LNG_SYNTAX = 'Syntax: %s [TaskDefinitionFile [/T TaskName] | /C IdentificationTerm [Command] | /?]';
var
LoadedIniFile: string;
begin
ExitCode := EXITCODE_OK;
if ((ParamCount = 1) and CheckBoolParam(1, '?')) or
(CheckBoolParam(2, 'T') and (ParamCount > 3)) or
(CheckBoolParam(1, 'C') and (ParamCount > 3)) or
(not CheckBoolParam(2, 'T') and not CheckBoolParam(1, 'C') and (ParamCount > 1)) then
begin
ExitCode := EXITCODE_SYNTAX_ERROR;
MessageDlg(Format(LNG_SYNTAX, [GetOwnCmdName]), mtInformation, [mbOK], 0);
Visible := false;
Close;
Exit;
end;
LoadedIniFile := GetIniFileName;
if LoadedIniFile = '' then
begin
Visible := false;
Close;
Exit;
end;
ud2 := TUD2.Create(LoadedIniFile);
ud2.HandlePluginDir('', '*.smp');
ud2.HandlePluginDir('Plugins', '*.smp');
ud2.HandlePluginDir('Plugins', '*.dll');
if CheckBoolParam(1, 'C') then
begin
if ud2.FulfilsEverySubterm(ParamStr(2)) then
begin
ExitCode := EXITCODE_OK;
if ParamStr(3) <> '' then UD2_RunCMD(ParamStr(3), SW_NORMAL); // Idea: SW_NORMAL changeable via parameter
end
else
begin
ExitCode := EXITCODE_TASK_NOTHING_MATCHES;
end;
Visible := false;
Close;
Exit;
end
else if CheckBoolParam(2, 'T') then
begin
DoRun(ParamStr(3));
Visible := false;
Close;
Exit;
end
else
begin
LoadTaskList;
LoadDetectedIDs;
LoadINITemplate;
LoadLoadedPluginList;
CheckForErrors;
Visible := true;
Exit;
end;
end;
end.