Changeset 148 for trunk/Forms

Timestamp:

Feb 6, 2017, 12:59:59 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Update filtered acronyms in main window if they were changed in acronyms and categories window.

Location:

trunk/Forms

Files:

• UFormAcronyms.pas (modified) (4 diffs)
• UFormCategories.pas (modified) (3 diffs)
• UFormMain.pas (modified) (5 diffs)

trunk/Forms/UFormAcronyms.pas

@@ -156 +156 @@
           TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.Add(Meaning);
 
+      Core.AcronymDb.Update;
       UpdateAcronymsList;
       UpdateInterface;
@@ -201 +202 @@
             if TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.IndexOf(Meaning) = -1 then
               TAcronymCategory(Meaning.Categories.Items[I]).AcronymMeanings.Add(Meaning);
-
+          Core.AcronymDb.Update;
           UpdateAcronymsList;
           UpdateInterface;
@@ -221 +222 @@
     if MessageDlg(SRemoveAcronym, SRemoveAcronymQuery,
     TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
+      Core.AcronymDb.BeginUpdate;
       for I := ListViewAcronyms.Items.Count - 1 downto 0 do
         if ListViewAcronyms.Items[I].Selected then begin
@@ -228 +230 @@
       UpdateAcronymsList;
       UpdateInterface;
+      Core.AcronymDb.EndUpdate;
     end;
   end;

trunk/Forms/UFormCategories.pas

@@ -105 +105 @@
       TAcronymCategory(Core.AcronymDb.Categories[Core.AcronymDb.Categories.Add(TAcronymCategory.Create)]).Name := S;
       Core.AcronymDb.Modified := True;
+      Core.AcronymDb.Update;
       UpdateList;
     end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -144 +145 @@
         TAcronymCategory(ListViewCategories.Selected.Data).Name := S;
         Core.AcronymDb.Modified := True;
+        Core.AcronymDb.Update;
         UpdateList;
       end else ShowMessage(Format(SCategoryAlreadyExists, [S]));
@@ -157 +159 @@
     if MessageDlg(SRemoveCategory, SRemoveCategoryQuery,
     TMsgDlgType.mtConfirmation, [mbCancel, mbOk], 0) = mrOk then begin
+      Categories.Db.BeginUpdate;
       for I := ListViewCategories.Items.Count - 1 downto 0 do
       if ListViewCategories.Items[I].Selected then
         Categories.Remove(ListViewCategories.Items[I].Data);
+      Categories.Db.EndUpdate;
       UpdateList;
     end;

trunk/Forms/UFormMain.pas

@@ -134 +134 @@
     ProjectClosed: Boolean;
     ImportTotalItemCount: Integer;
+    procedure AcronymDbUpdate(Sender: TObject);
     function FilterCell(Text1, Text2: string): Boolean;
     procedure ProcessImportsJob(Job: TJob);
@@ -258 +259 @@
 begin
   AFileClose.Execute;
-  if ProjectClosed  then begin
+  if not Assigned(Core.AcronymDb)  then begin
     Core.AcronymDb := TAcronymDb.Create;
     Core.AcronymDb.FileName := DefaultFileName;
     Core.AcronymDb.Acronyms.Clear;
+    Core.AcronymDb.OnUpdate.Add(AcronymDbUpdate);
     UpdateAcronymsList;
     UpdateInterface;
@@ -533 +535 @@
 end;
 
+procedure TFormMain.AcronymDbUpdate(Sender: TObject);
+begin
+  UpdateAcronymsList;
+end;
+
 function TFormMain.FilterCell(Text1, Text2: string): Boolean;
 begin
@@ -547 +554 @@
 begin
   AFileClose.Execute;
-  if ProjectClosed then begin
+  if not Assigned(Core.AcronymDb) then begin
     try
       AFileNew.Execute;
@@ -604 +611 @@
 begin
   AFileClose.Execute;
-  if ProjectClosed then begin
+  if not Assigned(Core.AcronymDb) then begin
     AFileNew.Execute;
     Core.AcronymDb.LoadFromFile(TMenuItem(Sender).Caption);