Changeset 19 for trunk/Forms/UFormMain.pas

Timestamp:

May 4, 2016, 12:54:09 PM (8 years ago)

Author:

chronos

Message:

• Modified: Acronyms management is not done in Acronyms window. List in main window is just for viewing.

File:

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

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
 
   TFormMain = class(TForm)
-    AAcronymAdd: TAction;
-    AAcronymModify: TAction;
-    AAcronymRemove: TAction;
-    AAcronymRemoveAll: TAction;
     AShowAcronyms: TAction;
     AShowCategories: TAction;
@@ -34 +30 @@
     CheckBoxExactMath: TCheckBox;
     CoolTranslator1: TCoolTranslator;
+    ImageList1: TImageList;
     LastOpenedList1: TLastOpenedList;
     ListViewAcronyms: TListView;
@@ -56 +53 @@
     MenuItem2: TMenuItem;
     MenuItem3: TMenuItem;
-    MenuItem4: TMenuItem;
-    MenuItem5: TMenuItem;
-    MenuItem6: TMenuItem;
-    MenuItem7: TMenuItem;
     MenuItem8: TMenuItem;
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
     PersistentForm1: TPersistentForm;
-    PopupMenuAcronym: TPopupMenu;
     PopupMenuTryIcon: TPopupMenu;
     SaveDialog1: TSaveDialog;
     TrayIcon1: TTrayIcon;
-    procedure AAcronymAddExecute(Sender: TObject);
-    procedure AAcronymModifyExecute(Sender: TObject);
-    procedure AAcronymRemoveAllExecute(Sender: TObject);
-    procedure AAcronymRemoveExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
     procedure AFileCloseExecute(Sender: TObject);
@@ -92 +80 @@
     procedure LastOpenedList1Change(Sender: TObject);
     procedure ListViewAcronymsData(Sender: TObject; Item: TListItem);
-    procedure ListViewAcronymsDblClick(Sender: TObject);
-    procedure ListViewAcronymsKeyPress(Sender: TObject; var Key: char);
     procedure ListViewAcronymsSelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
@@ -102 +88 @@
   private
     FAlwaysOnTop: Boolean;
-    function CompareStrings(Strings1, Strings2: TStrings): Boolean;
-    procedure SetAlwaysOnTop(AValue: Boolean);
-  private
     RegistryContext: TRegistryContext;
     ProjectClosed: Boolean;
+    procedure SetAlwaysOnTop(AValue: Boolean);
     procedure FilterList(List: TListObject);
     procedure OpenRecentClick(Sender: TObject);
@@ -115 +99 @@
   public
     AcronymDb: TAcronymDb;
+    function CompareStrings(Strings1, Strings2: TStrings): Boolean;
     property AlwaysOnTop: Boolean read FAlwaysOnTop write SetAlwaysOnTop;
   end;
@@ -132 +117 @@
   SAppExit = 'Application exit';
   SAppExitQuery = 'Acronyms were modified. Do you want to save them to file before exit?';
-  SRemoveAllAcronyms = 'Remove all acronyms';
-  SRemoveAllAcronymsQuery = 'Do you want to remove all acronyms?';
-  SRemoveAcronym = 'Remove acronym';
-  SRemoveAcronymQuery = 'Do you want to remove selected acronym?';
 
 const
@@ -243 +224 @@
 end;
 
