From d34fb6598f05cb413192b08c8cdd8a41654b3db2 Mon Sep 17 00:00:00 2001 From: juha Date: Mon, 21 Jul 2014 11:50:00 +0000 Subject: [PATCH] EditorToolbar: add a splitter between panes. git-svn-id: trunk@45951 - --- components/editortoolbar/edttbconfigfrm.lfm | 134 ++++++++++++-------- components/editortoolbar/edttbconfigfrm.pas | 1 + 2 files changed, 79 insertions(+), 56 deletions(-) diff --git a/components/editortoolbar/edttbconfigfrm.lfm b/components/editortoolbar/edttbconfigfrm.lfm index d1f3cf3959..1606e83e00 100644 --- a/components/editortoolbar/edttbconfigfrm.lfm +++ b/components/editortoolbar/edttbconfigfrm.lfm @@ -1,29 +1,28 @@ object EdtTbConfigForm: TEdtTbConfigForm Left = 375 - Height = 437 + Height = 457 Top = 200 - Width = 651 + Width = 722 Caption = 'EdtTbConfigForm' - ClientHeight = 437 - ClientWidth = 651 + ClientHeight = 457 + ClientWidth = 722 OnCreate = FormCreate LCLVersion = '1.3' object lblMenuTree: TLabel Left = 16 - Height = 17 + Height = 20 Top = 14 - Width = 80 + Width = 83 Caption = 'lblMenuTree' ParentColor = False end object lblToolbar: TLabel - AnchorSideLeft.Control = btnAdd - AnchorSideLeft.Side = asrBottom - Left = 456 - Height = 17 + AnchorSideLeft.Control = lbToolbar + AnchorSideTop.Control = lblpos + Left = 443 + Height = 20 Top = 14 - Width = 61 - BorderSpacing.Left = 13 + Width = 69 Caption = 'lblToolbar' ParentColor = False end @@ -31,9 +30,9 @@ object EdtTbConfigForm: TEdtTbConfigForm AnchorSideLeft.Control = btnAdd AnchorSideTop.Control = btnAdd AnchorSideTop.Side = asrBottom - Left = 421 + Left = 415 Height = 26 - Top = 101 + Top = 126 Width = 22 BorderSpacing.Top = 1 Enabled = False @@ -42,15 +41,15 @@ object EdtTbConfigForm: TEdtTbConfigForm ParentShowHint = False end object btnAdd: TSpeedButton - AnchorSideLeft.Control = TV + AnchorSideLeft.Control = Splitter1 AnchorSideLeft.Side = asrBottom - AnchorSideTop.Side = asrBottom - Left = 421 + AnchorSideTop.Control = TV + Left = 415 Height = 26 - Top = 74 + Top = 99 Width = 22 - BorderSpacing.Left = 13 - BorderSpacing.Top = 1 + BorderSpacing.Left = 6 + BorderSpacing.Top = 25 Enabled = False OnClick = btnAddClick ShowHint = True @@ -58,10 +57,13 @@ object EdtTbConfigForm: TEdtTbConfigForm end object btnMoveUp: TSpeedButton AnchorSideLeft.Control = btnRemove - Left = 421 + AnchorSideTop.Control = btnRemove + AnchorSideTop.Side = asrBottom + Left = 415 Height = 26 - Top = 157 + Top = 177 Width = 22 + BorderSpacing.Top = 25 Enabled = False OnClick = btnMoveUpClick ShowHint = True @@ -71,9 +73,9 @@ object EdtTbConfigForm: TEdtTbConfigForm AnchorSideLeft.Control = btnMoveUp AnchorSideTop.Control = btnMoveUp AnchorSideTop.Side = asrBottom - Left = 421 + Left = 415 Height = 26 - Top = 184 + Top = 204 Width = 22 BorderSpacing.Top = 1 Enabled = False @@ -84,12 +86,12 @@ object EdtTbConfigForm: TEdtTbConfigForm object pnlButtons: TPanel Left = 0 Height = 42 - Top = 395 - Width = 651 + Top = 415 + Width = 722 Align = alBottom BevelOuter = bvNone ClientHeight = 42 - ClientWidth = 651 + ClientWidth = 722 Color = clGreen ParentColor = False TabOrder = 4 @@ -97,17 +99,17 @@ object EdtTbConfigForm: TEdtTbConfigForm Left = 0 Height = 2 Top = 0 - Width = 651 + Width = 722 Align = alTop end object btnOK: TButton AnchorSideRight.Control = btnCancel AnchorSideBottom.Control = pnlButtons AnchorSideBottom.Side = asrBottom - Left = 474 + Left = 534 Height = 25 Top = 11 - Width = 75 + Width = 76 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Right = 6 @@ -126,10 +128,10 @@ object EdtTbConfigForm: TEdtTbConfigForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pnlButtons AnchorSideBottom.Side = asrBottom - Left = 555 + Left = 616 Height = 25 Top = 11 - Width = 90 + Width = 100 Anchors = [akRight, akBottom] AutoSize = True BorderSpacing.Right = 6 @@ -146,14 +148,15 @@ object EdtTbConfigForm: TEdtTbConfigForm end end object btnAddDivider: TButton + AnchorSideLeft.Control = lblToolbar AnchorSideBottom.Control = pnlButtons - Left = 484 + Left = 443 Height = 25 - Top = 364 - Width = 116 - Anchors = [akRight, akBottom] + Top = 384 + Width = 132 + Anchors = [akLeft, akBottom] AutoSize = True - BorderSpacing.Around = 6 + BorderSpacing.Bottom = 6 BorderSpacing.InnerBorder = 4 Caption = 'btnAddDivider' Constraints.MaxHeight = 25 @@ -163,14 +166,16 @@ object EdtTbConfigForm: TEdtTbConfigForm TabOrder = 3 end object lbToolbar: TListBox - AnchorSideLeft.Control = lblToolbar + AnchorSideLeft.Control = btnAdd + AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = TV AnchorSideBottom.Control = btnAddDivider - Left = 456 - Height = 288 - Top = 70 - Width = 183 + Left = 443 + Height = 304 + Top = 74 + Width = 268 Anchors = [akTop, akLeft, akRight, akBottom] + BorderSpacing.Left = 6 BorderSpacing.Bottom = 6 ItemHeight = 0 OnSelectionChange = lbToolbarSelectionChange @@ -180,14 +185,17 @@ object EdtTbConfigForm: TEdtTbConfigForm AnchorSideLeft.Control = lblMenuTree AnchorSideTop.Control = FilterEdit AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = Splitter1 AnchorSideBottom.Control = pnlButtons Left = 16 - Height = 319 - Top = 70 - Width = 392 - Anchors = [akTop, akLeft, akBottom] + Height = 335 + Top = 74 + Width = 381 + Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 + BorderSpacing.Right = 3 BorderSpacing.Bottom = 6 + DefaultItemHeight = 22 ReadOnly = True ScrollBars = ssAutoBoth TabOrder = 1 @@ -199,8 +207,8 @@ object EdtTbConfigForm: TEdtTbConfigForm AnchorSideTop.Control = lblMenuTree AnchorSideTop.Side = asrBottom Left = 16 - Height = 27 - Top = 37 + Height = 28 + Top = 40 Width = 192 UseFormActivate = True ButtonWidth = 23 @@ -213,11 +221,11 @@ object EdtTbConfigForm: TEdtTbConfigForm ExpandAllInitially = True end object cbPos: TComboBox - Left = 312 - Height = 27 + Left = 293 + Height = 28 Top = 10 Width = 100 - ItemHeight = 0 + ItemHeight = 20 ItemIndex = 0 Items.Strings = ( 'Top' @@ -230,22 +238,36 @@ object EdtTbConfigForm: TEdtTbConfigForm Text = 'Top' end object lblpos: TLabel - Left = 240 - Height = 17 + AnchorSideTop.Control = lblMenuTree + Left = 232 + Height = 20 Top = 14 - Width = 37 + Width = 41 Caption = 'lblpos' ParentColor = False end object cbVisible: TCheckBox Left = 316 - Height = 23 + Height = 24 Top = 45 - Width = 69 + Width = 68 Caption = 'Visible' OnChange = cbVisibleChange ParentShowHint = False ShowHint = True TabOrder = 6 end + object Splitter1: TSplitter + AnchorSideLeft.Control = TV + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = TV + AnchorSideBottom.Control = TV + AnchorSideBottom.Side = asrBottom + Left = 400 + Height = 335 + Top = 74 + Width = 9 + Align = alNone + Anchors = [akTop, akBottom] + end end diff --git a/components/editortoolbar/edttbconfigfrm.pas b/components/editortoolbar/edttbconfigfrm.pas index 6264f79ad6..4a4e6eb7ae 100644 --- a/components/editortoolbar/edttbconfigfrm.pas +++ b/components/editortoolbar/edttbconfigfrm.pas @@ -47,6 +47,7 @@ type lbToolbar: TListBox; pnlButtons: TPanel; FilterEdit: TTreeFilterEdit; + Splitter1: TSplitter; TV: TTreeView; procedure btnCancelClick(Sender: TObject); procedure cbPosChange(Sender: TObject);