Changeset 148 for trunk

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

Files:

• Forms/UFormAcronyms.pas (modified) (4 diffs)
• Forms/UFormCategories.pas (modified) (3 diffs)
• Forms/UFormMain.pas (modified) (5 diffs)
• Languages/AcronymDecoder.cs.po (modified) (1 diff)
• UAcronym.pas (modified) (6 diffs)
• UCore.pas (modified) (2 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);

trunk/Languages/AcronymDecoder.cs.po

@@ -919 +919 @@
 msgid "Process import sources"
 msgstr "Zpracovat zdroje importu"
+

trunk/UAcronym.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, Contnrs, XMLRead, XMLWrite, DOM, UXMLUtils,
-  SpecializedList, fphttpclient2, Dialogs, odbcconn, sqldb, LazUTF8;
+  SpecializedList, fphttpclient2, Dialogs, odbcconn, sqldb, LazUTF8,
+  fgl;
 
 type
@@ -216 +217 @@
 
   TAcronymDb = class
+  private
+    FUpdateCount: Integer;
+  public
     FileName: string;
     Acronyms: TAcronyms;
@@ -223 +227 @@
     Modified: Boolean;
     AddedCount: Integer;
+    OnUpdate: TFPGList<TNotifyEvent>;
     constructor Create;
     destructor Destroy; override;
@@ -234 +239 @@
     procedure RemoveAcronym(AcronymName, MeaningName: string);
     procedure AssignToList(List: TListObject; EnabledCategoryOnly: Boolean = False);
+    procedure BeginUpdate;
+    procedure EndUpdate;
+    procedure Update;
   end;
 
@@ -1436 +1444 @@
   ImportSources.AcronymDb := Self;
   ImportFormats := TImportFormats.Create;
+  FUpdateCount := 0;
+  OnUpdate := TFPGList<TNotifyEvent>.Create;
 end;
 
 destructor TAcronymDb.Destroy;
 begin
+  FreeAndNil(OnUpdate);
   FreeAndNil(ImportFormats);
   FreeAndNil(ImportSources);
@@ -1701 +1712 @@
 end;
 
+procedure TAcronymDb.BeginUpdate;
+begin
+  Inc(FUpdateCount);
+end;
+
+procedure TAcronymDb.EndUpdate;
+begin
+  if FUpdateCount > 0 then Dec(FUpdateCount);
+  if FupdateCount = 0 then Update;
+end;
+
+procedure TAcronymDb.Update;
+var
+  I: Integer;
+begin
+  for I := 0 to OnUpdate.Count - 1 do
+    OnUpdate[I](Self);
+end;
+
 end.
 

trunk/UCore.pas

@@ -73 +73 @@
 procedure TCore.DataModuleCreate(Sender: TObject);
 begin
-  AcronymDb := TAcronymDb.Create;
+  AcronymDb := nil;
   InitializeStarted := False;
   InitializeFinished := False;
@@ -129 +129 @@
     if FileNameOption <> '' then begin
       // Open file specified as command line parameter
-      AcronymDB.LoadFromFile(FileNameOption);
-      FormMain.LastOpenedList1.AddItem(FileNameOption);
+      FormMain.ProjectOpen(FileNameOption);
     end else
     if (FormMain.LastOpenedList1.Items.Count > 0) and FileExists(FormMain.LastOpenedList1.Items[0]) then begin
       // Open last opened file
-      AcronymDB.LoadFromFile(FormMain.LastOpenedList1.Items[0])
+      FormMain.ProjectOpen(FormMain.LastOpenedList1.Items[0])
     end else begin
       // Open default database with examples if no item is in recent openned history