#444: show initial captions and hints of TAction's on shortcut page i…

…n preferences dialog
HeidiSQL · Apr 21, 2020 · 40c1f4c · 40c1f4c
1 parent 114b92d
commit 40c1f4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/source/main.pas b/source/main.pas
@@ -1118,6 +1118,8 @@   TMainForm = class(TExtForm)
     FLastPortableSettingsSave: Cardinal;
     FLastAppSettingsWrites: Integer;
     FFormatSettings: TFormatSettings;
+    FActionList1DefaultCaptions: TStringList;
+    FActionList1DefaultHints: TStringList;
 
     // Host subtabs backend structures
     FHostListResults: TDBQueryList;
@@ -1242,6 +1244,8 @@   TMainForm = class(TExtForm)
     procedure ApplyVTFilter(FromTimer: Boolean);
     procedure ApplyFontToGrids;
     procedure PrepareImageList;
+    property ActionList1DefaultCaptions: TStringList read FActionList1DefaultCaptions;
+    property ActionList1DefaultHints: TStringList read FActionList1DefaultHints;
 end;
 
 
@@ -1948,9 +1952,13 @@ procedure TMainForm.FormCreate(Sender: TObject);
   RestoreListSetup(ListTables);
 
   // Shortcuts
+  FActionList1DefaultCaptions := TStringList.Create;
+  FActionList1DefaultHints := TStringList.Create;
   for i:=0 to ActionList1.ActionCount-1 do begin
     Action := TAction(ActionList1.Actions[i]);
     Action.ShortCut := AppSettings.ReadInt(asActionShortcut1, Action.Name, Action.ShortCut);
+    FActionList1DefaultCaptions.Insert(i, Action.Caption);
+    FActionList1DefaultHints.Insert(i, Action.Hint);
   end;
 
   // Size of completion proposal window

diff --git a/source/options.pas b/source/options.pas
@@ -1098,8 +1098,8 @@ procedure Toptionsform.TreeShortcutItemsFocusChanged(Sender: TBaseVirtualTree; N
     lblShortcutHint.Caption := TreeShortcutItems.Text[Node, 0];
     if Assigned(Data.Action) then begin
       lblShortcut2.Enabled := False;
-      if Data.Action.Hint <> '' then
-        lblShortcutHint.Caption := Data.Action.Hint;
+      if MainForm.ActionList1DefaultHints[Data.Action.Index] <> '' then
+        lblShortcutHint.Caption := MainForm.ActionList1DefaultHints[Data.Action.Index];
     end;
     Shortcut1.HotKey := Data.ShortCut1;
     Shortcut2.HotKey := Data.ShortCut2;
@@ -1155,8 +1155,7 @@ procedure Toptionsform.TreeShortcutItemsGetText(Sender: TBaseVirtualTree; Node:
         end;
         CellText := _(CellText);
       end else if Assigned(Data.Action) then begin
-        CellText := Data.Action.Caption;
-        CellText := StripHotkey(CellText);
+        CellText := MainForm.ActionList1DefaultCaptions[Data.Action.Index];
       end;
     end;
   end;