Changeset 122 for trunk/Forms

Timestamp:

Nov 26, 2016, 12:35:41 AM (8 years ago)

Author:

chronos

Message:

• Added: Acronym search filter options also availabel as toolbar buttons.

Location:

trunk/Forms

Files:

• UFormMain.lfm (modified) (5 diffs)
• UFormMain.lrt (modified) (2 diffs)
• UFormMain.pas (modified) (11 diffs)

trunk/Forms/UFormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 718
+  Left = 675
   Height = 447
-  Top = 663
+  Top = 668
   Width = 782
   Caption = 'Acronym Decoder'
@@ -140 +140 @@
       Action = AFileClose
     end
+    object ToolButton14: TToolButton
+      Left = 253
+      Height = 22
+      Top = 2
+      Width = 5
+      Style = tbsDivider
+    end
+    object ToolButton16: TToolButton
+      Left = 258
+      Top = 2
+      Action = AFilterExactMatch
+      Style = tbsCheck
+    end
+    object ToolButton13: TToolButton
+      Left = 281
+      Top = 2
+      Action = AFilterCaseSensitive
+      Style = tbsCheck
+    end
   end
   object PanelParam: TPanel
@@ -156 +175 @@
       Top = 3
       Width = 129
-      Caption = 'Exact match'
-      OnChange = CheckBoxExactMatchChange
+      Action = AFilterExactMatch
       TabOrder = 0
     end
@@ -165 +183 @@
       Top = 3
       Width = 144
-      Caption = 'Case sensitive'
-      OnChange = CheckBoxExactMatchChange
+      Action = AFilterCaseSensitive
       TabOrder = 1
     end
@@ -264 +281 @@
       Caption = 'Export'
       OnExecute = AExportExecute
+    end
+    object AFilterExactMatch: TAction
+      AutoCheck = True
+      Caption = 'Exact match'
+      ImageIndex = 18
+      OnExecute = AFilterExactMatchExecute
+    end
+    object AFilterCaseSensitive: TAction
+      AutoCheck = True
+      Caption = 'Case sensitive'
+      ImageIndex = 17
+      OnExecute = AFilterCaseSensitiveExecute
     end
   end

trunk/Forms/UFormMain.lrt

@@ -6 +6 @@
 TFORMMAIN.TOOLBUTTON8.CAPTION=ToolButton8
 TFORMMAIN.TOOLBUTTON10.CAPTION=ToolButton10
-TFORMMAIN.CHECKBOXEXACTMATH.CAPTION=Exact match
-TFORMMAIN.CHECKBOXCASESENSITIVE.CAPTION=Case sensitive
 TFORMMAIN.AEXIT.CAPTION=Exit
 TFORMMAIN.ASHOW.CAPTION=Show
@@ -25 +23 @@
 TFORMMAIN.APROCESSIMPORTS.CAPTION=Process imports
 TFORMMAIN.AEXPORT.CAPTION=Export
+TFORMMAIN.AFILTEREXACTMATCH.CAPTION=Exact match
+TFORMMAIN.AFILTERCASESENSITIVE.CAPTION=Case sensitive
 TFORMMAIN.MENUITEM8.CAPTION=File
 TFORMMAIN.MENUITEMOPENRECENT.CAPTION=Open recent

trunk/Forms/UFormMain.pas

@@ -16 +16 @@
 
   TFormMain = class(TForm)
+    AFilterCaseSensitive: TAction;
+    AFilterExactMatch: TAction;
     AHide: TAction;
     AExport: TAction;
@@ -75 +77 @@
     ToolButton11: TToolButton;
     ToolButton12: TToolButton;
+    ToolButton13: TToolButton;
+    ToolButton14: TToolButton;
+    ToolButton16: TToolButton;
     ToolButton2: TToolButton;
     ToolButton3: TToolButton;
@@ -90 +95 @@
     procedure AFileSaveAsExecute(Sender: TObject);
     procedure AFileSaveExecute(Sender: TObject);
+    procedure AFilterCaseSensitiveExecute(Sender: TObject);
+    procedure AFilterExactMatchExecute(Sender: TObject);
     procedure AHideExecute(Sender: TObject);
     procedure AImportExecute(Sender: TObject);
@@ -100 +107 @@
     procedure AShowImportFormatsExecute(Sender: TObject);
     procedure AShowImportSourcesExecute(Sender: TObject);
