Configurable quick search shortcuts [Part II]

1 files changed, 42 insertions, 15 deletions

diff --git a/UPreferences.pas b/UPreferences.pas
index c289b7c..407c40b 100644
--- a/UPreferences.pas
+++ b/UPreferences.pas
@@ -74,6 +74,8 @@ type
     CustomTimeFormatEntry: TGTKEntry;
     DateTimeFormatLabel: TGTKLabel;
     DateTimeFormatOptionMenu: TGTKOptionMenu;
+    QuickSearchLabel: TGTKLabel;
+    QuickSearchOptionMenu: TGTKOptionMenu;
 
     procedure FormCreate(Sender: TObject); override;
     procedure FormDestroy(Sender: TObject);
@@ -330,51 +332,74 @@ begin
   PanelsPage.AddControlEx(PanelsLabel2, False, False, 5);
 
   Table5 := TGTKTable.Create(Self);
-  Table5.SetRowColCount(14, 1);
+  Table5.SetRowColCount(16, 2);
   PanelsPage.AddControlEx(Table5, False, False, 0);
 
   DisableMouseRename := TGTKCheckButton.CreateWithLabel(Self, LANGPreferences_DisableMouseRenaming);
   DisableMouseRename.Tooltip := LANGPreferencesDisableMouseRename_Tooltip;
-  Table5.AddControl(0, 0, 1, 1, DisableMouseRename, 30, 2);
+  Table5.AddControl(0, 0, 2, 1, DisableMouseRename, 30, 2);
   DisableFileTipsCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesDisableFileTipsCheckBox_Caption);
   DisableFileTipsCheckBox.Tooltip := LANGPreferencesDisableFileTipsCheckBox_Tooltip;
-  Table5.AddControl(0, 1, 1, 1, DisableFileTipsCheckBox, 30, 2);
-  Table5.AddControl(0, 2, 1, 1, TGTKVBox.Create(Self), 0, 7);
+  Table5.AddControl(0, 1, 2, 1, DisableFileTipsCheckBox, 30, 2);
+  Table5.AddControl(0, 2, 2, 1, TGTKVBox.Create(Self), 0, 7);
 
   PanelsLabel3 := TGTKLabel.Create(Self);
   PanelsLabel3.XAlign := 0;
   PanelsLabel3.XPadding := 0;
   PanelsLabel3.Caption := Format('<span weight="ultrabold">%s</span>', [LANGPreferencesShow]);
   PanelsLabel3.UseMarkup := True;
-  Table5.AddControl(0, 3, 1, 1, PanelsLabel3, 10, 2);
+  Table5.AddControl(0, 3, 2, 1, PanelsLabel3, 10, 2);
 
   ShowFiletypeIcons := TGTKCheckButton.CreateWithLabel(Self, LANGPreferences_ShowFiletypeIconsInList);
-  Table5.AddControl(0, 4, 1, 1, ShowFiletypeIcons, 30, 2);
+  Table5.AddControl(0, 4, 2, 1, ShowFiletypeIcons, 30, 2);
   DirsInBoldCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesDirsInBoldCheckBox_Caption);
-  Table5.AddControl(0, 5, 1, 1, DirsInBoldCheckBox, 30, 2);
+  Table5.AddControl(0, 5, 2, 1, DirsInBoldCheckBox, 30, 2);
   DisableDirectoryBracketsCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesDisableDirectoryBracketsCheckBox_Caption);
-  Table5.AddControl(0, 6, 1, 1, DisableDirectoryBracketsCheckBox, 30, 2);
+  Table5.AddControl(0, 6, 2, 1, DisableDirectoryBracketsCheckBox, 30, 2);
   OctalPermissionsCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesOctalPermissionsCheckBox_Caption);
   OctalPermissionsCheckBox.Tooltip := LANGPreferencesOctalPermissionsCheckBox_Tooltip;
-  Table5.AddControl(0, 7, 1, 1, OctalPermissionsCheckBox, 30, 2);
+  Table5.AddControl(0, 7, 2, 1, OctalPermissionsCheckBox, 30, 2);
   ShowTextUIDsCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGShowTextUIDsCheckBox_Caption);
   ShowTextUIDsCheckBox.Tooltip := LANGShowTextUIDsCheckBox_Tooltip;
