IDE: keymap options: moved buttons to tree

git-svn-id: trunk@41173 -

ide/frames/editor_keymapping_options.lfm

@@ -1,10 +1,10 @@
 object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
   Left = 0
-  Height = 437
+  Height = 424
   Top = 0
-  Width = 475
-  ClientHeight = 437
-  ClientWidth = 475
+  Width = 459
+  ClientHeight = 424
+  ClientWidth = 459
   TabOrder = 0
   Visible = False
   DesignLeft = 312
@@ -14,9 +14,9 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = FindKeyButton
     Left = 0
-    Height = 25
+    Height = 22
     Top = 6
-    Width = 273
+    Width = 257
     OnFilterItem = FilterEditFilterItem
     ButtonWidth = 23
     NumGlyphs = 1
@@ -29,102 +29,32 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
     FilteredTreeview = TreeView
     ExpandAllInitially = True
   end
-  object ClearButton: TBitBtn
-    AnchorSideRight.Side = asrBottom
-    Left = 396
-    Height = 27
-    Top = 380
-    Width = 79
-    Anchors = [akRight, akBottom]
-    AutoSize = True
-    BorderSpacing.Bottom = 6
-    Caption = 'ClearButton'
-    OnClick = ClearButtonClick
-    TabOrder = 2
-  end
   object FindKeyButton: TBitBtn
-    AnchorSideLeft.Control = FilterEdit
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = FilterEdit
     AnchorSideTop.Side = asrCenter
     AnchorSideRight.Control = ResetKeyFilterBtn
-    Left = 343
-    Height = 27
-    Top = 5
-    Width = 95
+    Left = 307
+    Height = 22
+    Top = 6
+    Width = 115
     Anchors = [akTop, akRight]
     AutoSize = True
-    BorderSpacing.Left = 70
+    BorderSpacing.Left = 50
     BorderSpacing.Right = 2
     Caption = 'FindKeyButton'
     OnClick = FindKeyButtonClick
     TabOrder = 1
   end
-  object ChooseSchemeButton: TBitBtn
-    AnchorSideLeft.Control = Owner
-    AnchorSideBottom.Control = Owner
-    AnchorSideBottom.Side = asrBottom
-    Left = 0
-    Height = 27
-    Top = 410
-    Width = 134
-    Anchors = [akLeft, akBottom]
-    AutoSize = True
-    Caption = 'ChooseSchemeButton'
-    OnClick = ChooseSchemeButtonClick
-    TabOrder = 3
-  end
-  object SchemeLabel: TLabel
-    AnchorSideLeft.Control = ChooseSchemeButton
-    AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = ChooseSchemeButton
-    AnchorSideTop.Side = asrCenter
-    Left = 140
-    Height = 15
-    Top = 416
-    Width = 72
-    BorderSpacing.Around = 6
-    Caption = 'SchemeLabel'
-    ParentColor = False
-  end
-  object EditButton: TBitBtn
-    AnchorSideTop.Control = ClearButton
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = ClearButton
-    Left = 317
-    Height = 27
-    Top = 380
-    Width = 73
-    Anchors = [akTop, akRight]
-    AutoSize = True
-    BorderSpacing.Right = 6
-    BorderSpacing.Bottom = 6
-    Caption = 'EditButton'
-    OnClick = EditButtonClick
-    TabOrder = 4
-  end
-  object CommandLabel: TLabel
-    AnchorSideTop.Control = EditButton
-    AnchorSideTop.Side = asrCenter
-    AnchorSideRight.Control = EditButton
-    Left = 228
-    Height = 15
-    Top = 386
-    Width = 83
-    Anchors = [akTop, akRight]
-    BorderSpacing.Right = 6
-    Caption = 'CommandLabel'
-    ParentColor = False
-  end
   object ResetKeyFilterBtn: TSpeedButton
     AnchorSideTop.Control = FindKeyButton
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Control = FindKeyButton
     AnchorSideBottom.Side = asrBottom
-    Left = 440
-    Height = 27
-    Top = 5
+    Left = 424
+    Height = 22
+    Top = 6
     Width = 29
     Anchors = [akTop, akRight, akBottom]
     BorderSpacing.Right = 6
@@ -136,24 +66,26 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
-    AnchorSideBottom.Control = EditButton
+    AnchorSideBottom.Control = Owner
+    AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 346
-    Top = 32
-    Width = 475
+    Height = 394
+    Top = 28
+    Width = 459
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Bottom = 2
     BevelOuter = bvNone