-procedure TFormMain.AAcronymModifyExecute(Sender: TObject);
-var
-  TempEntry: TAcronymEntry;
-  TempCategories: TStringList;
-  Meaning: TAcronymMeaning;
-  I: Integer;
-begin
-  if Assigned(ListViewAcronyms.Selected) then
-  with TAcronymMeaning(ListViewAcronyms.Selected.Data) do begin
-    TempEntry := TAcronymEntry.Create;
-    TempEntry.Name := Acronym.Name;
-    TempEntry.Meaning := Name;
-    TempEntry.Description := Description;
-    Categories.AssignToStrings(TempEntry.Categories);
-    TempCategories := TStringList.Create;
-    TempCategories.Assign(TempEntry.Categories);
-    FormAcronym.Load(TempEntry);
-    if FormAcronym.ShowModal = mrOk then begin
-      FormAcronym.Save(TempEntry);
-      if (TempEntry.Name <> Acronym.Name) or
-      (TempEntry.Meaning <> Name) or
-      (TempEntry.Description <> Description) or
-      not CompareStrings(TempEntry.Categories, TempCategories) then begin
-        // TODO: Update item inplace if possible
-        AcronymDb.RemoveAcronym(Acronym.Name, Name);
-        Meaning := AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
-        Meaning.Description := TempEntry.Description;
-        Meaning.Categories.AssignFromStrings(TempEntry.Categories);
-        for I := 0 to Meaning.Categories.Count - 1 do
-          TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.Add(Meaning);
-        UpdateAcronymsList;
-        UpdateInterface;
-      end;
-    end;
-    TempEntry.Free;
-    TempCategories.Free;
-  end;
-end;
-
-procedure TFormMain.AAcronymRemoveAllExecute(Sender: TObject);
-begin
-  if MessageDlg(SRemoveAllAcronyms, SRemoveAllAcronymsQuery,
-  TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
-    AcronymDb.Acronyms.Clear;
-    AcronymDb.Modified := True;
-    UpdateAcronymsList;
-    UpdateInterface;
-  end;
-end;
-
-procedure TFormMain.AAcronymRemoveExecute(Sender: TObject);
-begin
-  if Assigned(ListViewAcronyms.Selected) then begin
-    if MessageDlg(SRemoveAcronym, SRemoveAcronymQuery,
-    TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
-      AcronymDb.RemoveAcronym(TAcronymMeaning(ListViewAcronyms.Selected.Data).Acronym.Name,
-        TAcronymMeaning(ListViewAcronyms.Selected.Data).Name);
-      UpdateAcronymsList;
-      UpdateInterface;
-    end;
-  end;
-end;
-
-procedure TFormMain.AAcronymAddExecute(Sender: TObject);
-var
-  TempEntry: TAcronymEntry;
-  Meaning: TAcronymMeaning;
-  I: Integer;
-begin
-  TempEntry := TAcronymEntry.Create;
-  TempEntry.Name := '';
-  TempEntry.Meaning := '';
-  TempEntry.Description := '';
-  FormAcronym.Load(TempEntry);
-  if FormAcronym.ShowModal = mrOk then begin
-    FormAcronym.Save(TempEntry);
-    Meaning := AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
-    Meaning.Description := TempEntry.Description;
-    Meaning.Categories.AssignFromStrings(TempEntry.Categories);
-    for I := 0 to Meaning.Categories.Count - 1 do
-      TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.Add(Meaning);
-    UpdateAcronymsList;
-    UpdateInterface;
-  end;
-  TempEntry.Free;
-end;
-
 procedure TFormMain.AImportExecute(Sender: TObject);
 begin
@@ -397 +291 @@
     Item.SubItems.Add(Categories.GetString);
   end;
-end;
-
-procedure TFormMain.ListViewAcronymsDblClick(Sender: TObject);
-begin
-  AAcronymModify.Execute;
-end;
-
-procedure TFormMain.ListViewAcronymsKeyPress(Sender: TObject; var Key: char);
-begin
 end;
 
@@ -528 +413 @@
 begin
   ListViewAcronyms.Enabled := Assigned(AcronymDb);
-  AAcronymRemove.Enabled := Assigned(AcronymDb) and Assigned(ListViewAcronyms.Selected);
-  AAcronymModify.Enabled := Assigned(AcronymDb) and Assigned(ListViewAcronyms.Selected);
-  AAcronymAdd.Enabled := Assigned(AcronymDb);
-  AAcronymRemoveAll.Enabled := Assigned(AcronymDb) and (AcronymDb.Acronyms.Count > 0);
   AFileClose.Enabled := Assigned(AcronymDb);
   AFileSave.Enabled := Assigned(AcronymDb) and AcronymDb.Modified;