Changeset 13 for trunk/UFormMain.pas

Timestamp:

Apr 28, 2016, 10:09:02 PM (8 years ago)

Author:

chronos

Message:

• Modified: Acronym meaning context items renamed to categories.
• Added: Ability to select categories for meanings.

File:

• trunk/UFormMain.pas (modified) (7 diffs)

trunk/UFormMain.pas

@@ -88 +88 @@
   private
     FAlwaysOnTop: Boolean;
+    function CompareStrings(Strings1, Strings2: TStrings): Boolean;
     procedure SetAlwaysOnTop(AValue: Boolean);
   private
@@ -227 +228 @@
 var
   TempEntry: TAcronymEntry;
+  TempCategories: TStringList;
   Meaning: TAcronymMeaning;
 begin
@@ -235 +237 @@
     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
@@ -240 +245 @@
       if (TempEntry.Name <> Acronym.Name) or
       (TempEntry.Meaning <> Name) or
-      (TempEntry.Description <> Description) then begin
+      (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);
         UpdateAcronymsList;
         UpdateInterface;
       end;
     end;
+    TempEntry.Free;
+    TempCategories.Free;
   end;
 end;
@@ -290 +299 @@
     Meaning := AcronymDb.AddAcronym(TempEntry.Name, TempEntry.Meaning);
     Meaning.Description := TempEntry.Description;
+    Meaning.Categories.AssignFromStrings(TempEntry.Categories);
     UpdateAcronymsList;
     UpdateInterface;
-  end else TempEntry.Free;
+  end;
+  TempEntry.Free;
 end;
 
@@ -347 +358 @@
     Item.Data := TAcronymMeaning(FoundAcronyms[Item.Index]);
     ContextCombined := '';
-    for I := 0 to Contexts.Count - 1 do
-      ContextCombined := ContextCombined + TAcronymContext(Contexts[I]).Name + ',';
+    for I := 0 to Categories.Count - 1 do
+      ContextCombined := ContextCombined + TAcronymCategory(Categories[I]).Name + ',';
     Delete(ContextCombined, Length(ContextCombined), 1);
     Item.SubItems.Add(ContextCombined);
@@ -372 +383 @@
 begin
   Visible := not Visible;
+end;
+
+function TFormMain.CompareStrings(Strings1, Strings2: TStrings): Boolean;
+var
+  I: Integer;
+begin
+  Result := Strings1.Count = Strings2.Count;
+  if not Result then Exit;
+  for I := 0 to Strings1.Count - 1 do
+    if (Strings1[I] <> Strings2[I]) or (Strings1.Objects[I] <> Strings2.Objects[I]) then begin
+      Result := False;
+      Exit;
+    end;
 end;