Changeset 95 for trunk/Forms/UFormAcronyms.pas

Timestamp:

Aug 17, 2016, 11:20:37 AM (8 years ago)

Author:

chronos

Message:

• Modified: Do not initialize all forms at startup to save some memory.

File:

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

trunk/Forms/UFormAcronyms.pas

@@ -123 +123 @@
   TempEntry.Meaning := '';
   TempEntry.Description := '';
-  FormAcronym.Load(TempEntry);
-  if FormAcronym.ShowModal = mrOk then begin
-    FormAcronym.Save(TempEntry);
-    Meaning := Core.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;
+  FormAcronym := TFormAcronym.Create(Self);
+  try
+    FormAcronym.Load(TempEntry);
+    if FormAcronym.ShowModal = mrOk then begin
+      FormAcronym.Save(TempEntry);
+      Meaning := Core.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;
+  finally
+    FreeAndNil(FormAcronym);
   end;
   TempEntry.Free;
@@ -154 +159 @@
     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 FormMain.CompareStrings(TempEntry.Categories, TempCategories) then begin
-        // TODO: Update item inplace if possible
-        Core.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
-        Meaning := Core.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;
+    FormAcronym := TFormAcronym.Create(Self);
+    try
+      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 FormMain.CompareStrings(TempEntry.Categories, TempCategories) then begin
+          // TODO: Update item inplace if possible
+          Core.AcronymDb.RemoveMeaning(TAcronymMeaning(ListViewAcronyms.Selected.Data));
+          Meaning := Core.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;
-    end;
-    TempEntry.Free;
-    TempCategories.Free;
+    finally
+      FreeAndNil(FormAcronym);
+      FreeAndNil(TempEntry);
+      FreeAndNil(TempCategories);
+    end;
   end;
 end;