Changeset 121 for trunk/Forms/UFormMain.pas

Timestamp:

Nov 26, 2016, 12:09:42 AM (8 years ago)

Author:

chronos

Message:

• Added: Option to filter acronyms by same letters case.
• Added: Search filter in main window can be hidden from View menu.

File:

• trunk/Forms/UFormMain.pas (modified) (12 diffs)

trunk/Forms/UFormMain.pas

@@ -34 +34 @@
     AExit: TAction;
     ActionList1: TActionList;
-    CheckBoxExactMath: TCheckBox;
+    CheckBoxExactMatch: TCheckBox;
+    CheckBoxCaseSensitive: TCheckBox;
     LastOpenedList1: TLastOpenedList;
     ListViewAcronyms: TListView;
@@ -40 +41 @@
     ListViewSort1: TListViewSort;
     MainMenu1: TMainMenu;
+    MenuItemParam: TMenuItem;
     MenuItem10: TMenuItem;
     MenuItem11: TMenuItem;
@@ -64 +66 @@
     MenuItem9: TMenuItem;
     OpenDialog1: TOpenDialog;
-    Panel1: TPanel;
+    PanelParam: TPanel;
+    PanelMain: TPanel;
     PopupMenuOpenRecent: TPopupMenu;
     SaveDialog1: TSaveDialog;
@@ -97 +100 @@
     procedure AShowImportFormatsExecute(Sender: TObject);
     procedure AShowImportSourcesExecute(Sender: TObject);
-    procedure CheckBoxExactMathChange(Sender: TObject);
+    procedure CheckBoxExactMatchChange(Sender: TObject);
     procedure EditSearchChange(Sender: TObject);
     procedure FormHide(Sender: TObject);
@@ -114 +117 @@
     function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
     procedure ListViewSort1Filter(ListViewSort: TListViewSort);
+    procedure MenuItemParamClick(Sender: TObject);
     procedure MenuItemToolbarClick(Sender: TObject);
   private
@@ -119 +123 @@
     ProjectClosed: Boolean;
     ImportTotalItemCount: Integer;
+    function GetFilteredCase(Text: string): string;
     procedure ProcessImportsJob(Job: TJob);
     procedure FilterList(List: TListObject);
@@ -398 +403 @@
 end;
 
-procedure TFormMain.CheckBoxExactMathChange(Sender: TObject);
+procedure TFormMain.CheckBoxExactMatchChange(Sender: TObject);
 begin
   UpdateAcronymsList;
@@ -479 +484 @@
 end;
 
+procedure TFormMain.MenuItemParamClick(Sender: TObject);
+begin
+  MenuItemParam.Checked := not MenuItemParam.Checked;
+  UpdateInterface;
+end;
+
 procedure TFormMain.MenuItemToolbarClick(Sender: TObject);
 begin
   MenuItemToolbar.Checked := not MenuItemToolbar.Checked;
   UpdateInterface;
+end;
+
+function TFormMain.GetFilteredCase(Text: string): string;
+begin
+  if not CheckBoxCaseSensitive.Checked then Result := UTF8LowerCase(Text)
+    else Result := Text;
 end;
 
@@ -526 +543 @@
          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);
+           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(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);
+             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 FoundCount <> EnteredCount then List.Delete(I);
@@ -591 +608 @@
   AShowImportFormats.Enabled := Assigned(Core.AcronymDb);
   ToolBar1.Visible := MenuItemToolbar.Checked;
+  PanelParam.Visible := MenuItemParam.Checked;
   AHide.Enabled := FormMain.Visible;
 
@@ -622 +640 @@
     Core.AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
     Core.StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
-    CheckBoxExactMath.Checked := ReadBoolWithDefault('ExactMatch', False);
+    CheckBoxExactMatch.Checked := ReadBoolWithDefault('ExactMatch', False);
+    CheckBoxCaseSensitive.Checked := ReadBoolWithDefault('CaseSensitive', False);
     MenuItemToolbar.Checked := ReadBoolWithDefault('ToolBarVisible', True);
+    MenuItemParam.Checked := ReadBoolWithDefault('FilterParamVisible', True);
   finally
     Free;
@@ -652 +672 @@
     WriteBool('AlwaysOnTop', Core.AlwaysOnTop);
     WriteBool('StartMinimizedToTray', Core.StartMinimizedToTray);
-    WriteBool('ExactMatch', CheckBoxExactMath.Checked);
+    WriteBool('ExactMatch', CheckBoxExactMatch.Checked);
+    WriteBool('CaseSensitive', CheckBoxCaseSensitive.Checked);
     WriteBool('ToolBarVisible', MenuItemToolbar.Checked);
+    WriteBool('FilterParamVisible', MenuItemParam.Checked);
   finally
     Free;