Changeset 18

Timestamp:

May 4, 2016, 12:28:37 PM (8 years ago)

Author:

chronos

Message:

• Modified: Ability to search acronyms by exact match and by columns in main window.

Location:

trunk

Files:

• Forms/UFormAcronyms.lfm (modified) (3 diffs)
• Forms/UFormAcronyms.pas (modified) (1 diff)
• Forms/UFormMain.lfm (modified) (4 diffs)
• Forms/UFormMain.lrt (modified) (1 diff)
• Forms/UFormMain.pas (modified) (15 diffs)
• Languages/AcronymDecoder.cs.po (modified) (1 diff)
• Languages/AcronymDecoder.po (modified) (1 diff)

trunk/Forms/UFormAcronyms.lfm

@@ -1 +1 @@
 object FormAcronyms: TFormAcronyms
   Left = 466
-  Height = 575
-  Top = 212
+  Height = 558
+  Top = 297
   Width = 740
   Caption = 'Acronyms'
-  ClientHeight = 575
+  ClientHeight = 558
   ClientWidth = 740
   OnShow = FormShow
@@ -11 +11 @@
   object ListViewAcronyms: TListView
     Left = 8
-    Height = 527
+    Height = 510
     Top = 40
     Width = 725
@@ -49 +49 @@
     OnFilter = ListViewSort1Filter
     Column = 0
-    Order = soNone
+    Order = soDown
     left = 248
     top = 168

trunk/Forms/UFormAcronyms.pas

@@ -42 +42 @@
 
 procedure TFormAcronyms.ListViewAcronymsData(Sender: TObject; Item: TListItem);
-var
-  I: Integer;
 begin
   if Item.Index < ListViewSort1.List.Count then

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 394
+  Left = 393
   Height = 446
-  Top = 395
+  Top = 405
   Width = 631
   Caption = 'Acronym Decoder'
@@ -16 +16 @@
   object ListViewAcronyms: TListView
     Left = 8
-    Height = 372
-    Top = 40
+    Height = 340
+    Top = 72
     Width = 613
     Anchors = [akTop, akLeft, akRight, akBottom]
@@ -44 +44 @@
     OnSelectItem = ListViewAcronymsSelectItem
   end
-  object EditSearch: TEdit
+  object ListViewFilter1: TListViewFilter
     Left = 8
-    Height = 28
-    Top = 8
-    Width = 611
+    Height = 30
+    Top = 32
+    Width = 613
+    OnChange = ListViewFilter1Change
     Anchors = [akTop, akLeft, akRight]
-    OnChange = EditSearchChange
-    TabOrder = 1
+  end
+  object CheckBoxExactMath: TCheckBox
+    Left = 8
+    Height = 24
+    Top = 3
+    Width = 104
+    Caption = 'Exact match'
+    OnChange = CheckBoxExactMathChange
+    TabOrder = 2
   end
   object TrayIcon1: TTrayIcon
@@ -4519 +4527 @@
     top = 144
   end
+  object ListViewSort1: TListViewSort
+    ListView = ListViewAcronyms
+    OnCompareItem = ListViewSort1CompareItem
+    OnFilter = ListViewSort1Filter
+    Column = 0
+    Order = soDown
+    left = 464
+    top = 208
+  end
 end

trunk/Forms/UFormMain.lrt

@@ -3 +3 @@
 TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[1].CAPTION=Description
 TFORMMAIN.LISTVIEWACRONYMS.COLUMNS[2].CAPTION=Categories
+TFORMMAIN.CHECKBOXEXACTMATH.CAPTION=Exact match
 TFORMMAIN.AEXIT.CAPTION=Exit
 TFORMMAIN.ASHOW.CAPTION=Show

trunk/Forms/UFormMain.pas

@@ -8 +8 @@
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, Menus,
   ComCtrls, StdCtrls, ExtCtrls, ActnList, UAcronym, UPersistentForm, Contnrs,
-  URegistry, ULastOpenedList, UCoolTranslator, Registry;
+  URegistry, ULastOpenedList, UListViewSort, UCoolTranslator, Registry,
+  SpecializedList, LazUTF8;
 
 type
@@ -31 +32 @@
     AExit: TAction;
     ActionList1: TActionList;
+    CheckBoxExactMath: TCheckBox;
     CoolTranslator1: TCoolTranslator;