-  Table5.AddControl(0, 8, 1, 1, ShowTextUIDsCheckBox, 30, 2);
-  Table5.AddControl(0, 9, 1, 1, TGTKVBox.Create(Self), 0, 7);
+  Table5.AddControl(0, 8, 2, 1, ShowTextUIDsCheckBox, 30, 2);
+  Table5.AddControl(0, 9, 2, 1, TGTKVBox.Create(Self), 0, 7);
 
   PanelsLabel4 := TGTKLabel.Create(Self);
   PanelsLabel4.XAlign := 0;
   PanelsLabel4.XPadding := 0;
   PanelsLabel4.Caption := Format('<span weight="ultrabold">%s</span>', [LANGPreferencesMovement]);
   PanelsLabel4.UseMarkup := True;
-  Table5.AddControl(0, 10, 1, 1, PanelsLabel4, 10, 2);
+  Table5.AddControl(0, 10, 2, 1, PanelsLabel4, 10, 2);
 
   LynxLikeMotionCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesLynxLikeMotionCheckBox_Caption);
-  Table5.AddControl(0, 11, 1, 1, LynxLikeMotionCheckBox, 30, 2);
+  Table5.AddControl(0, 11, 2, 1, LynxLikeMotionCheckBox, 30, 2);
   InsertMovesDownCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesInsertMovesDownCheckBox_Caption);
-  Table5.AddControl(0, 12, 1, 1, InsertMovesDownCheckBox, 30, 2);
+  Table5.AddControl(0, 12, 2, 1, InsertMovesDownCheckBox, 30, 2);
   SpaceMovesDownCheckBox := TGTKCheckButton.CreateWithLabel(Self, LANGPreferencesSpaceMovesDownCheckBox_Caption);
-  Table5.AddControl(0, 13, 1, 1, SpaceMovesDownCheckBox, 30, 2);
+  Table5.AddControl(0, 13, 2, 1, SpaceMovesDownCheckBox, 30, 2);
+
+  QuickSearchLabel := TGTKLabel.Create(Self);
+  QuickSearchLabel.Caption := 'Quick search _keystroke:';
+  QuickSearchLabel.XAlign := 0;
+  QuickSearchLabel.UseUnderline := True;
+  QuickSearchOptionMenu := TGTKOptionMenu.Create(Self);
+  QuickSearchOptionMenu.Tooltip := 'The Ctrl+S/Alt+S and "/" keystrokes are always active, regardless on this setting.';
+  QuickSearchLabel.FocusControl := QuickSearchOptionMenu;
+  Item := TGTKMenuItem.CreateTyped(Self, itLabel);
+  Item.Caption := 'Ctrl+S/Alt+S and "/"';
+  QuickSearchOptionMenu.Items.Add(Item);
+  Item := TGTKMenuItem.CreateTyped(Self, itLabel);
+  Item.Caption := 'Ctrl+Alt+letters';
+  QuickSearchOptionMenu.Items.Add(Item);
+  Item := TGTKMenuItem.CreateTyped(Self, itLabel);
+  Item.Caption := 'Alt+letters';
+  QuickSearchOptionMenu.Items.Add(Item);
+  Item := TGTKMenuItem.CreateTyped(Self, itLabel);
+  Item.Caption := 'letters directly';
+  QuickSearchOptionMenu.Items.Add(Item);
+  Table5.AddControl(0, 14, 2, 1, TGTKVBox.Create(Self), 0, 2);
+  Table5.AddControlEx(0, 15, 1, 1, QuickSearchLabel, [taoShrink], [taoShrink], 35, 2);
+  Table5.AddControlEx(1, 15, 1, 1, QuickSearchOptionMenu, [taoExpand, taoFill], [taoShrink, taoExpand, taoFill], 20, 2);
 
 
   // *********  PAGE Applications
@@ -860,6 +885,7 @@ begin
   DateFormatOptionMenu.ItemIndex := ConfDateFormat;
   TimeFormatOptionMenu.ItemIndex := ConfTimeFormat;
   DateTimeFormatOptionMenu.ItemIndex := ConfDateTimeFormat;
+  QuickSearchOptionMenu.ItemIndex := ConfQuickSearchActivationKey;
 
   DefaultFontCheckBoxToggled(Self);
   ColorButtonDefaultsToggled(Self);
@@ -929,6 +955,7 @@ begin
   ConfDateFormat := DateFormatOptionMenu.ItemIndex;
   ConfTimeFormat := TimeFormatOptionMenu.ItemIndex;
   ConfDateTimeFormat := DateTimeFormatOptionMenu.ItemIndex;
+  ConfQuickSearchActivationKey := QuickSearchOptionMenu.ItemIndex;
 end;
 
 (********************************************************************************************************************************)