Changeset 75 for trunk

Timestamp:

Aug 2, 2016, 1:15:57 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Use option start minimized in system tray only in case of user logon.

Location:

trunk/Forms

Files:

• UFormMain.pas (modified) (5 diffs)
• UFormSettings.lfm (modified) (1 diff)
• UFormSettings.pas (modified) (5 diffs)

trunk/Forms/UFormMain.pas

@@ -124 +124 @@
     ProjectClosed: Boolean;
     ImportTotalItemCount: Integer;
+    function FindFirstNonOption: string;
     procedure ProjectOpen(FileName: string);
     procedure Initialize;
@@ -442 +443 @@
 end;
 
+function TFormMain.FindFirstNonOption: string;
+var
+  S: string;
+  I: Integer;
+begin
+  Result := '';
+  for I := 1 to Application.ParamCount do begin
+    S := Application.Params[I];
+    if S[1] = Application.OptionChar then Continue;
+    Result := S;
+    Break;
+  end;
+end;
+
 procedure TFormMain.ProjectOpen(FileName: string);
 begin
@@ -458 +473 @@
 
 procedure TFormMain.Initialize;
+var
+  FileNameOption: string;
 begin
   if not Initialized then begin
@@ -463 +480 @@
     LoadConfig;
 
-    if StartMinimizedToTray then Visible := False;
-
-    if ParamCount > 0 then begin
+{$IFDEF 0}
+    if Application.HasOption('h', 'help') then begin
+      WriteLn('AcronymDecoder <project file>');
+      WriteLn('  -t    --tray   Start minimized in system tray');
+      WriteLn('  -h    --help  Show this help');
+      Application.Terminate;
+      Exit;
+    end;
+{$ENDIF}
+    if Application.HasOption('t', 'tray') then begin
+      Visible := False;
+    end;
+
+    FileNameOption := FindFirstNonOption;
+    if FileNameOption <> '' then begin
       // Open file specified as command line parameter
-      AcronymDB.LoadFromFile(ParamStr(1));
+      AcronymDB.LoadFromFile(FileNameOption);
       LastOpenedList1.AddItem(OpenDialog1.FileName);
     end else
@@ -640 +669 @@
     RootKey := HKEY_CURRENT_USER;
     OpenKey(RegistryRunKey, True);
-    if StartOnLogon then WriteString('Acronym Decoder', Application.ExeName)
-      else DeleteValue('Acronym Decoder');
+    if StartOnLogon then begin
+      if StartMinimizedToTray then WriteString('Acronym Decoder', Application.ExeName + ' /t')
+        else WriteString('Acronym Decoder', Application.ExeName)
+    end else DeleteValue('Acronym Decoder');
   finally
     Free;

trunk/Forms/UFormSettings.lfm

@@ -62 +62 @@
     Width = 150
     Caption = 'Start on user logon'
+    OnChange = CheckBoxStartOnLogonChange
     TabOrder = 4
   end
   object CheckBoxStartMinimizedToTray: TCheckBox
-    Left = 16
+    Left = 48
     Height = 24
     Top = 128

trunk/Forms/UFormSettings.pas

@@ -22 +22 @@
     Label1: TLabel;
     procedure ButtonOkClick(Sender: TObject);
+    procedure CheckBoxStartOnLogonChange(Sender: TObject);
     procedure FormShow(Sender: TObject);
   private
@@ -28 +29 @@
     procedure Load;
     procedure Save;
+    procedure UpdateInterface;
   end;
 
@@ -55 +57 @@
 end;
 
+procedure TFormSettings.CheckBoxStartOnLogonChange(Sender: TObject);
+begin
+  UpdateInterface;
+end;
+
 procedure TFormSettings.Load;
 begin
@@ -60 +67 @@
   CheckBoxStartOnLogon.Checked := FormMain.StartOnLogon;
   CheckBoxStartMinimizedToTray.Checked := FormMain.StartMinimizedToTray;
+  UpdateInterface;
 end;
 
@@ -69 +77 @@
 end;
 
+procedure TFormSettings.UpdateInterface;
+begin
+  CheckBoxStartMinimizedToTray.Enabled := CheckBoxStartOnLogon.Checked;
+end;
+
 end.