Changeset 145 for trunk/UAcronym.pas

Timestamp:

Jan 24, 2017, 1:55:43 PM (7 years ago)

Author:

chronos

Message:

• Added: Allow to disable selected acronym categories so acronyms without any enabled category won't be shown in main acronym search filter.

File:

• trunk/UAcronym.pas (modified) (9 diffs)

trunk/UAcronym.pas

@@ -75 +75 @@
     AcronymMeanings: TAcronymMeanings;
     ImportSources: TImportSources;
+    Enabled: Boolean;
     procedure SaveToNode(Node: TDOMNode);
     procedure LoadFromNode(Node: TDOMNode);
@@ -96 +97 @@
     procedure AssignFromStrings(Strings: TStrings);
     procedure AddFromStrings(Strings: TStrings);
+    procedure AssignToList(List: TListObject);
     function GetString: string;
     procedure UpdateLinkImportSources(Item: TImportSource);
     procedure UpdateLinkAcronymMeanings(Item: TAcronymMeaning);
+    function IsAnyEnabled: Boolean;
   end;
 
@@ -230 +233 @@
     procedure RemoveMeaning(Meaning: TAcronymMeaning);
     procedure RemoveAcronym(AcronymName, MeaningName: string);
-    procedure AssignToList(List: TListObject);
+    procedure AssignToList(List: TListObject; EnabledCategoryOnly: Boolean = False);
   end;
 
@@ -1300 +1303 @@
 end;
 
+procedure TAcronymCategories.AssignToList(List: TListObject);
+var
+  I: Integer;
+begin
+  List.Clear;
+  for I := 0 to Count - 1 do
+    List.Add(TAcronymCategory(Items[I]))
+end;
+
 function TAcronymCategories.GetString: string;
 var
@@ -1328 +1340 @@
 end;
 
+function TAcronymCategories.IsAnyEnabled: Boolean;
+var
+  I: Integer;
+begin
+  Result := False;
+  for I := 0 to Count - 1 do
+  if TAcronymCategory(Items[I]).Enabled then begin
+    Result := True;
+    Break;
+  end;
+end;
 
 { TAcronym }
@@ -1371 +1394 @@
   WriteString(Node, 'Name', Name);
   WriteInteger(Node, 'Id', Id);
+  WriteBoolean(Node, 'Enabled', Enabled);
 end;
 
@@ -1377 +1401 @@
   Name := ReadString(Node, 'Name', '');
   Id := ReadInteger(Node, 'Id', 0);
+  Enabled := ReadBoolean(Node, 'Enabled', True);
 end;
 
 constructor TAcronymCategory.Create;
 begin
+  Id := 0;
+  Name := '';
+  Enabled := True;
   AcronymMeanings := TAcronymMeanings.Create(False);
   ImportSources := TImportSources.Create(False);
@@ -1657 +1685 @@
 end;
 
-procedure TAcronymDb.AssignToList(List: TListObject);
+procedure TAcronymDb.AssignToList(List: TListObject; EnabledCategoryOnly: Boolean = False);
 var
   I: Integer;
@@ -1666 +1694 @@
   with TAcronym(Acronyms[I]) do begin
     for J := 0 to Meanings.Count - 1 do
-    with TAcronymMeaning(Meanings[J]) do begin
-      List.Add(TAcronymMeaning(Meanings[J]))
+    with TAcronymMeaning(Meanings[J]) do
+    if not EnabledCategoryOnly or (EnabledCategoryOnly and Categories.IsAnyEnabled) then begin
+      List.Add(TAcronymMeaning(Meanings[J]));
     end;
   end;