IDE: key mapping: clean up

git-svn-id: trunk@41113 -
This commit is contained in:
mattias 2013-05-10 09:54:28 +00:00
parent 8a4d5a3b7b
commit 403beeb8fc
2 changed files with 1 additions and 3 deletions

View File

@ -148,8 +148,6 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
ClientWidth = 475
TabOrder = 5
object ConflictsTreeView: TTreeView
AnchorSideTop.Control = KeyMapSplitter
AnchorSideTop.Side = asrBottom
Left = 0
Height = 93
Top = 253

View File

@ -592,7 +592,7 @@ var
if (ShortCut1.Key2=VK_UNKNOWN) or (ShortCut2.Key2=VK_UNKNOWN)
or ((ShortCut1.Key2=ShortCut2.Key2) and (ShortCut1.Shift2=ShortCut2.Shift2))
then begin
// conflict found
// conflict found, add node with a sub node for each key
inc(ConflictCount);
ConflictNode:=ConflictsTreeView.Items.Add(nil,srkmConflic+IntToStr(ConflictCount));
ConflictNode.ImageIndex:=imgKeyItem;