Changeset 64 for trunk/Forms

Timestamp:

Jul 26, 2016, 5:48:35 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Main form was unexpectedly initialized and project reopened if main form was hidden to system tray and shown again.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (10 diffs)
• UFormMain.pas (modified) (4 diffs)

trunk/Forms/UFormMain.lfm

@@ -793 +793 @@
       ImageIndex = 8
       OnExecute = AFileOpenExecute
+      ShortCut = 16463
     end
     object AFileNew: TAction
@@ -798 +799 @@
       ImageIndex = 16
       OnExecute = AFileNewExecute
+      ShortCut = 16462
     end
     object AFileSave: TAction
@@ -803 +805 @@
       ImageIndex = 10
       OnExecute = AFileSaveExecute
+      ShortCut = 16467
     end
     object AFileClose: TAction
@@ -813 +816 @@
       ImageIndex = 10
       OnExecute = AFileSaveAsExecute
+      ShortCut = 24659
     end
     object ASettings: TAction
@@ -818 +822 @@
       ImageIndex = 6
       OnExecute = ASettingsExecute
+      ShortCut = 121
     end
     object AShowCategories: TAction
@@ -823 +828 @@
       ImageIndex = 11
       OnExecute = AShowCategoriesExecute
+      ShortCut = 116
     end
     object AShowAcronyms: TAction
@@ -828 +834 @@
       ImageIndex = 15
       OnExecute = AShowAcronymsExecute
+      ShortCut = 115
     end
     object AShowImportSources: TAction
@@ -833 +840 @@
       ImageIndex = 13
       OnExecute = AShowImportSourcesExecute
+      ShortCut = 117
     end
     object AShowAbout: TAction
@@ -843 +851 @@
       ImageIndex = 14
       OnExecute = AShowImportFormatsExecute
+      ShortCut = 118
     end
     object AProcessImports: TAction
@@ -848 +857 @@
       ImageIndex = 5
       OnExecute = AProcessImportsExecute
+      ShortCut = 119
     end
   end

trunk/Forms/UFormMain.pas

@@ -119 +119 @@
     procedure TrayIcon1Click(Sender: TObject);
   private
+    Initialized: Boolean;
     FAlwaysOnTop: Boolean;
     RegistryContext: TRegistryContext;
     ProjectClosed: Boolean;
     ImportTotalItemCount: Integer;
+    procedure Initialize;
     procedure ProcessImportsJob(Job: TJob);
     procedure SetAlwaysOnTop(AValue: Boolean);
@@ -166 +168 @@
 
 procedure TFormMain.FormCreate(Sender: TObject);
+var
+  I: Integer;
 begin
   AcronymDb := TAcronymDb.Create;
+  Initialized := False;
+  for I := 0 to ToolBar1.ButtonCount - 1 do
+    ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
 end;
 
@@ -362 +369 @@
 
 procedure TFormMain.FormShow(Sender: TObject);
-var
-  I: Integer;
-begin
-  LoadConfig;
+begin
+  Initialize;
+
   PersistentForm1.Load(Self);
-
-  if ParamCount > 0 then begin
-    AcronymDB.LoadFromFile(ParamStr(1));
-    LastOpenedList1.AddItem(OpenDialog1.FileName);
-  end else
-  if (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then
-    AcronymDB.LoadFromFile(LastOpenedList1.Items[0]);
-  UpdateAcronymsList;
-  ListViewFilter1.UpdateFromListView(ListViewAcronyms);
-  UpdateInterface;
-  for I := 0 to ToolBar1.ButtonCount - 1 do
-    ToolBar1.Buttons[I].Hint := ToolBar1.Buttons[I].Caption;
+  UpdateInterface;
 end;
 
@@ -444 +439 @@
   Visible := not Visible;
   if Visible then BringToFront;
+end;
+
+procedure TFormMain.Initialize;
+begin
+  if not Initialized then begin
+    Initialized := True;
+    LoadConfig;
+
+    if ParamCount > 0 then begin
+      AcronymDB.LoadFromFile(ParamStr(1));
+      LastOpenedList1.AddItem(OpenDialog1.FileName);
+    end else
+    if (LastOpenedList1.Items.Count > 0) and FileExists(LastOpenedList1.Items[0]) then
+      AcronymDB.LoadFromFile(LastOpenedList1.Items[0]);
+    UpdateAcronymsList;
+    ListViewFilter1.UpdateFromListView(ListViewAcronyms);
+  end;
 end;