paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 20:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: keymap conflict: show relation caption

Browse Source 
git-svn-id: trunk@60253 -
This commit is contained in:
mattias 2019-01-31 10:42:32 +00:00
parent 466d4440d0
commit e2a94d370f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/onlinepackagemanager/onlinepackagemanagerintf.pas
View File

@ -59,6 +59,7 @@ var
begin begin
IDEShortCutX := IDEShortCut(VK_O, [ssCtrl, ssAlt], VK_UNKNOWN, []); IDEShortCutX := IDEShortCut(VK_O, [ssCtrl, ssAlt], VK_UNKNOWN, []);
IDECommandCategory := IDECommandList.FindCategoryByName('Components'); IDECommandCategory := IDECommandList.FindCategoryByName('Components');
IDECommand := nil;
if IDECommandCategory <> nil then if IDECommandCategory <> nil then
begin begin
IDECommand := RegisterIDECommand(IDECommandCategory, 'Online Package Manager', rsLazarusPackageManager, IDEShortCutX, nil, @IDEMenuSectionClicked); IDECommand := RegisterIDECommand(IDECommandCategory, 'Online Package Manager', rsLazarusPackageManager, IDEShortCutX, nil, @IDEMenuSectionClicked);

4
ide/frames/editor_keymapping_options.pas
View File

@ -519,7 +519,7 @@ function TEditorKeymappingOptionsFrame.KeyShortCutToCaption(
const aKey: TKeyCommandRelation; const aShortCut: TIDEShortCut): string; const aKey: TKeyCommandRelation; const aShortCut: TIDEShortCut): string;
begin begin
Result:=aKey.Category.Description+'/' Result:=aKey.Category.Description+'/'
+EditorCommandToDescriptionString(aKey.Command) +KeyMappingRelationToCaption(aKey)
+'->'+KeyAndShiftStateToEditorKeyString(aShortCut); +'->'+KeyAndShiftStateToEditorKeyString(aShortCut);
end; end;
@ -616,7 +616,7 @@ var
if (ShortCut1.Key1=VK_UNKNOWN) if (ShortCut1.Key1=VK_UNKNOWN)
or (ShortCut1.Key1<>ShortCut2.Key1) or (ShortCut1.Key1<>ShortCut2.Key1)
or (ShortCut1.Shift1<>ShortCut2.Shift1) then or (ShortCut1.Shift1<>ShortCut2.Shift1) then
exit; // first keys differ exit; // first key differ
if (ShortCut1.Key2=VK_UNKNOWN) or (ShortCut2.Key2=VK_UNKNOWN) if (ShortCut1.Key2=VK_UNKNOWN) or (ShortCut2.Key2=VK_UNKNOWN)
or ((ShortCut1.Key2=ShortCut2.Key2) and (ShortCut1.Shift2=ShortCut2.Shift2)) or ((ShortCut1.Key2=ShortCut2.Key2) and (ShortCut1.Shift2=ShortCut2.Shift2))