paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 17:19:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: clean up

Browse Source 
git-svn-id: trunk@60550 -
This commit is contained in:
mattias 2019-03-01 09:01:32 +00:00
parent 8baa6bdbc1
commit 64c870c6e2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ide/frames/editor_keymapping_options.pas
View File

@ -92,8 +92,7 @@ type
procedure ClearCommandRelation(ARelation: TKeyCommandRelation); procedure ClearCommandRelation(ARelation: TKeyCommandRelation);
function KeyMappingRelationToCaption(Index: Integer): String; function KeyMappingRelationToCaption(Index: Integer): String;
function KeyMappingRelationToCaption(KeyRelation: TKeyCommandRelation): String; function KeyMappingRelationToCaption(KeyRelation: TKeyCommandRelation): String;
function KeyShortCutToCaption(const aKey: TKeyCommandRelation; function KeyShortCutToCaption(const aKey: TKeyCommandRelation): string;
const aShortCut: TIDEShortCut): string;
function CaptionToKeyMappingRelation(aCaption: string): TKeyCommandRelation; function CaptionToKeyMappingRelation(aCaption: string): TKeyCommandRelation;
procedure SetIdleConnected(AValue: boolean); procedure SetIdleConnected(AValue: boolean);
procedure UpdateKeyFilterButton; procedure UpdateKeyFilterButton;
@ -516,7 +515,7 @@ begin
end; end;
function TEditorKeymappingOptionsFrame.KeyShortCutToCaption( function TEditorKeymappingOptionsFrame.KeyShortCutToCaption(
const aKey: TKeyCommandRelation; const aShortCut: TIDEShortCut): string; const aKey: TKeyCommandRelation): string;
begin begin
Result:=aKey.Category.Description+'/' Result:=aKey.Category.Description+'/'
+KeyMappingRelationToCaption(aKey); +KeyMappingRelationToCaption(aKey);
@ -626,11 +625,11 @@ var
ConflictNode.ImageIndex:=imgKeyItem; ConflictNode.ImageIndex:=imgKeyItem;
ConflictNode.StateIndex:=imgKeyItem; ConflictNode.StateIndex:=imgKeyItem;
KeyNode:=ConflictsTreeView.Items.AddChild(ConflictNode, KeyNode:=ConflictsTreeView.Items.AddChild(ConflictNode,
KeyShortCutToCaption(Key1,ShortCut1)); KeyShortCutToCaption(Key1));
KeyNode.ImageIndex := imgKeyItem; KeyNode.ImageIndex := imgKeyItem;
KeyNode.SelectedIndex := imgKeyItem; KeyNode.SelectedIndex := imgKeyItem;
KeyNode:=ConflictsTreeView.Items.AddChild(ConflictNode, KeyNode:=ConflictsTreeView.Items.AddChild(ConflictNode,
KeyShortCutToCaption(Key2,ShortCut2)); KeyShortCutToCaption(Key2));
KeyNode.ImageIndex := imgKeyItem; KeyNode.ImageIndex := imgKeyItem;
KeyNode.SelectedIndex := imgKeyItem; KeyNode.SelectedIndex := imgKeyItem;
ConflictNode.Expanded:=true; ConflictNode.Expanded:=true;