Changeset 86 for trunk/Forms/UFormAcronyms.pas

Timestamp:

Aug 8, 2016, 1:41:25 PM (8 years ago)

Author:

chronos

Message:

• Modified: Non-visual code moved from FormMain to Core data module.

File:

• trunk/Forms/UFormAcronyms.pas (modified) (6 diffs)

trunk/Forms/UFormAcronyms.pas

@@ -63 +63 @@
 
 uses
-  UFormMain, UFormAcronym;
+  UCore, UFormMain, UFormAcronym;
 
 resourcestring
@@ -126 +126 @@
   if FormAcronym.ShowModal = mrOk then begin
     FormAcronym.Save(TempEntry);
-    Meaning := FormMain.AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+    Meaning := Core.AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
     Meaning.Description := TempEntry.Description;
     Meaning.Categories.AssignFromStrings(TempEntry.Categories);
@@ -161 +161 @@
       not FormMain.CompareStrings(TempEntry.Categories, TempCategories) then begin
         // TODO: Update item inplace if possible
-        FormMain.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
-        Meaning := FormMain.AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
+        Core.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
+        Meaning := Core.AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
         Meaning.Description := TempEntry.Description;
         Meaning.Categories.AssignFromStrings(TempEntry.Categories);
@@ -186 +186 @@
         if ListViewAcronyms.Items[I].Selected then begin
           ListViewAcronyms.Items[I].Selected := False;
-          FormMain.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Items[I].Data));
+          Core.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Items[I].Data));
         end;
       UpdateAcronymsList;
@@ -231 +231 @@
 procedure TFormAcronyms.ListViewSort1Filter(ListViewSort: TListViewSort);
 begin
-  FormMain.AcronymDb.Acronyms.Sort(AcronymComparer);
-  FormMain.AcronymDb.AssignToList(ListViewSort1.List);
+  Core.AcronymDb.Acronyms.Sort(AcronymComparer);
+  Core.AcronymDb.AssignToList(ListViewSort1.List);
   MeaningCount := ListViewSort1.List.Count;
   FilterList(ListViewSort1.List);
@@ -276 +276 @@
 procedure TFormAcronyms.UpdateInterface;
 begin
-  ARemove.Enabled := Assigned(FormMain.AcronymDb) and Assigned(ListViewAcronyms.Selected);
-  AModify.Enabled := Assigned(FormMain.AcronymDb) and Assigned(ListViewAcronyms.Selected);
-  AAdd.Enabled := Assigned(FormMain.AcronymDb);
+  ARemove.Enabled := Assigned(Core.AcronymDb) and Assigned(ListViewAcronyms.Selected);
+  AModify.Enabled := Assigned(Core.AcronymDb) and Assigned(ListViewAcronyms.Selected);
+  AAdd.Enabled := Assigned(Core.AcronymDb);
   ASelectAll.Enabled := True;
 end;