diff --git a/ide/frames/editor_keymapping_options.lfm b/ide/frames/editor_keymapping_options.lfm index 334bd2956d..42ff94356c 100644 --- a/ide/frames/editor_keymapping_options.lfm +++ b/ide/frames/editor_keymapping_options.lfm @@ -1,11 +1,10 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame Left = 0 - Height = 530 + Height = 424 Top = 0 - Width = 574 - ClientHeight = 530 - ClientWidth = 574 - DesignTimePPI = 120 + Width = 459 + ClientHeight = 424 + ClientWidth = 459 ParentFont = False TabOrder = 0 Visible = False @@ -16,14 +15,14 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame AnchorSideTop.Side = asrBottom AnchorSideRight.Control = FindKeyButton Left = 0 - Height = 28 - Top = 8 - Width = 382 + Height = 23 + Top = 6 + Width = 299 OnAfterFilter = FilterEditAfterFilter OnFilterItem = FilterEditFilterItem - ButtonWidth = 29 + ButtonWidth = 23 Anchors = [akTop, akLeft, akRight] - BorderSpacing.Top = 8 + BorderSpacing.Top = 6 NumGlyphs = 1 MaxLength = 0 ParentFont = False @@ -37,13 +36,13 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame AnchorSideTop.Control = FilterEdit AnchorSideTop.Side = asrCenter AnchorSideRight.Control = ResetKeyFilterBtn - Left = 406 - Height = 30 - Top = 7 - Width = 122 + Left = 318 + Height = 25 + Top = 5 + Width = 104 Anchors = [akTop, akRight] AutoSize = True - BorderSpacing.Left = 24 + BorderSpacing.Left = 19 BorderSpacing.Right = 2 Caption = 'FindKeyButton' TabOrder = 1 @@ -55,12 +54,12 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = FindKeyButton AnchorSideBottom.Side = asrBottom - Left = 530 - Height = 30 - Top = 7 - Width = 36 + Left = 424 + Height = 25 + Top = 5 + Width = 29 Anchors = [akTop, akRight, akBottom] - BorderSpacing.Right = 8 + BorderSpacing.Right = 6 OnClick = ResetKeyFilterBtnClick end object KeyMapTreePanel: TPanel @@ -72,22 +71,160 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame AnchorSideBottom.Control = Owner AnchorSideBottom.Side = asrBottom Left = 0 - Height = 491 - Top = 37 - Width = 574 + Height = 392 + Top = 30 + Width = 459 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Bottom = 2 BevelOuter = bvNone - ClientHeight = 491 - ClientWidth = 574 + ClientHeight = 392 + ClientWidth = 459 TabOrder = 2 + object pnlKeys: TPanel + Left = 0 + Height = 207 + Top = 0 + Width = 459 + Align = alClient + BevelOuter = bvNone + ClientHeight = 207 + ClientWidth = 459 + TabOrder = 2 + object TreeView: TTreeView + Left = 0 + Height = 147 + Top = 3 + Width = 459 + Align = alClient + BorderSpacing.Top = 3 + BorderWidth = 1 + PopupMenu = PopupMenu1 + ReadOnly = True + RightClickSelect = True + RowSelect = True + ScrollBars = ssAutoBoth + TabOrder = 0 + Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] + OnDblClick = TreeViewDblClick + OnKeyPress = TreeViewKeyPress + OnSelectionChanged = TreeViewSelectionChanged + end + object BtnPanel: TPanel + Left = 0 + Height = 57 + Top = 150 + Width = 459 + Align = alBottom + AutoSize = True + BevelOuter = bvNone + ClientHeight = 57 + ClientWidth = 459 + TabOrder = 1 + object ChooseSchemeButton: TBitBtn + AnchorSideLeft.Control = BtnPanel + AnchorSideTop.Control = EditButton + AnchorSideTop.Side = asrBottom + AnchorSideBottom.Side = asrBottom + Left = 0 + Height = 25 + Top = 31 + Width = 144 + AutoSize = True + Caption = 'ChooseSchemeButton' + TabOrder = 0 + OnClick = ChooseSchemeButtonClick + end + object SchemeLabel: TLabel + AnchorSideLeft.Control = ChooseSchemeButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ChooseSchemeButton + AnchorSideTop.Side = asrCenter + Left = 150 + Height = 15 + Top = 36 + Width = 70 + BorderSpacing.Around = 6 + Caption = 'SchemeLabel' + ParentColor = False + end + object ClearButton: TBitBtn + AnchorSideLeft.Control = EditButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = BtnPanel + AnchorSideRight.Control = BtnPanel + AnchorSideRight.Side = asrBottom + Left = 179 + Height = 25 + Top = 0 + Width = 89 + AutoSize = True + BorderSpacing.Left = 6 + BorderSpacing.Bottom = 6 + Caption = 'ClearButton' + TabOrder = 1 + OnClick = ClearButtonClick + end + object EditButton: TBitBtn + AnchorSideLeft.Control = CommandLabel + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = BtnPanel + Left = 91 + Height = 25 + Top = 0 + Width = 82 + AutoSize = True + BorderSpacing.Left = 6 + BorderSpacing.Right = 6 + BorderSpacing.Bottom = 6 + Caption = 'EditButton' + TabOrder = 2 + OnClick = EditButtonClick + end + object CommandLabel: TLabel + AnchorSideLeft.Control = BtnPanel + AnchorSideTop.Control = EditButton + AnchorSideTop.Side = asrCenter + Left = 0 + Height = 15 + Top = 5 + Width = 85 + BorderSpacing.Right = 6 + Caption = 'CommandLabel' + ParentColor = False + end + object ExportButton: TButton + AnchorSideLeft.Control = ClearButton + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = ClearButton + AnchorSideTop.Side = asrCenter + Left = 288 + Height = 25 + Top = 0 + Width = 96 + AutoSize = True + BorderSpacing.Left = 20 + Caption = 'ExportButton' + TabOrder = 3 + OnClick = ExportButtonClick + end + end + end + object KeyMapSplitter: TSplitter + Cursor = crVSplit + Left = 0 + Height = 5 + Top = 207 + Width = 459 + Align = alBottom + ResizeAnchor = akBottom + OnMoved = KeyMapSplitterMoved + end object ConflictsTreeView: TTreeView Left = 0 - Height = 238 - Top = 253 - Width = 574 + Height = 180 + Top = 212 + Width = 459 Align = alBottom - Anchors = [akTop, akLeft, akRight, akBottom] BorderWidth = 1 PopupMenu = PopupMenu1 ReadOnly = True @@ -98,139 +235,11 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] OnMouseDown = ConflictsTreeViewMouseDown end - object KeyMapSplitter: TSplitter - Cursor = crVSplit - Left = 0 - Height = 6 - Top = 247 - Width = 574 - Align = alBottom - ResizeAnchor = akBottom - OnMoved = KeyMapSplitterMoved - end - object TreeView: TTreeView - Left = 0 - Height = 172 - Top = 4 - Width = 574 - Align = alClient - BorderSpacing.Top = 4 - BorderWidth = 1 - PopupMenu = PopupMenu1 - ReadOnly = True - RightClickSelect = True - RowSelect = True - ScrollBars = ssAutoBoth - TabOrder = 2 - Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw] - OnDblClick = TreeViewDblClick - OnKeyPress = TreeViewKeyPress - OnSelectionChanged = TreeViewSelectionChanged - end - object BtnPanel: TPanel - Left = 0 - Height = 71 - Top = 176 - Width = 574 - Align = alBottom - AutoSize = True - BevelOuter = bvNone - ClientHeight = 71 - ClientWidth = 574 - TabOrder = 3 - object ChooseSchemeButton: TBitBtn - AnchorSideLeft.Control = BtnPanel - AnchorSideTop.Control = EditButton - AnchorSideTop.Side = asrBottom - AnchorSideBottom.Side = asrBottom - Left = 0 - Height = 30 - Top = 38 - Width = 171 - AutoSize = True - Caption = 'ChooseSchemeButton' - TabOrder = 0 - OnClick = ChooseSchemeButtonClick - end - object SchemeLabel: TLabel - AnchorSideLeft.Control = ChooseSchemeButton - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = ChooseSchemeButton - AnchorSideTop.Side = asrCenter - Left = 179 - Height = 20 - Top = 43 - Width = 88 - BorderSpacing.Around = 8 - Caption = 'SchemeLabel' - ParentColor = False - end - object ClearButton: TBitBtn - AnchorSideLeft.Control = EditButton - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = BtnPanel - AnchorSideRight.Control = BtnPanel - AnchorSideRight.Side = asrBottom - Left = 217 - Height = 30 - Top = 0 - Width = 104 - AutoSize = True - BorderSpacing.Left = 8 - BorderSpacing.Bottom = 8 - Caption = 'ClearButton' - TabOrder = 1 - OnClick = ClearButtonClick - end - object EditButton: TBitBtn - AnchorSideLeft.Control = CommandLabel - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = BtnPanel - Left = 113 - Height = 30 - Top = 0 - Width = 96 - AutoSize = True - BorderSpacing.Left = 8 - BorderSpacing.Right = 8 - BorderSpacing.Bottom = 8 - Caption = 'EditButton' - TabOrder = 2 - OnClick = EditButtonClick - end - object CommandLabel: TLabel - AnchorSideLeft.Control = BtnPanel - AnchorSideTop.Control = EditButton - AnchorSideTop.Side = asrCenter - Left = 0 - Height = 20 - Top = 5 - Width = 105 - BorderSpacing.Right = 8 - Caption = 'CommandLabel' - ParentColor = False - end - object ExportButton: TButton - AnchorSideLeft.Control = ClearButton - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = ClearButton - AnchorSideTop.Side = asrCenter - Left = 346 - Height = 30 - Top = 0 - Width = 113 - AutoSize = True - BorderSpacing.Left = 25 - Caption = 'ExportButton' - TabOrder = 3 - OnClick = ExportButtonClick - end - end end object PopupMenu1: TPopupMenu OnPopup = PopupMenu1Popup - Left = 440 - Top = 60 + Left = 352 + Top = 48 object EditMenuItem: TMenuItem Caption = 'Edit Key Mapping' OnClick = EditMenuItemClick diff --git a/ide/frames/editor_keymapping_options.pas b/ide/frames/editor_keymapping_options.pas index dfbd20defa..9a2ca9517d 100644 --- a/ide/frames/editor_keymapping_options.pas +++ b/ide/frames/editor_keymapping_options.pas @@ -56,6 +56,7 @@ type ConflictsTreeView: TTreeView; KeyMapSplitter: TSplitter; KeyMapTreePanel: TPanel; + pnlKeys: TPanel; SchemeLabel: TLabel; ResetKeyFilterBtn: TSpeedButton; TreeView: TTreeView;