-    EditSearch: TEdit;
     LastOpenedList1: TLastOpenedList;
     ListViewAcronyms: TListView;
+    ListViewFilter1: TListViewFilter;
+    ListViewSort1: TListViewSort;
     MainMenu1: TMainMenu;
     MenuItem1: TMenuItem;
@@ -80 +83 @@
     procedure AShowCategoriesExecute(Sender: TObject);
     procedure AShowExecute(Sender: TObject);
+    procedure CheckBoxExactMathChange(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
     procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
@@ -92 +96 @@
     procedure ListViewAcronymsSelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
+    procedure ListViewFilter1Change(Sender: TObject);
+    function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
+    procedure ListViewSort1Filter(ListViewSort: TListViewSort);
     procedure TrayIcon1Click(Sender: TObject);
   private
@@ -98 +105 @@
     procedure SetAlwaysOnTop(AValue: Boolean);
   private
-    FoundAcronyms: TAcronymMeanings;
     RegistryContext: TRegistryContext;
     ProjectClosed: Boolean;
+    procedure FilterList(List: TListObject);
     procedure OpenRecentClick(Sender: TObject);
     procedure UpdateAcronymsList;
@@ -140 +147 @@
 begin
   AcronymDb := TAcronymDb.Create;
-  FoundAcronyms := TAcronymMeanings.Create(False);
 end;
 
@@ -355 +361 @@
 end;
 
+procedure TFormMain.CheckBoxExactMathChange(Sender: TObject);
+begin
+  UpdateAcronymsList;
+end;
+
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
-  FreeAndNil(FoundAcronyms);
   FreeAndNil(AcronymDb);
 end;
@@ -369 +379 @@
     AcronymDB.LoadFromFile(LastOpenedList1.Items[0]);
   UpdateAcronymsList;
+  ListViewFilter1.UpdateFromListView(ListViewAcronyms);
   UpdateInterface;
 end;
@@ -378 +389 @@
 
 procedure TFormMain.ListViewAcronymsData(Sender: TObject; Item: TListItem);
-var
-  I: Integer;
-  ContextCombined: string;
-begin
-  if Item.Index < FoundAcronyms.Count then
-  with TAcronymMeaning(FoundAcronyms[Item.Index]) do begin
+begin
+  if Item.Index < ListViewSort1.List.Count then
+  with TAcronymMeaning(ListViewSort1.List[Item.Index]) do begin
     Item.Caption := Acronym.Name;
     Item.SubItems.Add(Name);
-    Item.Data := TAcronymMeaning(FoundAcronyms[Item.Index]);
-    ContextCombined := '';
-    for I := 0 to Categories.Count - 1 do
-      ContextCombined := ContextCombined + TAcronymCategory(Categories[I]).Name + ',';
-    Delete(ContextCombined, Length(ContextCombined), 1);
-    Item.SubItems.Add(ContextCombined);
+    Item.Data := TAcronymMeaning(ListViewSort1.List[Item.Index]);
+    Item.SubItems.Add(Categories.GetString);
   end;
 end;
@@ -408 +412 @@
 begin
   UpdateInterface;
+end;
+
+procedure TFormMain.ListViewFilter1Change(Sender: TObject);
+begin
+  UpdateAcronymsList;
+end;
+
+function TFormMain.ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
+begin
+  Result := 0;
+  if Assigned(Item1) and Assigned(Item2) and (ListViewSort1.Order <> soNone) then begin
+    with ListViewSort1 do
+    case Column of
+      0: Result := CompareString(TAcronymMeaning(Item1).Acronym.Name, TAcronymMeaning(Item2).Acronym.Name);
+      1: Result := CompareString(TAcronymMeaning(Item1).Description, TAcronymMeaning(Item2).Description);
+      2: Result := CompareString(TAcronymMeaning(Item1).Categories.GetString, TAcronymMeaning(Item2).Categories.GetString);
+    end;
+    if ListViewSort1.Order = soDown then Result := -Result;
+  end else Result := 0;
+end;
+
+procedure TFormMain.ListViewSort1Filter(ListViewSort: TListViewSort);
+begin
+  AcronymDb.Acronyms.Sort(AcronymComparer);
+  AcronymDb.AssignToList(ListViewSort1.List);
+  FilterList(ListViewSort1.List);
 end;
 
@@ -436 +466 @@
 end;
 
+procedure TFormMain.FilterList(List: TListObject);
+var
+  I: Integer;
+  FoundCount: Integer;
+  EnteredCount: Integer;
+begin
+  EnteredCount := ListViewFilter1.TextEnteredCount;
+  for I := List.Count - 1 downto 0 do begin
+    if List.Items[I] is TAcronymMeaning then begin
+      with TAcronymMeaning(List.Items[I]) do begin
+         with ListViewFilter1 do
+         if Visible and (EnteredCount > 0) then begin
+           FoundCount := 0;
+           if CheckBoxExactMath.Checked then begin
+             if TextEnteredColumn(0) and (StringGrid.Cells[0, 0] =
+               TAcronymMeaning(List.Items[I]).Acronym.Name) then Inc(FoundCount);
+             if TextEnteredColumn(1) and (StringGrid.Cells[1, 0] =
+               TAcronymMeaning(List.Items[I]).Name) then Inc(FoundCount);
+             if TextEnteredColumn(2) and (StringGrid.Cells[2, 0] =
+               TAcronymMeaning(List.Items[I]).Categories.GetString) then Inc(FoundCount);
+           end else begin
+             if Pos(UTF8LowerCase(StringGrid.Cells[0, 0]),
+               UTF8LowerCase(TAcronymMeaning(List.Items[I]).Acronym.Name)) > 0 then Inc(FoundCount);
+             if Pos(UTF8LowerCase(StringGrid.Cells[1, 0]),
+               UTF8LowerCase(TAcronymMeaning(List.Items[I]).Name)) > 0 then Inc(FoundCount);
+             if Pos(UTF8LowerCase(StringGrid.Cells[2, 0]),
+               UTF8LowerCase(TAcronymMeaning(List.Items[I]).Categories.GetString)) > 0 then Inc(FoundCount);
+           end;
+           if FoundCount <> EnteredCount then List.Delete(I);
+         end else List.Delete(I);
+      end;
+    end else
+    if TAcronymMeaning(List.Items[I]) is TAcronymMeaning then begin
+      List.Delete(I);
+    end;
+  end;
+end;
+
 procedure TFormMain.OpenRecentClick(Sender: TObject);
 begin
@@ -451 +519 @@
 begin
   if Assigned(AcronymDb) then begin
-    AcronymDb.Acronyms.Sort(AcronymComparer);
-    AcronymDb.FilterList(EditSearch.Text, FoundAcronyms);
-  end else FoundAcronyms.Clear;
-  ListViewAcronyms.Items.Count := FoundAcronyms.Count;
-  ListViewAcronyms.Refresh;
+    ListViewSort1.Refresh;
+  end else ListViewSort1.List.Clear;
 end;
 
@@ -470 +535 @@
   AFileSave.Enabled := Assigned(AcronymDb) and AcronymDb.Modified;
   AFileSaveAs.Enabled := Assigned(AcronymDb);
-  EditSearch.Enabled := Assigned(AcronymDb);
   AImport.Enabled := Assigned(AcronymDb);
   AShowCategories.Enabled := Assigned(AcronymDb);
@@ -494 +558 @@
       else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
     AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
+    CheckBoxExactMath.Checked := ReadBoolWithDefault('ExactMatch', False);
   finally
     Free;
@@ -511 +576 @@
       else DeleteValue('LanguageCode');
     WriteBool('AlwaysOnTop', AlwaysOnTop);
+    WriteBool('ExactMatch', CheckBoxExactMath.Checked);
   finally
     Free;

trunk/Languages/AcronymDecoder.cs.po

@@ -208 +208 @@
 msgstr "Acronym Decoder"
 
+#: tformmain.checkboxexactmath.caption
+msgid "Exact match"
+msgstr ""
+
 #: tformmain.listviewacronyms.columns[0].caption
 msgctxt "tformmain.listviewacronyms.columns[0].caption"

trunk/Languages/AcronymDecoder.po

@@ -196 +196 @@
 msgstr ""
 
+#: tformmain.checkboxexactmath.caption
+msgid "Exact match"
+msgstr ""
+
 #: tformmain.listviewacronyms.columns[0].caption
 msgctxt "tformmain.listviewacronyms.columns[0].caption"