-    ClientHeight = 346
-    ClientWidth = 475
-    TabOrder = 5
+    ClientHeight = 394
+    ClientWidth = 459
+    TabOrder = 2
     object ConflictsTreeView: TTreeView
       Left = 0
-      Height = 93
+      Height = 141
       Top = 253
-      Width = 475
+      Width = 459
       Align = alBottom
       Anchors = [akTop, akLeft, akRight, akBottom]
+      BorderWidth = 1
       DefaultItemHeight = 18
       ReadOnly = True
       RightClickSelect = True
@@ -168,17 +100,18 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
       Left = 0
       Height = 5
       Top = 248
-      Width = 475
+      Width = 459
       Align = alBottom
       ResizeAnchor = akBottom
     end
     object TreeView: TTreeView
       Left = 0
-      Height = 245
+      Height = 192
       Top = 3
-      Width = 475
+      Width = 459
       Align = alClient
       BorderSpacing.Top = 3
+      BorderWidth = 1
       DefaultItemHeight = 18
       PopupMenu = PopupMenu1
       ReadOnly = True
@@ -191,6 +124,88 @@ object EditorKeymappingOptionsFrame: TEditorKeymappingOptionsFrame
       OnSelectionChanged = TreeViewSelectionChanged
       Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoRightClickSelect, tvoRowSelect, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips, tvoThemedDraw]
     end
+    object BtnPanel: TPanel
+      Left = 0
+      Height = 53
+      Top = 195
+      Width = 459
+      Align = alBottom
+      AutoSize = True
+      BevelOuter = bvNone
+      ClientHeight = 53
+      ClientWidth = 459
+      TabOrder = 3
+      object ChooseSchemeButton: TBitBtn
+        AnchorSideLeft.Control = BtnPanel
+        AnchorSideTop.Control = EditButton
+        AnchorSideTop.Side = asrBottom
+        AnchorSideBottom.Side = asrBottom
+        Left = 0
+        Height = 22
+        Top = 28
+        Width = 161
+        AutoSize = True
+        Caption = 'ChooseSchemeButton'
+        OnClick = ChooseSchemeButtonClick
+        TabOrder = 0
+      end
+      object SchemeLabel: TLabel
+        AnchorSideLeft.Control = ChooseSchemeButton
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = ChooseSchemeButton
+        AnchorSideTop.Side = asrCenter
+        Left = 167
+        Height = 16
+        Top = 31
+        Width = 82
+        BorderSpacing.Around = 6
+        Caption = 'SchemeLabel'
+        ParentColor = False
+      end
+      object ClearButton: TBitBtn
+        AnchorSideTop.Control = BtnPanel
+        AnchorSideRight.Control = BtnPanel
+        AnchorSideRight.Side = asrBottom
+        Left = 361
+        Height = 22
+        Top = 0
+        Width = 98
+        Anchors = [akTop, akRight]
+        AutoSize = True
+        BorderSpacing.Bottom = 6
+        Caption = 'ClearButton'
+        OnClick = ClearButtonClick
+        TabOrder = 1
+      end
+      object EditButton: TBitBtn
+        AnchorSideTop.Control = BtnPanel
+        AnchorSideRight.Control = ClearButton
+        Left = 265
+        Height = 22
+        Top = 0
+        Width = 90
+        Anchors = [akTop, akRight]
+        AutoSize = True
+        BorderSpacing.Right = 6
+        BorderSpacing.Bottom = 6
+        Caption = 'EditButton'
+        OnClick = EditButtonClick
+        TabOrder = 2
+      end
+      object CommandLabel: TLabel
+        AnchorSideTop.Control = EditButton
+        AnchorSideTop.Side = asrCenter
+        AnchorSideRight.Control = EditButton
+        Left = 161
+        Height = 16
+        Top = 3
+        Width = 98
+        Anchors = [akTop, akRight]
+        BorderSpacing.Right = 6
+        Caption = 'CommandLabel'
+        ParentColor = False
+      end
+    end
   end
   object PopupMenu1: TPopupMenu
     OnPopup = PopupMenu1Popup

ide/frames/editor_keymapping_options.pas

@@ -36,6 +36,7 @@ type
   { TEditorKeymappingOptionsFrame }
 
   TEditorKeymappingOptionsFrame = class(TAbstractIDEOptionsEditor)
+    BtnPanel: TPanel;
     ChooseSchemeButton: TBitBtn;
     ClearButton: TBitBtn;
     EditButton: TBitBtn;