Changes in trunk/Forms/UFormMain.pas [20:30]

File:

• trunk/Forms/UFormMain.pas (modified) (16 diffs)

trunk/Forms/UFormMain.pas ¶

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
-  ComCtrls, StdCtrls, ExtCtrls, ActnList, UAcronym, UPersistentForm, Contnrs,
+  ComCtrls, StdCtrls, ExtCtrls, ActnList, UAcronym, UPersistentForm,
   URegistry, ULastOpenedList, UListViewSort, UCoolTranslator, Registry,
   SpecializedList, LazUTF8;
@@ -16 +16 @@
 
   TFormMain = class(TForm)
+    AProcessImports: TAction;
+    AShowImportFormats: TAction;
+    AShowAbout: TAction;
     AShowImportSources: TAction;
     AShowAcronyms: TAction;
@@ -51 +54 @@
     MenuItem21: TMenuItem;
     MenuItem22: TMenuItem;
+    MenuItem23: TMenuItem;
+    MenuItem24: TMenuItem;
+    MenuItemToolbar: TMenuItem;
     MenuItem4: TMenuItem;
+    MenuItem5: TMenuItem;
+    MenuItem6: TMenuItem;
+    MenuItem7: TMenuItem;
     MenuItemOpenRecent: TMenuItem;
     MenuItem2: TMenuItem;
@@ -58 +67 @@
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
+    Panel1: TPanel;
     PersistentForm1: TPersistentForm;
     PopupMenuTryIcon: TPopupMenu;
     SaveDialog1: TSaveDialog;
+    ToolBar1: TToolBar;
+    ToolButton1: TToolButton;
+    ToolButton2: TToolButton;
+    ToolButton3: TToolButton;
+    ToolButton4: TToolButton;
+    ToolButton5: TToolButton;
+    ToolButton6: TToolButton;
+    ToolButton7: TToolButton;
+    ToolButton8: TToolButton;
     TrayIcon1: TTrayIcon;
     procedure AExitExecute(Sender: TObject);
@@ -69 +88 @@
     procedure AFileSaveExecute(Sender: TObject);
     procedure AImportExecute(Sender: TObject);
+    procedure AProcessImportsExecute(Sender: TObject);
     procedure ASettingsExecute(Sender: TObject);
+    procedure AShowAboutExecute(Sender: TObject);
     procedure AShowAcronymsExecute(Sender: TObject);
     procedure AShowCategoriesExecute(Sender: TObject);
     procedure AShowExecute(Sender: TObject);
+    procedure AShowImportFormatsExecute(Sender: TObject);
     procedure AShowImportSourcesExecute(Sender: TObject);
     procedure CheckBoxExactMathChange(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
+    procedure FormShow(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
     procedure FormCreate(Sender: TObject);
     procedure FormDestroy(Sender: TObject);
-    procedure FormShow(Sender: TObject);
     procedure LastOpenedList1Change(Sender: TObject);
     procedure ListViewAcronymsData(Sender: TObject; Item: TListItem);
@@ -88 +110 @@
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
+    procedure MenuItemToolbarClick(Sender: TObject);
     procedure TrayIcon1Click(Sender: TObject);
   private
@@ -109 +132 @@
   FormMain: TFormMain;
 
+resourcestring
+  SAddedCount = 'Imported %d acronyms';
+
+
 implementation
 
@@ -114 +141 @@
 
 uses
-  UFormImport, UFormAcronym, UFormSettings, UFormCategories, UFormAcronyms,
-  UFormImportSource, UFormImportSources;
+  UFormImport, UFormSettings, UFormCategories, UFormAcronyms,
+  UFormImportSources, UFormAbout, UFormImportFormats;
 
 resourcestring
@@ -239 +266 @@
 end;
 
+procedure TFormMain.AProcessImportsExecute(Sender: TObject);
+var
+  I: Integer;
+  TotalItemCount: Integer;
+begin
+  TotalItemCount := 0;
+  for I := 0 to AcronymDb.ImportSources.Count - 1 do
+  with TImportSource(AcronymDb.ImportSources[I]) do
+  if Enabled then begin
+    Process;
+    TotalItemCount := TotalItemCount + ItemCount;
+  end;
+  ShowMessage(Format(SAddedCount, [TotalItemCount]));
+  UpdateAcronymsList;
+  UpdateInterface;
+end;
+
 procedure TFormMain.ASettingsExecute(Sender: TObject);
 begin
@@ -246 +290 @@
 end;
 
+procedure TFormMain.AShowAboutExecute(Sender: TObject);
+begin
+  FormAbout.ShowModal;
+end;
+
 procedure TFormMain.AShowAcronymsExecute(Sender: TObject);
 begin
   FormAcronyms.ShowModal;
+  UpdateInterface;
 end;
 
@@ -264 +314 @@
 end;
 
+procedure TFormMain.AShowImportFormatsExecute(Sender: TObject);
+begin
+  FormImportFormats.ImportFormats := AcronymDb.ImportFormats;
+  FormImportFormats.ShowModal;
+  UpdateInterface;
+end;
+
 procedure TFormMain.AShowImportSourcesExecute(Sender: TObject);
 begin
@@ -286 +343 @@
   PersistentForm1.Load(Self);
 
-  if (LastOpenedList1.Items.Count > 0) and  FileExists(LastOpenedList1.Items[0]) then
+  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;
@@ -339 +400 @@
   AcronymDb.AssignToList(ListViewSort1.List);
   FilterList(ListViewSort1.List);
+end;
+
+procedure TFormMain.MenuItemToolbarClick(Sender: TObject);
+begin
+  MenuItemToolbar.Checked := not MenuItemToolbar.Checked;
+  UpdateInterface;
 end;
 
@@ -436 +503 @@
   AShowAcronyms.Enabled := Assigned(AcronymDb);
   AShowImportSources.Enabled := Assigned(AcronymDb);
+  ToolBar1.Visible := MenuItemToolbar.Checked;
 
   Title := Application.Title;
@@ -458 +526 @@
     AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
     CheckBoxExactMath.Checked := ReadBoolWithDefault('ExactMatch', False);
+    MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
   finally
     Free;
@@ -476 +545 @@
     WriteBool('AlwaysOnTop', AlwaysOnTop);
     WriteBool('ExactMatch', CheckBoxExactMath.Checked);
+    WriteBool('ToolBarVisible', MenuItemToolbar.Checked);
   finally
     Free;