#444: show initial captions and hints of TAction's on shortcut page in preferences dialog

This commit is contained in:
Ansgar Becker
2020-04-21 18:12:27 +02:00
parent 114b92d27a
commit 40c1f4c03c
2 changed files with 11 additions and 4 deletions

View File

@ -1098,8 +1098,8 @@ begin
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 @@ begin
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;