-    procedure CheckBoxExactMatchChange(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
     procedure FormHide(Sender: TObject);
@@ -123 +129 @@
     ProjectClosed: Boolean;
     ImportTotalItemCount: Integer;
-    function GetFilteredCase(Text: string): string;
+    function FilterCell(Text1, Text2: string): Boolean;
     procedure ProcessImportsJob(Job: TJob);
     procedure FilterList(List: TListObject);
@@ -280 +286 @@
 end;
 
+procedure TFormMain.AFilterCaseSensitiveExecute(Sender: TObject);
+begin
+  UpdateAcronymsList;
+end;
+
+procedure TFormMain.AFilterExactMatchExecute(Sender: TObject);
+begin
+  UpdateAcronymsList;
+end;
+
 procedure TFormMain.AHideExecute(Sender: TObject);
 begin
@@ -401 +417 @@
     FreeAndNil(FormImportSources);
   end;
-end;
-
-procedure TFormMain.CheckBoxExactMatchChange(Sender: TObject);
-begin
-  UpdateAcronymsList;
 end;
 
@@ -496 +507 @@
 end;
 
-function TFormMain.GetFilteredCase(Text: string): string;
-begin
-  if not CheckBoxCaseSensitive.Checked then Result := UTF8LowerCase(Text)
-    else Result := Text;
+function TFormMain.FilterCell(Text1, Text2: string): Boolean;
+begin
+  if not AFilterCaseSensitive.Checked then begin
+    Text1 := UTF8LowerCase(Text1);
+    Text2 := UTF8LowerCase(Text2);
+  end;
+  if AFilterExactMatch.Checked then
+    Result := Text1 = Text2
+    else Result := Pos(Text1, Text2) > 0;
 end;
 
@@ -543 +559 @@
          if Visible and (EnteredCount > 0) then begin
            FoundCount := 0;
-           if CheckBoxExactMatch.Checked then begin
-             if TextEnteredColumn(0) and (GetFilteredCase(StringGrid.Cells[0, 0]) =
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Acronym.Name)) then Inc(FoundCount);
-             if TextEnteredColumn(1) and (GetFilteredCase(StringGrid.Cells[1, 0]) =
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Name)) then Inc(FoundCount);
-             if TextEnteredColumn(2) and (GetFilteredCase(StringGrid.Cells[2, 0]) =
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Categories.GetString)) then Inc(FoundCount);
-           end else begin
-             if Pos(GetFilteredCase(StringGrid.Cells[0, 0]),
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Acronym.Name)) > 0 then Inc(FoundCount);
-             if Pos(GetFilteredCase(StringGrid.Cells[1, 0]),
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Name)) > 0 then Inc(FoundCount);
-             if Pos(GetFilteredCase(StringGrid.Cells[2, 0]),
-               GetFilteredCase(TAcronymMeaning(List.Items[I]).Categories.GetString)) > 0 then Inc(FoundCount);
-           end;
+           if TextEnteredColumn(0) and (FilterCell(StringGrid.Cells[0, 0],
+             TAcronymMeaning(List.Items[I]).Acronym.Name)) then Inc(FoundCount);
+           if TextEnteredColumn(1) and (FilterCell(StringGrid.Cells[1, 0],
+             TAcronymMeaning(List.Items[I]).Name)) then Inc(FoundCount);
+           if TextEnteredColumn(2) and (FilterCell(StringGrid.Cells[2, 0],
+             TAcronymMeaning(List.Items[I]).Categories.GetString)) then Inc(FoundCount);
            if FoundCount <> EnteredCount then List.Delete(I);
          end else List.Delete(I);
@@ -640 +647 @@
     Core.AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
     Core.StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
-    CheckBoxExactMatch.Checked := ReadBoolWithDefault('ExactMatch', False);
-    CheckBoxCaseSensitive.Checked := ReadBoolWithDefault('CaseSensitive', False);
+    AFilterExactMatch.Checked := ReadBoolWithDefault('ExactMatch', False);
+    AFilterCaseSensitive.Checked := ReadBoolWithDefault('CaseSensitive', False);
     MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
     MenuItemParam.Checked := ReadBoolWithDefault('FilterParamVisible', True);
@@ -672 +679 @@
     WriteBool('AlwaysOnTop', Core.AlwaysOnTop);
     WriteBool('StartMinimizedToTray', Core.StartMinimizedToTray);
-    WriteBool('ExactMatch', CheckBoxExactMatch.Checked);
-    WriteBool('CaseSensitive', CheckBoxCaseSensitive.Checked);
+    WriteBool('ExactMatch', AFilterExactMatch.Checked);
+    WriteBool('CaseSensitive', AFilterCaseSensitive.Checked);
     WriteBool('ToolBarVisible', MenuItemToolbar.Checked);
     WriteBool('FilterParamVisible', MenuItemParam.Checked);