From f7ccd67805dc174dd697598c27f18aeace670e5a Mon Sep 17 00:00:00 2001 From: alexs75 Date: Sat, 17 Mar 2012 17:16:29 +0000 Subject: [PATCH] fix bug in TToolPanel on show ToolPanelSetupForm git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2350 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/rx/rxtbrsetup.lfm | 122 ++++++++++++++------------- components/rx/rxtbrsetup.lrs | 156 ++++++++++++++++++----------------- components/rx/rxtbrsetup.pas | 27 +++--- components/rx/rxtoolbar.pas | 6 +- 4 files changed, 165 insertions(+), 146 deletions(-) diff --git a/components/rx/rxtbrsetup.lfm b/components/rx/rxtbrsetup.lfm index af6467257..ee0e86c93 100644 --- a/components/rx/rxtbrsetup.lfm +++ b/components/rx/rxtbrsetup.lfm @@ -9,32 +9,31 @@ object ToolPanelSetupForm: TToolPanelSetupForm ClientWidth = 657 FormStyle = fsStayOnTop OnClose = FormClose - OnCreate = FormCreate OnDestroy = FormDestroy OnResize = FormResize Position = poScreenCenter - LCLVersion = '0.9.29' + LCLVersion = '0.9.31' object PageControl1: TPageControl Left = 0 - Height = 435 + Height = 433 Top = 0 Width = 657 - ActivePage = TabSheet1 + ActivePage = TabSheet2 Align = alClient - TabIndex = 0 + TabIndex = 1 TabOrder = 0 object TabSheet1: TTabSheet Caption = 'Visible buttons' - ClientHeight = 404 - ClientWidth = 653 + ClientHeight = 400 + ClientWidth = 651 object Label1: TLabel AnchorSideLeft.Control = BitBtn3 AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = TabSheet1 Left = 350 - Height = 18 + Height = 16 Top = 6 - Width = 118 + Width = 114 BorderSpacing.Around = 6 Caption = 'Avaliable buttons' FocusControl = ListBtnAvaliable @@ -43,9 +42,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm object Label2: TLabel AnchorSideTop.Control = TabSheet1 Left = 8 - Height = 18 + Height = 16 Top = 6 - Width = 102 + Width = 98 BorderSpacing.Around = 6 Caption = 'Visible buttons' FocusControl = ListBtnVisible @@ -57,10 +56,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = BitBtn6 AnchorSideRight.Side = asrBottom - Left = 309 + Left = 306 Height = 30 - Top = 148 - Width = 35 + Top = 146 + Width = 38 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BorderSpacing.InnerBorder = 2 @@ -75,10 +74,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = BitBtn6 AnchorSideRight.Side = asrBottom - Left = 309 + Left = 306 Height = 31 - Top = 111 - Width = 35 + Top = 109 + Width = 38 Anchors = [akTop, akLeft, akRight] AutoSize = True BorderSpacing.Top = 6 @@ -94,10 +93,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Side = asrBottom AnchorSideRight.Control = BitBtn6 AnchorSideRight.Side = asrBottom - Left = 309 + Left = 306 Height = 38 - Top = 67 - Width = 35 + Top = 65 + Width = 38 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BorderSpacing.InnerBorder = 2 @@ -110,10 +109,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideLeft.Control = TabSheet1 AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = ListBtnAvaliable - Left = 309 + Left = 306 Height = 31 - Top = 30 - Width = 35 + Top = 28 + Width = 38 AutoSize = True BorderSpacing.InnerBorder = 2 Caption = '>>' @@ -130,11 +129,12 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = cbShowCaption Left = 350 - Height = 275 - Top = 30 - Width = 297 + Height = 270 + Top = 28 + Width = 295 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 + IntegralHeight = True Items.Strings = ( '111' '222' @@ -147,6 +147,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm ItemHeight = 0 OnClick = ListBtnAvaliableClick OnDrawItem = ListBox1DrawItem + ScrollWidth = 293 Style = lbOwnerDrawFixed TabOrder = 4 end @@ -157,14 +158,15 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideRight.Control = BitBtn6 AnchorSideBottom.Control = cbShowCaption Left = 14 - Height = 275 - Top = 30 - Width = 289 + Height = 270 + Top = 28 + Width = 286 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Around = 6 ItemHeight = 0 OnClick = ListBtnAvaliableClick OnDrawItem = ListBox1DrawItem + ScrollWidth = 284 Style = lbOwnerDrawFixed TabOrder = 5 TopIndex = -1 @@ -174,8 +176,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideBottom.Side = asrBottom Left = 3 Height = 62 - Top = 336 - Width = 641 + Top = 332 + Width = 639 Alignment = taLeftJustify Anchors = [akLeft, akRight, akBottom] BorderSpacing.Around = 6 @@ -187,9 +189,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideLeft.Control = TabSheet1 AnchorSideBottom.Control = Panel1 Left = 6 - Height = 19 - Top = 311 - Width = 112 + Height = 22 + Top = 304 + Width = 111 Anchors = [akLeft, akBottom] BorderSpacing.Around = 6 Caption = 'Show caption' @@ -199,15 +201,15 @@ object ToolPanelSetupForm: TToolPanelSetupForm end object TabSheet2: TTabSheet Caption = 'Options' - ClientHeight = 404 - ClientWidth = 653 + ClientHeight = 400 + ClientWidth = 651 object cbShowHint: TCheckBox AnchorSideLeft.Control = TabSheet2 AnchorSideTop.Control = cbTransp AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 148 + Height = 22 + Top = 163 Width = 88 BorderSpacing.Around = 6 Caption = 'Show hint' @@ -218,9 +220,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Control = cbFlatBtn AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 123 - Width = 101 + Height = 22 + Top = 135 + Width = 100 BorderSpacing.Around = 6 Caption = 'Transparent' TabOrder = 1 @@ -230,8 +232,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Control = RadioGroup1 AnchorSideTop.Side = asrBottom Left = 6 - Height = 19 - Top = 98 + Height = 22 + Top = 107 Width = 101 BorderSpacing.Around = 6 Caption = 'Flat buttons' @@ -243,10 +245,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Control = TabSheet2 AnchorSideRight.Control = TabSheet2 AnchorSideRight.Side = asrBottom - Left = 334 - Height = 86 + Left = 333 + Height = 95 Top = 6 - Width = 313 + Width = 312 Anchors = [akTop, akLeft, akRight] AutoFill = False AutoSize = True @@ -258,8 +260,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 69 - ClientWidth = 313 + ClientHeight = 78 + ClientWidth = 308 Items.Strings = ( 'None' 'Left' @@ -273,9 +275,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Control = TabSheet2 AnchorSideRight.Control = Panel2 Left = 6 - Height = 86 + Height = 95 Top = 6 - Width = 313 + Width = 312 Anchors = [akTop, akLeft, akRight] AutoFill = True AutoSize = True @@ -289,8 +291,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm ChildSizing.ShrinkVertical = crsScaleChilds ChildSizing.Layout = cclLeftToRightThenTopToBottom ChildSizing.ControlsPerLine = 1 - ClientHeight = 69 - ClientWidth = 313 + ClientHeight = 78 + ClientWidth = 308 Items.Strings = ( 'Standart' 'Windows XP' @@ -305,8 +307,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm AnchorSideTop.Control = TabSheet2 AnchorSideBottom.Control = TabSheet2 AnchorSideBottom.Side = asrBottom - Left = 325 - Height = 392 + Left = 324 + Height = 388 Top = 6 Width = 3 Anchors = [akTop, akLeft, akBottom] @@ -317,9 +319,17 @@ object ToolPanelSetupForm: TToolPanelSetupForm end object ButtonPanel1: TButtonPanel Left = 6 - Height = 40 - Top = 441 + Height = 42 + Top = 439 Width = 645 + OKButton.Name = 'OKButton' + OKButton.DefaultCaption = True + HelpButton.Name = 'HelpButton' + HelpButton.DefaultCaption = True + CloseButton.Name = 'CloseButton' + CloseButton.DefaultCaption = True + CancelButton.Name = 'CancelButton' + CancelButton.DefaultCaption = True TabOrder = 1 ShowButtons = [pbClose, pbHelp] end diff --git a/components/rx/rxtbrsetup.lrs b/components/rx/rxtbrsetup.lrs index 8bdd6666a..d7d92d25e 100644 --- a/components/rx/rxtbrsetup.lrs +++ b/components/rx/rxtbrsetup.lrs @@ -6,108 +6,112 @@ LazarusResources.Add('TToolPanelSetupForm','FORMDATA',[ +'ol1'#7'Caption'#6#16'Tool panel setup'#12'ClientHeight'#3#231#1#11'ClientWi' +'dth'#3#145#2#9'FormStyle'#7#11'fsStayOnTop'#7'OnClose'#7#9'FormClose'#8'OnC' +'reate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#8'OnResize'#7#10'For' - +'mResize'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.29'#0#12'T' - +'PageControl'#12'PageControl1'#4'Left'#2#0#6'Height'#3#179#1#3'Top'#2#0#5'Wi' + +'mResize'#8'Position'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.31'#0#12'T' + +'PageControl'#12'PageControl1'#4'Left'#2#0#6'Height'#3#177#1#3'Top'#2#0#5'Wi' +'dth'#3#145#2#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#8'TabInde' +'x'#2#0#8'TabOrder'#2#0#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#15'Visible ' - +'buttons'#12'ClientHeight'#3#148#1#11'ClientWidth'#3#141#2#0#6'TLabel'#6'Lab' + +'buttons'#12'ClientHeight'#3#144#1#11'ClientWidth'#3#139#2#0#6'TLabel'#6'Lab' +'el1'#22'AnchorSideLeft.Control'#7#7'BitBtn3'#19'AnchorSideLeft.Side'#7#9'as' +'rBottom'#21'AnchorSideTop.Control'#7#9'TabSheet1'#4'Left'#3'^'#1#6'Height'#2 - +#18#3'Top'#2#6#5'Width'#2'v'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Av' + +#16#3'Top'#2#6#5'Width'#2'r'#20'BorderSpacing.Around'#2#6#7'Caption'#6#17'Av' +'aliable buttons'#12'FocusControl'#7#16'ListBtnAvaliable'#11'ParentColor'#8#0 +#0#6'TLabel'#6'Label2'#21'AnchorSideTop.Control'#7#9'TabSheet1'#4'Left'#2#8#6 - +'Height'#2#18#3'Top'#2#6#5'Width'#2'f'#20'BorderSpacing.Around'#2#6#7'Captio' + +'Height'#2#16#3'Top'#2#6#5'Width'#2'b'#20'BorderSpacing.Around'#2#6#7'Captio' +'n'#6#15'Visible buttons'#12'FocusControl'#7#14'ListBtnVisible'#11'ParentCol' +'or'#8#0#0#7'TBitBtn'#7'BitBtn3'#22'AnchorSideLeft.Control'#7#7'BitBtn6'#21 +'AnchorSideTop.Control'#7#7'BitBtn4'#18'AnchorSideTop.Side'#7#9'asrBottom'#23 +'AnchorSideRight.Control'#7#7'BitBtn6'#20'AnchorSideRight.Side'#7#9'asrBotto' - +'m'#4'Left'#3'5'#1#6'Height'#2#30#3'Top'#3#148#0#5'Width'#2'#'#7'Anchors'#11 + +'m'#4'Left'#3'2'#1#6'Height'#2#30#3'Top'#3#146#0#5'Width'#2'&'#7'Anchors'#11 +#5'akTop'#6'akLeft'#7'akRight'#0#17'BorderSpacing.Top'#2#6#25'BorderSpacing.' +'InnerBorder'#2#2#7'Caption'#6#2'<<'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn' +'3Click'#8'TabOrder'#2#0#0#0#7'TBitBtn'#7'BitBtn4'#22'AnchorSideLeft.Control' +#7#7'BitBtn6'#21'AnchorSideTop.Control'#7#7'BitBtn5'#18'AnchorSideTop.Side'#7 +#9'asrBottom'#23'AnchorSideRight.Control'#7#7'BitBtn6'#20'AnchorSideRight.Si' - +'de'#7#9'asrBottom'#4'Left'#3'5'#1#6'Height'#2#31#3'Top'#2'o'#5'Width'#2'#'#7 + +'de'#7#9'asrBottom'#4'Left'#3'2'#1#6'Height'#2#31#3'Top'#2'm'#5'Width'#2'&'#7 +'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoSize'#9#17'BorderSpacing.' +'Top'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'<'#9'NumGlyphs'#2 +#0#7'OnClick'#7#12'BitBtn4Click'#8'TabOrder'#2#1#0#0#7'TBitBtn'#7'BitBtn5'#22 +'AnchorSideLeft.Control'#7#7'BitBtn6'#21'AnchorSideTop.Control'#7#7'BitBtn6' +#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#7'BitBt' - +'n6'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'5'#1#6'Height'#2'&'#3 - +'Top'#2'C'#5'Width'#2'#'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Bo' + +'n6'#20'AnchorSideRight.Side'#7#9'asrBottom'#4'Left'#3'2'#1#6'Height'#2'&'#3 + +'Top'#2'A'#5'Width'#2'&'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#17'Bo' +'rderSpacing.Top'#2#6#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'>'#9 +'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn5Click'#8'TabOrder'#2#2#0#0#7'TBitBtn' +#7'BitBtn6'#22'AnchorSideLeft.Control'#7#9'TabSheet1'#19'AnchorSideLeft.Side' - +#7#9'asrCenter'#21'AnchorSideTop.Control'#7#16'ListBtnAvaliable'#4'Left'#3'5' - +#1#6'Height'#2#31#3'Top'#2#30#5'Width'#2'#'#8'AutoSize'#9#25'BorderSpacing.I' + +#7#9'asrCenter'#21'AnchorSideTop.Control'#7#16'ListBtnAvaliable'#4'Left'#3'2' + +#1#6'Height'#2#31#3'Top'#2#28#5'Width'#2'&'#8'AutoSize'#9#25'BorderSpacing.I' +'nnerBorder'#2#2#7'Caption'#6#2'>>'#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn6' +'Click'#8'TabOrder'#2#3#0#0#8'TListBox'#16'ListBtnAvaliable'#22'AnchorSideLe' +'ft.Control'#7#7'BitBtn3'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSi' +'deTop.Control'#7#6'Label1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorS' +'ideRight.Control'#7#9'TabSheet1'#20'AnchorSideRight.Side'#7#9'asrBottom'#24 - +'AnchorSideBottom.Control'#7#13'cbShowCaption'#4'Left'#3'^'#1#6'Height'#3#19 - +#1#3'Top'#2#30#5'Width'#3')'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8 - +'akBottom'#0#20'BorderSpacing.Around'#2#6#13'Items.Strings'#1#6#3'111'#6#3'2' - +'22'#6#3'333'#6#2'44'#6#3'555'#6#3'666'#6#3'777'#0#10'ItemHeight'#2#0#7'OnCl' - +'ick'#7#21'ListBtnAvaliableClick'#10'OnDrawItem'#7#16'ListBox1DrawItem'#5'St' - +'yle'#7#16'lbOwnerDrawFixed'#8'TabOrder'#2#4#0#0#8'TListBox'#14'ListBtnVisib' - +'le'#22'AnchorSideLeft.Control'#7#6'Label2'#21'AnchorSideTop.Control'#7#6'La' - +'bel2'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#7 - +'BitBtn6'#24'AnchorSideBottom.Control'#7#13'cbShowCaption'#4'Left'#2#14#6'He' - +'ight'#3#19#1#3'Top'#2#30#5'Width'#3'!'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7 - +'akRight'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#10'ItemHeight'#2#0#7'On' - +'Click'#7#21'ListBtnAvaliableClick'#10'OnDrawItem'#7#16'ListBox1DrawItem'#5 - +'Style'#7#16'lbOwnerDrawFixed'#8'TabOrder'#2#5#8'TopIndex'#2#255#0#0#6'TPane' - +'l'#6'Panel1'#24'AnchorSideBottom.Control'#7#9'TabSheet1'#21'AnchorSideBotto' - +'m.Side'#7#9'asrBottom'#4'Left'#2#3#6'Height'#2'>'#3'Top'#3'P'#1#5'Width'#3 - +#129#2#9'Alignment'#7#13'taLeftJustify'#7'Anchors'#11#6'akLeft'#7'akRight'#8 - +'akBottom'#0#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#9'bvLowered'#11'F' - +'ullRepaint'#8#8'TabOrder'#2#6#0#0#9'TCheckBox'#13'cbShowCaption'#22'AnchorS' - +'ideLeft.Control'#7#9'TabSheet1'#24'AnchorSideBottom.Control'#7#6'Panel1'#4 - +'Left'#2#6#6'Height'#2#19#3'Top'#3'7'#1#5'Width'#2'p'#7'Anchors'#11#6'akLeft' - ,#8'akBottom'#0#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Show caption'#8 - +'OnChange'#7#19'cbShowCaptionChange'#8'TabOrder'#2#7#0#0#0#9'TTabSheet'#9'Ta' - +'bSheet2'#7'Caption'#6#7'Options'#12'ClientHeight'#3#148#1#11'ClientWidth'#3 - +#141#2#0#9'TCheckBox'#10'cbShowHint'#22'AnchorSideLeft.Control'#7#9'TabSheet' - +'2'#21'AnchorSideTop.Control'#7#8'cbTransp'#18'AnchorSideTop.Side'#7#9'asrBo' - +'ttom'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#148#0#5'Width'#2'X'#20'BorderSpac' - +'ing.Around'#2#6#7'Caption'#6#9'Show hint'#8'TabOrder'#2#0#0#0#9'TCheckBox'#8 - +'cbTransp'#22'AnchorSideLeft.Control'#7#9'TabSheet2'#21'AnchorSideTop.Contro' - +'l'#7#9'cbFlatBtn'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Heigh' - +'t'#2#19#3'Top'#2'{'#5'Width'#2'e'#20'BorderSpacing.Around'#2#6#7'Caption'#6 - +#11'Transparent'#8'TabOrder'#2#1#0#0#9'TCheckBox'#9'cbFlatBtn'#22'AnchorSide' - +'Left.Control'#7#9'TabSheet2'#21'AnchorSideTop.Control'#7#11'RadioGroup1'#18 - +'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'b'#5 - +'Width'#2'e'#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Flat buttons'#8'Ta' - +'bOrder'#2#2#0#0#11'TRadioGroup'#11'RadioGroup1'#22'AnchorSideLeft.Control'#7 - +#6'Panel2'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7 - +#9'TabSheet2'#23'AnchorSideRight.Control'#7#9'TabSheet2'#20'AnchorSideRight.' - +'Side'#7#9'asrBottom'#4'Left'#3'N'#1#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'9' - +#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#8#8'AutoSize'#9 - +#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Button align'#28'ChildSizing.L' - +'eftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#28'ChildSizing.Sh' - +'rinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'cr' - +'sScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27 - +'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'E'#11'ClientWidth'#3'9' - +#1#13'Items.Strings'#1#6#4'None'#6#4'Left'#6#5'Rignt'#0#8'TabOrder'#2#3#7'Ta' - +'bStop'#9#0#0#11'TRadioGroup'#11'RadioGroup2'#22'AnchorSideLeft.Control'#7#9 - +'TabSheet2'#21'AnchorSideTop.Control'#7#9'TabSheet2'#23'AnchorSideRight.Cont' - +'rol'#7#6'Panel2'#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'9'#1#7'An' - +'chors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#9#8'AutoSize'#9#20'Bo' - +'rderSpacing.Around'#2#6#7'Caption'#6#14'Tool bar style'#28'ChildSizing.Left' - +'RightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.Enlar' - +'geHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVertical' - +#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsSca' - +'leChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizin' - +'g.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLin' - +'e'#2#1#12'ClientHeight'#2'E'#11'ClientWidth'#3'9'#1#13'Items.Strings'#1#6#8 - +'Standart'#6#10'Windows XP'#6#6'Native'#0#8'TabOrder'#2#4#7'TabStop'#9#0#0#6 - +'TPanel'#6'Panel2'#22'AnchorSideLeft.Control'#7#9'TabSheet2'#19'AnchorSideLe' - +'ft.Side'#7#9'asrCenter'#21'AnchorSideTop.Control'#7#9'TabSheet2'#24'AnchorS' - +'ideBottom.Control'#7#9'TabSheet2'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4 - +'Left'#3'E'#1#6'Height'#3#136#1#3'Top'#2#6#5'Width'#2#3#7'Anchors'#11#5'akTo' - +'p'#6'akLeft'#8'akBottom'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#5#0#0 - +#0#0#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Height'#2'('#3'Top'#3 - +#185#1#5'Width'#3#133#2#8'TabOrder'#2#1#11'ShowButtons'#11#7'pbClose'#6'pbHe' - +'lp'#0#0#0#0 + +'AnchorSideBottom.Control'#7#13'cbShowCaption'#4'Left'#3'^'#1#6'Height'#3#14 + +#1#3'Top'#2#28#5'Width'#3''''#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8 + +'akBottom'#0#20'BorderSpacing.Around'#2#6#14'IntegralHeight'#9#13'Items.Stri' + +'ngs'#1#6#3'111'#6#3'222'#6#3'333'#6#2'44'#6#3'555'#6#3'666'#6#3'777'#0#10'I' + +'temHeight'#2#0#7'OnClick'#7#21'ListBtnAvaliableClick'#10'OnDrawItem'#7#16'L' + +'istBox1DrawItem'#11'ScrollWidth'#3'%'#1#5'Style'#7#16'lbOwnerDrawFixed'#8'T' + +'abOrder'#2#4#0#0#8'TListBox'#14'ListBtnVisible'#22'AnchorSideLeft.Control'#7 + +#6'Label2'#21'AnchorSideTop.Control'#7#6'Label2'#18'AnchorSideTop.Side'#7#9 + +'asrBottom'#23'AnchorSideRight.Control'#7#7'BitBtn6'#24'AnchorSideBottom.Con' + +'trol'#7#13'cbShowCaption'#4'Left'#2#14#6'Height'#3#14#1#3'Top'#2#28#5'Width' + +#3#30#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#20'BorderS' + +'pacing.Around'#2#6#10'ItemHeight'#2#0#7'OnClick'#7#21'ListBtnAvaliableClick' + +#10'OnDrawItem'#7#16'ListBox1DrawItem'#11'ScrollWidth'#3#28#1#5'Style'#7#16 + +'lbOwnerDrawFixed'#8'TabOrder'#2#5#8'TopIndex'#2#255#0#0#6'TPanel'#6'Panel1' + +#24'AnchorSideBottom.Control'#7#9'TabSheet1'#21'AnchorSideBottom.Side'#7#9'a' + +'srBottom'#4'Left'#2#3#6'Height'#2'>'#3'Top'#3'L'#1#5'Width'#3#127#2#9'Align' + +'ment'#7#13'taLeftJustify'#7'Anchors'#11#6'akLeft'#7'akRight'#8'akBottom'#0 + +#20'BorderSpacing.Around'#2#6#10'BevelOuter'#7#9'bvLowered'#11'FullRepaint'#8 + +#8'TabOrder'#2#6#0#0#9'TCheckBox'#13'cbShowCaption'#22'AnchorSideLeft.Contro' + +'l'#7#9'TabSheet1'#24'AnchorSideBottom.Control'#7#6'Panel1'#4'Left'#2#6#6'He' + ,'ight'#2#22#3'Top'#3'0'#1#5'Width'#2'o'#7'Anchors'#11#6'akLeft'#8'akBottom'#0 + +#20'BorderSpacing.Around'#2#6#7'Caption'#6#12'Show caption'#8'OnChange'#7#19 + +'cbShowCaptionChange'#8'TabOrder'#2#7#0#0#0#9'TTabSheet'#9'TabSheet2'#7'Capt' + +'ion'#6#7'Options'#12'ClientHeight'#3#144#1#11'ClientWidth'#3#139#2#0#9'TChe' + +'ckBox'#10'cbShowHint'#22'AnchorSideLeft.Control'#7#9'TabSheet2'#21'AnchorSi' + +'deTop.Control'#7#8'cbTransp'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2 + +#6#6'Height'#2#19#3'Top'#3#148#0#5'Width'#2'X'#20'BorderSpacing.Around'#2#6#7 + +'Caption'#6#9'Show hint'#8'TabOrder'#2#0#0#0#9'TCheckBox'#8'cbTransp'#22'Anc' + +'horSideLeft.Control'#7#9'TabSheet2'#21'AnchorSideTop.Control'#7#9'cbFlatBtn' + +#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'{' + +#5'Width'#2'e'#20'BorderSpacing.Around'#2#6#7'Caption'#6#11'Transparent'#8'T' + +'abOrder'#2#1#0#0#9'TCheckBox'#9'cbFlatBtn'#22'AnchorSideLeft.Control'#7#9'T' + +'abSheet2'#21'AnchorSideTop.Control'#7#11'RadioGroup1'#18'AnchorSideTop.Side' + +#7#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'b'#5'Width'#2'e'#20'Bord' + +'erSpacing.Around'#2#6#7'Caption'#6#12'Flat buttons'#8'TabOrder'#2#2#0#0#11 + +'TRadioGroup'#11'RadioGroup1'#22'AnchorSideLeft.Control'#7#6'Panel2'#19'Anch' + +'orSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'TabSheet2'#23 + +'AnchorSideRight.Control'#7#9'TabSheet2'#20'AnchorSideRight.Side'#7#9'asrBot' + +'tom'#4'Left'#3'N'#1#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'9'#1#7'Anchors'#11 + +#5'akTop'#6'akLeft'#7'akRight'#0#8'AutoFill'#8#8'AutoSize'#9#20'BorderSpacin' + +'g.Around'#2#6#7'Caption'#6#12'Button align'#28'ChildSizing.LeftRightSpacing' + +#2#6#28'ChildSizing.TopBottomSpacing'#2#6#28'ChildSizing.ShrinkHorizontal'#7 + +#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'C' + +'hildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.Contr' + +'olsPerLine'#2#1#12'ClientHeight'#2'E'#11'ClientWidth'#3'5'#1#13'Items.Strin' + +'gs'#1#6#4'None'#6#4'Left'#6#5'Rignt'#0#8'TabOrder'#2#3#7'TabStop'#9#0#0#11 + +'TRadioGroup'#11'RadioGroup2'#22'AnchorSideLeft.Control'#7#9'TabSheet2'#21'A' + +'nchorSideTop.Control'#7#9'TabSheet2'#23'AnchorSideRight.Control'#7#6'Panel2' + +#4'Left'#2#6#6'Height'#2'V'#3'Top'#2#6#5'Width'#3'9'#1#7'Anchors'#11#5'akTop' + +#6'akLeft'#7'akRight'#0#8'AutoFill'#9#8'AutoSize'#9#20'BorderSpacing.Around' + +#2#6#7'Caption'#6#14'Tool bar style'#28'ChildSizing.LeftRightSpacing'#2#6#28 + +'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.EnlargeHorizontal'#7#24'cr' + +'sHomogenousChildResize'#27'ChildSizing.EnlargeVertical'#7#24'crsHomogenousC' + +'hildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildS' + +'izing.ShrinkVertical'#7#14'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclL' + +'eftToRightThenTopToBottom'#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHei' + +'ght'#2'E'#11'ClientWidth'#3'5'#1#13'Items.Strings'#1#6#8'Standart'#6#10'Win' + +'dows XP'#6#6'Native'#0#8'TabOrder'#2#4#7'TabStop'#9#0#0#6'TPanel'#6'Panel2' + +#22'AnchorSideLeft.Control'#7#9'TabSheet2'#19'AnchorSideLeft.Side'#7#9'asrCe' + +'nter'#21'AnchorSideTop.Control'#7#9'TabSheet2'#24'AnchorSideBottom.Control' + +#7#9'TabSheet2'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4'Left'#3'E'#1#6'He' + +'ight'#3#136#1#3'Top'#2#6#5'Width'#2#3#7'Anchors'#11#5'akTop'#6'akLeft'#8'ak' + +'Bottom'#0#20'BorderSpacing.Around'#2#6#8'TabOrder'#2#5#0#0#0#0#12'TButtonPa' + +'nel'#12'ButtonPanel1'#4'Left'#2#6#6'Height'#2'*'#3'Top'#3#183#1#5'Width'#3 + +#133#2#13'OKButton.Name'#6#8'OKButton'#23'OKButton.DefaultCaption'#9#15'Help' + +'Button.Name'#6#10'HelpButton'#25'HelpButton.DefaultCaption'#9#16'CloseButto' + +'n.Name'#6#11'CloseButton'#26'CloseButton.DefaultCaption'#9#17'CancelButton.' + +'Name'#6#12'CancelButton'#27'CancelButton.DefaultCaption'#9#8'TabOrder'#2#1 + +#11'ShowButtons'#11#7'pbClose'#6'pbHelp'#0#0#0#0 ]); diff --git a/components/rx/rxtbrsetup.pas b/components/rx/rxtbrsetup.pas index d580743db..216b4e322 100644 --- a/components/rx/rxtbrsetup.pas +++ b/components/rx/rxtbrsetup.pas @@ -70,7 +70,6 @@ type procedure BitBtn6Click(Sender: TObject); procedure CheckBox1Change(Sender: TObject); procedure FormClose(Sender: TObject; var CloseAction: TCloseAction); - procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); procedure FormResize(Sender: TObject); procedure ListBox1DrawItem(Control: TWinControl; Index: Integer; @@ -80,6 +79,7 @@ type private procedure FillItems(List:TStrings; AVisible:boolean); procedure UpdateStates; + procedure Localize; public FToolPanel:TToolPanel; constructor CreateSetupForm(AToolPanel:TToolPanel); @@ -91,6 +91,8 @@ var implementation uses vclutils, ActnList, boxprocs, rxconst; +{$R *.lfm} + type THackToolPanel = class(TToolPanel); { TToolPanelSetupForm } @@ -203,13 +205,7 @@ begin cbFlatBtn.Checked:=tpTransparentBtns in FToolPanel.Options; end; -procedure TToolPanelSetupForm.FormClose(Sender: TObject; - var CloseAction: TCloseAction); -begin - CloseAction:=caFree; -end; - -procedure TToolPanelSetupForm.FormCreate(Sender: TObject); +procedure TToolPanelSetupForm.Localize; begin Caption:=sToolPanelSetup; TabSheet1.Caption:=sVisibleButtons; @@ -233,6 +229,11 @@ begin RadioGroup1.Items.Add(sButtonAlign3); end; +procedure TToolPanelSetupForm.FormClose(Sender: TObject; + var CloseAction: TCloseAction); +begin + CloseAction:=caFree; +end; procedure TToolPanelSetupForm.CheckBox1Change(Sender: TObject); var @@ -285,6 +286,8 @@ end; constructor TToolPanelSetupForm.CreateSetupForm(AToolPanel: TToolPanel); begin inherited Create(AToolPanel); + Localize; + PageControl1.ActivePageIndex:=0; FormResize(nil); FToolPanel:=AToolPanel; @@ -292,10 +295,13 @@ begin cbFlatBtn.Checked:=tpFlatBtns in FToolPanel.Options; cbTransp.Checked:=tpTransparentBtns in FToolPanel.Options; cbShowHint.Checked:=FToolPanel.ShowHint; + ListBtnAvaliable.ItemHeight:=FToolPanel.BtnHeight + 4; ListBtnVisible.ItemHeight:=FToolPanel.BtnHeight + 4; + FillItems(ListBtnVisible.Items, true); FillItems(ListBtnAvaliable.Items, false); + RadioGroup1.ItemIndex:=Ord(FToolPanel.ButtonAllign); RadioGroup2.ItemIndex:=Ord(FToolPanel.ToolBarStyle); @@ -307,12 +313,7 @@ begin RadioGroup1.OnClick:=@CheckBox1Change; RadioGroup2.OnClick:=@CheckBox1Change; - ListBtnAvaliable.ItemHeight:=FToolPanel.BtnHeight + 4; - ListBtnVisible.ItemHeight:=FToolPanel.BtnHeight + 4; end; -initialization - {$I rxtbrsetup.lrs} - end. diff --git a/components/rx/rxtoolbar.pas b/components/rx/rxtoolbar.pas index 8c89ce3fd..410e058b9 100644 --- a/components/rx/rxtoolbar.pas +++ b/components/rx/rxtoolbar.pas @@ -902,7 +902,11 @@ begin if not (csLoading in ComponentState) then for i:=0 to FToolbarItems.Count - 1 do - FToolbarItems[i].FButton.Align:=BtnAl2Align[AValue]; + begin +// if Assigned(FToolbarItems[i]) then +// if Assigned(FToolbarItems[i].FButton) then + FToolbarItems[i].FButton.Align:=BtnAl2Align[AValue]; + end; end; procedure TToolPanel.SetImageList(const AValue: TImageList);