paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 20:40:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: show combination menu shortcuts. IFDEFed because it doesn't show properly on all widgetsets.

Browse Source 
git-svn-id: trunk@29816 -
This commit is contained in:
juha 2011-03-13 15:27:05 +00:00
parent 88d2224a48
commit eba4490d42
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ideintf/idecommands.pas
View File

@ -36,7 +36,7 @@ unit IDECommands;
interface
uses
Classes, SysUtils, LCLProc, Forms, LCLType, Menus, TextTools;
Classes, SysUtils, LCLProc, Forms, LCLType, Menus, PropEdits, TextTools;
const
{ editor commands constants. see syneditkeycmds.pp for more
@ -508,7 +508,7 @@ procedure ExecuteIDEShortCut(Sender: TObject; var Key: word; Shift: TShiftState;
procedure ExecuteIDEShortCut(Sender: TObject; var Key: word; Shift: TShiftState);
function ExecuteIDECommand(Sender: TObject; Command: word): boolean;
function IDEShortCutToMenuShortCut(const IDEShortCut: TIDEShortCut): TShortCut;
function IDEShortCutToMenuShortCut(MenuItem: TMenuItem; const IDEShortCut: TIDEShortCut): TShortCut;
var
// will be set by the IDE
@ -568,7 +568,6 @@ function IDECommandToIdent(Cmd: longint; var Ident: string): boolean;
implementation
function IDEShortCut(Key1: word; Shift1: TShiftState;
Key2: word; Shift2: TShiftState): TIDEShortCut;
begin
@ -599,12 +598,25 @@ begin
Result:=false;
end;
function IDEShortCutToMenuShortCut(const IDEShortCut: TIDEShortCut): TShortCut;
function IDEShortCutToMenuShortCut(MenuItem: TMenuItem; const IDEShortCut: TIDEShortCut): TShortCut;
var
s: String;
begin
if IDEShortCut.Key2=VK_UNKNOWN then
Result:=ShortCut(IDEShortCut.Key1,IDEShortCut.Shift1)
else
else begin
// This shows combination shortcuts. Normally shortcut string is generated
// in widgetset code but it supports only one key (modified by Shift state).
{$IFDEF CombinationShortcuts}
if (IDEShortCut.Key1<>VK_UNKNOWN) and (IDEShortCut.Key2<>VK_UNKNOWN) then begin
s:=KeyAndShiftStateToKeyString(IDEShortCut.Key1,IDEShortCut.Shift1);
if (IDEShortCut.Key2<>VK_UNKNOWN) then
s:=s+', '+KeyAndShiftStateToKeyString(IDEShortCut.Key2,IDEShortCut.Shift2);
MenuItem.Caption:=MenuItem.Caption+#9+s;
end;
{$ENDIF}
Result:=ShortCut(VK_UNKNOWN,[]);
end;
end;
procedure CreateStandardIDECommandScopes;

4
ideintf/menuintf.pas
View File

@ -1622,7 +1622,7 @@ begin
//DebugLn('TIDEMenuCommand.CommandChanged ',Name);
if MenuItem<>nil then
if FCommand<>nil then
MenuItem.ShortCut:=IDEShortCutToMenuShortCut(FCommand.ShortcutA)
MenuItem.ShortCut:=IDEShortCutToMenuShortCut(MenuItem, FCommand.ShortcutA)
else
MenuItem.ShortCut:=0;
end;
@ -1727,7 +1727,7 @@ begin
MenuItem.RightJustify:=RightJustify;
MenuItem.ShowAlwaysCheckable:=ShowAlwaysCheckable;
if Command<>nil then
MenuItem.ShortCut:=IDEShortCutToMenuShortCut(Command.ShortcutA)
MenuItem.ShortCut:=IDEShortCutToMenuShortCut(MenuItem, Command.ShortcutA)
else
MenuItem.ShortCut:=ShortCut(0,[]);
MenuItem.GroupIndex:=GroupIndex;