ToolBar setup window

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@580 8e941d3f-bd1b-0410-a28a-d453659cc2b4
2008-09-30 11:21:55 +00:00
parent 122d94f289
commit a317af5e6a
4 changed files with 790 additions and 176 deletions
--- a/components/rx/docs/WhatsNew.rus.txt
+++ b/components/rx/docs/WhatsNew.rus.txt
@@ -6,6 +6,7 @@
  + Опубликовано свойство OnUTF8KeyPress;
  + Свойство ToolPanel.ToolBarStyle теперь может принимать значение tbsNative - для отрисовки кнопок используется 
    текущая тема
+  + Доработано окно настройки панели инструментов    
 22.05.2008 - версия 2.0.0.136 (svn revision 100)
  + У объекта TRxCustomDBLookupCombo введён контроль на CircularDataLink
  + У объекта TRxCustomDBLookupCombo ускорена отрисовка данных
--- a/components/rx/rxtbrsetup.lfm
+++ b/components/rx/rxtbrsetup.lfm
@@ -1,128 +1,316 @@
 object ToolPanelSetupForm: TToolPanelSetupForm
  Left = 289
-  Height = 404
+  Height = 422
  Top = 169
-  Width = 442
-  HorzScrollBar.Page = 441
-  VertScrollBar.Page = 403
-  ActiveControl = BitBtn1
+  Width = 502
+  HelpContext = 0
+  ActiveControl = BitBtn6
+  Align = alNone
+  AllowDropFiles = False
+  AutoScroll = True
+  AutoSize = False
+  BorderIcons = [biSystemMenu, biMinimize, biMaximize]
+  BorderStyle = bsSizeable
  Caption = 'Tool panel setup'
-  ClientHeight = 404
-  ClientWidth = 442
+  ChildSizing.LeftRightSpacing = 0
+  ChildSizing.TopBottomSpacing = 0
+  ChildSizing.HorizontalSpacing = 0
+  ChildSizing.VerticalSpacing = 0
+  ChildSizing.ControlsPerLine = 0
+  ClientHeight = 422
+  ClientWidth = 502
+  DockSite = False
+  DragKind = dkDrag
+  DragMode = dmManual
+  Enabled = True
+  Font.Height = 0
+  Font.Style = []
  FormStyle = fsStayOnTop
  OnClose = FormClose
  OnDestroy = FormDestroy
  OnResize = FormResize
-  object BitBtn1: TBitBtn
-    Left = 266
-    Height = 38
-    Top = 360
-    Width = 83
-    Anchors = [akRight, akBottom]
-    BorderSpacing.InnerBorder = 2
-    Caption = '&Close'
-    Kind = bkClose
-    NumGlyphs = 0
-    TabOrder = 0
-  end
-  object BitBtn2: TBitBtn
-    Left = 354
-    Height = 38
-    Top = 360
-    Width = 83
-    Anchors = [akRight, akBottom]
-    BorderSpacing.InnerBorder = 2
-    Caption = '&Help'
-    Kind = bkHelp
-    NumGlyphs = 0
-    TabOrder = 1
-  end
+  ParentBiDiMode = True
+  ParentFont = False
+  Position = poDesigned
+  ShowInTaskBar = stDefault
+  UseDockManager = False
+  LCLVersion = '0.9.27'
+  WindowState = wsNormal
  object PageControl1: TPageControl
-    Height = 353
-    Width = 442
-    ActivePage = TabSheet2
-    Align = alTop
-    Anchors = [akTop, akLeft, akRight, akBottom]
-    TabIndex = 1
-    TabOrder = 2
+    Left = 0
+    Height = 376
+    Top = 0
+    Width = 502
+    HelpContext = 0
+    TabStop = True
+    ActivePage = TabSheet1
+    Align = alClient
+    BorderSpacing.Left = 0
+    BorderSpacing.Top = 0
+    BorderSpacing.Right = 0
+    BorderSpacing.Bottom = 0
+    BorderSpacing.Around = 0
+    BorderSpacing.CellAlignHorizontal = ccaFill
+    BorderSpacing.CellAlignVertical = ccaFill
+    DockSite = False
+    DragCursor = crDrag
+    DragKind = dkDrag
+    DragMode = dmManual
+    Enabled = True
+    ParentFont = True
+    ParentShowHint = True
+    TabIndex = 0
+    TabOrder = 0
+    TabPosition = tpTop
+    Visible = True
    object TabSheet1: TTabSheet
+      HelpContext = 0
      Caption = 'Visible buttons'
-      ClientHeight = 353
-      ClientWidth = 442
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 345
+      ClientWidth = 498
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
      object Label1: TLabel
-        Left = 263
-        Height = 14
-        Top = 5
-        Width = 84
+        AnchorSideLeft.Control = BitBtn3
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = TabSheet1
+        Left = 270
+        Height = 18
+        Top = 6
+        Width = 110
+        HelpContext = 0
+        Align = alNone
+        Alignment = taLeftJustify
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Avaliable buttons'
-        Color = clNone
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
        FocusControl = ListBtnAvaliable
+        Layout = tlTop
+        ParentBidiMode = True
        ParentColor = False
+        ParentFont = True
+        ParentShowHint = True
+        ShowAccelChar = True
+        Transparent = True
+        Visible = True
+        WordWrap = False
+        OptimalFill = False
      end
      object Label2: TLabel
+        AnchorSideTop.Control = TabSheet1
        Left = 8
-        Height = 14
-        Top = 7
-        Width = 70
+        Height = 18
+        Top = 6
+        Width = 95
+        HelpContext = 0
+        Align = alNone
+        Alignment = taLeftJustify
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Visible buttons'
-        Color = clNone
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
        FocusControl = ListBtnVisible
+        Layout = tlTop
+        ParentBidiMode = True
        ParentColor = False
+        ParentFont = True
+        ParentShowHint = True
+        ShowAccelChar = True
+        Transparent = True
+        Visible = True
+        WordWrap = False
+        OptimalFill = False
      end
      object BitBtn3: TBitBtn
-        Left = 206
+        Left = 234
        Height = 30
        Top = 157
        Width = 30
+        HelpContext = 0
+        Align = alNone
        Anchors = [akTop]
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
        BorderSpacing.InnerBorder = 2
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
        Caption = '<<'
+        Default = False
+        Enabled = True
+        Kind = bkCustom
+        Layout = blGlyphLeft
+        Margin = -1
+        ModalResult = 0
        NumGlyphs = 0
        OnClick = BitBtn3Click
+        ParentFont = True
+        ParentShowHint = True
+        Spacing = 3
        TabOrder = 0
+        TabStop = True
+        Visible = True
      end
      object BitBtn4: TBitBtn
-        Left = 206
+        Left = 234
        Height = 30
        Top = 115
        Width = 30
+        HelpContext = 0
+        Align = alNone
        Anchors = [akTop]
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
        BorderSpacing.InnerBorder = 2
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
        Caption = '<'
+        Default = False
+        Enabled = True
+        Kind = bkCustom
+        Layout = blGlyphLeft
+        Margin = -1
+        ModalResult = 0
        NumGlyphs = 0
        OnClick = BitBtn4Click
+        ParentFont = True
+        ParentShowHint = True
+        Spacing = 3
        TabOrder = 1
+        TabStop = True
+        Visible = True
      end
      object BitBtn5: TBitBtn
-        Left = 206
+        Left = 234
        Height = 30
        Top = 74
        Width = 30
+        HelpContext = 0
+        Align = alNone
        Anchors = [akTop]
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
        BorderSpacing.InnerBorder = 2
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
        Caption = '>'
+        Default = False
+        Enabled = True
+        Kind = bkCustom
+        Layout = blGlyphLeft
+        Margin = -1
+        ModalResult = 0
        NumGlyphs = 0
        OnClick = BitBtn5Click
+        ParentFont = True
+        ParentShowHint = True
+        Spacing = 3
        TabOrder = 2
+        TabStop = True
+        Visible = True
      end
      object BitBtn6: TBitBtn
-        Left = 206
+        Left = 234
        Height = 30
        Top = 40
        Width = 30
+        HelpContext = 0
+        Align = alNone
        Anchors = [akTop]
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 0
        BorderSpacing.InnerBorder = 2
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Cancel = False
        Caption = '>>'
+        Default = False
+        Enabled = True
+        Kind = bkCustom
+        Layout = blGlyphLeft
+        Margin = -1
+        ModalResult = 0
        NumGlyphs = 0
        OnClick = BitBtn6Click
+        ParentFont = True
+        ParentShowHint = True
+        Spacing = 3
        TabOrder = 3
+        TabStop = True
+        Visible = True
      end
      object ListBtnAvaliable: TListBox
-        Left = 259
-        Height = 234
-        Top = 24
-        Width = 172
-        Anchors = [akTop, akLeft, akBottom]
+        AnchorSideLeft.Control = BitBtn3
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = Label1
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = TabSheet1
+        AnchorSideRight.Side = asrBottom
+        AnchorSideBottom.Control = cbShowCaption
+        Left = 270
+        Height = 216
+        Top = 30
+        Width = 222
+        HelpContext = 0
+        Align = alNone
+        Anchors = [akTop, akLeft, akRight, akBottom]
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        BorderStyle = bsSingle
+        ClickOnSelChange = True
+        Columns = 0
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        ExtendedSelect = True
+        Enabled = True
+        IntegralHeight = False
        Items.Strings = (
          '111'
          '222'
@@ -132,99 +320,286 @@ object ToolPanelSetupForm: TToolPanelSetupForm
          '666'
          '777'
        )
+        ItemHeight = 0
+        MultiSelect = False
        OnClick = ListBtnAvaliableClick
        OnDrawItem = ListBox1DrawItem
+        ParentBidiMode = True
+        ParentShowHint = True
+        ParentFont = True
+        Sorted = False
        Style = lbOwnerDrawFixed
        TabOrder = 4
+        TabStop = True
+        TopIndex = 0
+        Visible = True
      end
      object ListBtnVisible: TListBox
-        Left = 8
-        Height = 234
-        Top = 24
-        Width = 168
-        Anchors = [akTop, akLeft, akBottom]
+        AnchorSideLeft.Control = Label2
+        AnchorSideTop.Control = Label2
+        AnchorSideTop.Side = asrBottom
+        AnchorSideRight.Control = BitBtn6
+        AnchorSideBottom.Control = cbShowCaption
+        Left = 14
+        Height = 216
+        Top = 30
+        Width = 214
+        HelpContext = 0
+        Align = alNone
+        Anchors = [akTop, akLeft, akRight, akBottom]
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        BorderStyle = bsSingle
+        ClickOnSelChange = True
+        Columns = 0
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        ExtendedSelect = True
+        Enabled = True
+        IntegralHeight = False
+        ItemHeight = 0
+        MultiSelect = False
        OnClick = ListBtnAvaliableClick
        OnDrawItem = ListBox1DrawItem
+        ParentBidiMode = True
+        ParentShowHint = True
+        ParentFont = True
+        Sorted = False
        Style = lbOwnerDrawFixed
        TabOrder = 5
+        TabStop = True
        TopIndex = -1
+        Visible = True
      end
      object Panel1: TPanel
+        AnchorSideBottom.Control = TabSheet1
+        AnchorSideBottom.Side = asrBottom
        Left = 3
-        Height = 43
-        Top = 282
-        Width = 430
+        Height = 62
+        Top = 277
+        Width = 486
+        HelpContext = 0
+        Align = alNone
        Alignment = taLeftJustify
        Anchors = [akLeft, akRight, akBottom]
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        BevelInner = bvNone
        BevelOuter = bvLowered
+        BevelWidth = 1
+        BorderWidth = 0
+        BorderStyle = bsNone
+        ChildSizing.LeftRightSpacing = 0
+        ChildSizing.TopBottomSpacing = 0
+        ChildSizing.HorizontalSpacing = 0
+        ChildSizing.VerticalSpacing = 0
+        ChildSizing.ControlsPerLine = 0
+        DockSite = False
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        Enabled = True
        FullRepaint = False
+        ParentColor = True
+        ParentFont = True
+        ParentShowHint = True
        TabOrder = 6
+        TabStop = False
+        Visible = True
      end
      object cbShowCaption: TCheckBox
-        Left = 8
-        Height = 13
-        Top = 264
-        Width = 85
+        AnchorSideLeft.Control = TabSheet1
+        AnchorSideBottom.Control = Panel1
+        Left = 6
+        Height = 19
+        Top = 252
+        Width = 105
+        HelpContext = 0
+        Align = alNone
+        AllowGrayed = False
        Anchors = [akLeft, akBottom]
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Show caption'
+        Checked = False
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        Enabled = True
        OnChange = cbShowCaptionChange
+        ParentColor = True
+        ParentFont = True
+        ParentShowHint = True
+        ParentBidiMode = True
+        State = cbUnchecked
        TabOrder = 7
+        TabStop = True
        UseOnChange = True
+        Visible = True
      end
    end
    object TabSheet2: TTabSheet
+      HelpContext = 0
      Caption = 'Options'
-      ClientHeight = 323
-      ClientWidth = 438
+      ChildSizing.LeftRightSpacing = 0
+      ChildSizing.TopBottomSpacing = 0
+      ChildSizing.HorizontalSpacing = 0
+      ChildSizing.VerticalSpacing = 0
+      ChildSizing.ControlsPerLine = 0
+      ClientHeight = 345
+      ClientWidth = 498
+      Enabled = True
+      ParentFont = True
+      ParentShowHint = True
      object cbShowHint: TCheckBox
-        Left = 9
-        Height = 20
-        Top = 58
+        AnchorSideLeft.Control = TabSheet2
+        AnchorSideTop.Control = cbTransp
+        AnchorSideTop.Side = asrBottom
+        Left = 6
+        Height = 19
+        Top = 160
        Width = 82
+        HelpContext = 0
+        Align = alNone
+        AllowGrayed = False
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Show hint'
+        Checked = False
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        Enabled = True
        OnClick = CheckBox1Change
+        ParentColor = True
+        ParentFont = True
+        ParentShowHint = True
+        ParentBidiMode = True
+        State = cbUnchecked
        TabOrder = 0
+        TabStop = True
        UseOnChange = True
+        Visible = True
      end
      object cbTransp: TCheckBox
-        Left = 9
-        Height = 20
-        Top = 34
-        Width = 93
+        AnchorSideLeft.Control = TabSheet2
+        AnchorSideTop.Control = cbFlatBtn
+        AnchorSideTop.Side = asrBottom
+        Left = 6
+        Height = 19
+        Top = 135
+        Width = 95
+        HelpContext = 0
+        Align = alNone
+        AllowGrayed = False
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Transparent'
+        Checked = False
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        Enabled = True
        OnClick = CheckBox1Change
+        ParentColor = True
+        ParentFont = True
+        ParentShowHint = True
+        ParentBidiMode = True
+        State = cbUnchecked
        TabOrder = 1
+        TabStop = True
        UseOnChange = True
+        Visible = True
      end
      object cbFlatBtn: TCheckBox
-        Left = 9
-        Height = 20
-        Top = 10
-        Width = 92
+        AnchorSideLeft.Control = TabSheet2
+        AnchorSideTop.Control = RadioGroup1
+        AnchorSideTop.Side = asrBottom
+        Left = 6
+        Height = 19
+        Top = 110
+        Width = 96
+        HelpContext = 0
+        Align = alNone
+        AllowGrayed = False
+        AutoSize = True
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Flat buttons'
+        Checked = False
+        DragCursor = crDrag
+        DragKind = dkDrag
+        DragMode = dmManual
+        Enabled = True
        OnClick = CheckBox1Change
+        ParentColor = True
+        ParentFont = True
+        ParentShowHint = True
+        ParentBidiMode = True
+        State = cbUnchecked
        TabOrder = 2
+        TabStop = True
        UseOnChange = True
-      end
-      object cbsBarStyle: TCheckBox
-        Left = 9
-        Height = 20
-        Top = 79
-        Width = 74
-        Caption = 'XP style'
-        OnClick = CheckBox1Change
-        TabOrder = 3
-        UseOnChange = True
+        Visible = True
      end
      object RadioGroup1: TRadioGroup
-        Left = 9
+        AnchorSideLeft.Control = TabSheet2
+        AnchorSideTop.Control = TabSheet2
+        Left = 6
        Height = 98
-        Top = 106
-        Width = 176
+        Top = 6
+        Width = 208
+        HelpContext = 0
+        Align = alNone
        AutoFill = True
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
        Caption = 'Button align'
        ChildSizing.LeftRightSpacing = 6
        ChildSizing.TopBottomSpacing = 6
+        ChildSizing.HorizontalSpacing = 0
+        ChildSizing.VerticalSpacing = 0
        ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
        ChildSizing.EnlargeVertical = crsHomogenousChildResize
        ChildSizing.ShrinkHorizontal = crsScaleChilds
@@ -232,15 +607,99 @@ object ToolPanelSetupForm: TToolPanelSetupForm
        ChildSizing.Layout = cclLeftToRightThenTopToBottom
        ChildSizing.ControlsPerLine = 1
        ClientHeight = 81
-        ClientWidth = 172
+        ClientWidth = 208
+        ColumnLayout = clHorizontalThenVertical
+        Columns = 1
+        Ctl3D = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ItemIndex = -1
        Items.Strings = (
          'None'
          'Left'
          'Rignt'
        )
        OnClick = CheckBox1Change
+        ParentFont = True
+        ParentColor = True
+        ParentCtl3D = True
+        ParentShowHint = True
+        TabOrder = 3
+        TabStop = True
+        Visible = True
+      end
+      object RadioGroup2: TRadioGroup
+        AnchorSideLeft.Control = RadioGroup1
+        AnchorSideLeft.Side = asrBottom
+        AnchorSideTop.Control = TabSheet2
+        AnchorSideRight.Control = TabSheet2
+        AnchorSideRight.Side = asrBottom
+        Left = 220
+        Height = 97
+        Top = 6
+        Width = 272
+        HelpContext = 0
+        Align = alNone
+        Anchors = [akTop, akLeft, akRight]
+        AutoFill = True
+        AutoSize = False
+        BorderSpacing.Left = 0
+        BorderSpacing.Top = 0
+        BorderSpacing.Right = 0
+        BorderSpacing.Bottom = 0
+        BorderSpacing.Around = 6
+        BorderSpacing.CellAlignHorizontal = ccaFill
+        BorderSpacing.CellAlignVertical = ccaFill
+        Caption = 'Tool bar style'
+        ChildSizing.LeftRightSpacing = 6
+        ChildSizing.TopBottomSpacing = 6
+        ChildSizing.HorizontalSpacing = 0
+        ChildSizing.VerticalSpacing = 0
+        ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
+        ChildSizing.EnlargeVertical = crsHomogenousChildResize
+        ChildSizing.ShrinkHorizontal = crsScaleChilds
+        ChildSizing.ShrinkVertical = crsScaleChilds
+        ChildSizing.Layout = cclLeftToRightThenTopToBottom
+        ChildSizing.ControlsPerLine = 1
+        ClientHeight = 80
+        ClientWidth = 272
+        ColumnLayout = clHorizontalThenVertical
+        Columns = 1
+        Ctl3D = False
+        DragCursor = crDrag
+        DragMode = dmManual
+        Enabled = True
+        ItemIndex = -1
+        Items.Strings = (
+          'Standart'
+          'Windows XP'
+          'Native'
+        )
+        OnClick = CheckBox1Change
+        ParentFont = True
+        ParentColor = True
+        ParentCtl3D = True
+        ParentShowHint = True
        TabOrder = 4
+        TabStop = True
+        Visible = True
      end
    end
  end
+  object ButtonPanel1: TButtonPanel
+    Left = 6
+    Height = 46
+    Top = 376
+    Width = 490
+    HelpContext = 0
+    Align = alBottom
+    AutoSize = True
+    ButtonOrder = boDefault
+    TabOrder = 1
+    DefaultButton = pbOK
+    ShowButtons = [pbClose, pbHelp]
+    ShowGlyphs = [pbOK, pbCancel, pbClose, pbHelp]
+    Visible = True
+  end
 end
--- a/components/rx/rxtbrsetup.lrs
+++ b/components/rx/rxtbrsetup.lrs
@@ -2,71 +2,229 @@

 LazarusResources.Add('TToolPanelSetupForm','FORMDATA',[
  'TPF0'#19'TToolPanelSetupForm'#18'ToolPanelSetupForm'#4'Left'#3'!'#1#6'Height'
-  +#3#148#1#3'Top'#3#169#0#5'Width'#3#186#1#18'HorzScrollBar.Page'#3#185#1#18'V'
-  +'ertScrollBar.Page'#3#147#1#13'ActiveControl'#7#7'BitBtn1'#7'Caption'#6#16'T'
-  +'ool panel setup'#12'ClientHeight'#3#148#1#11'ClientWidth'#3#186#1#9'FormSty'
-  +'le'#7#11'fsStayOnTop'#7'OnClose'#7#9'FormClose'#9'OnDestroy'#7#11'FormDestr'
-  +'oy'#8'OnResize'#7#10'FormResize'#0#7'TBitBtn'#7'BitBtn1'#4'Left'#3#10#1#6'H'
-  +'eight'#2'&'#3'Top'#3'h'#1#5'Width'#2'S'#7'Anchors'#11#7'akRight'#8'akBottom'
-  +#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#6'&Close'#4'Kind'#7#7'bkCl'
-  +'ose'#9'NumGlyphs'#2#0#8'TabOrder'#2#0#0#0#7'TBitBtn'#7'BitBtn2'#4'Left'#3'b'
-  +#1#6'Height'#2'&'#3'Top'#3'h'#1#5'Width'#2'S'#7'Anchors'#11#7'akRight'#8'akB'
-  +'ottom'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#5'&Help'#4'Kind'#7#6
-  +'bkHelp'#9'NumGlyphs'#2#0#8'TabOrder'#2#1#0#0#12'TPageControl'#12'PageContro'
-  +'l1'#6'Height'#3'a'#1#5'Width'#3#186#1#10'ActivePage'#7#9'TabSheet2'#5'Align'
-  +#7#5'alTop'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akBottom'#0#8'TabI'
-  +'ndex'#2#1#8'TabOrder'#2#2#0#9'TTabSheet'#9'TabSheet1'#7'Caption'#6#15'Visib'
-  +'le buttons'#12'ClientHeight'#3'a'#1#11'ClientWidth'#3#186#1#0#6'TLabel'#6'L'
-  +'abel1'#4'Left'#3#7#1#6'Height'#2#14#3'Top'#2#5#5'Width'#2'T'#7'Caption'#6#17
-  +'Avaliable buttons'#5'Color'#7#6'clNone'#12'FocusControl'#7#16'ListBtnAvalia'
-  +'ble'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#8#6'Height'#2#14#3
-  +'Top'#2#7#5'Width'#2'F'#7'Caption'#6#15'Visible buttons'#5'Color'#7#6'clNone'
-  +#12'FocusControl'#7#14'ListBtnVisible'#11'ParentColor'#8#0#0#7'TBitBtn'#7'Bi'
-  +'tBtn3'#4'Left'#3#206#0#6'Height'#2#30#3'Top'#3#157#0#5'Width'#2#30#7'Anchor'
-  +'s'#11#5'akTop'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'<<'#9'Num'
-  +'Glyphs'#2#0#7'OnClick'#7#12'BitBtn3Click'#8'TabOrder'#2#0#0#0#7'TBitBtn'#7
-  +'BitBtn4'#4'Left'#3#206#0#6'Height'#2#30#3'Top'#2's'#5'Width'#2#30#7'Anchors'
-  +#11#5'akTop'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#1'<'#9'NumGlyp'
-  +'hs'#2#0#7'OnClick'#7#12'BitBtn4Click'#8'TabOrder'#2#1#0#0#7'TBitBtn'#7'BitB'
-  +'tn5'#4'Left'#3#206#0#6'Height'#2#30#3'Top'#2'J'#5'Width'#2#30#7'Anchors'#11
-  +#5'akTop'#0#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'
-  +#4'Left'#3#206#0#6'Height'#2#30#3'Top'#2'('#5'Width'#2#30#7'Anchors'#11#5'ak'
-  +'Top'#0#25'BorderSpacing.InnerBorder'#2#2#7'Caption'#6#2'>>'#9'NumGlyphs'#2#0
-  +#7'OnClick'#7#12'BitBtn6Click'#8'TabOrder'#2#3#0#0#8'TListBox'#16'ListBtnAva'
-  +'liable'#4'Left'#3#3#1#6'Height'#3#234#0#3'Top'#2#24#5'Width'#3#172#0#7'Anch'
-  +'ors'#11#5'akTop'#6'akLeft'#8'akBottom'#0#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#7'OnClick'#7#21'ListBtnAv'
-  +'aliableClick'#10'OnDrawItem'#7#16'ListBox1DrawItem'#5'Style'#7#16'lbOwnerDr'
-  +'awFixed'#8'TabOrder'#2#4#0#0#8'TListBox'#14'ListBtnVisible'#4'Left'#2#8#6'H'
-  +'eight'#3#234#0#3'Top'#2#24#5'Width'#3#168#0#7'Anchors'#11#5'akTop'#6'akLeft'
-  +#8'akBottom'#0#7'OnClick'#7#21'ListBtnAvaliableClick'#10'OnDrawItem'#7#16'Li'
-  +'stBox1DrawItem'#5'Style'#7#16'lbOwnerDrawFixed'#8'TabOrder'#2#5#8'TopIndex'
-  +#2#255#0#0#6'TPanel'#6'Panel1'#4'Left'#2#3#6'Height'#2'+'#3'Top'#3#26#1#5'Wi'
-  +'dth'#3#174#1#9'Alignment'#7#13'taLeftJustify'#7'Anchors'#11#6'akLeft'#7'akR'
-  +'ight'#8'akBottom'#0#10'BevelOuter'#7#9'bvLowered'#11'FullRepaint'#8#8'TabOr'
-  +'der'#2#6#0#0#9'TCheckBox'#13'cbShowCaption'#4'Left'#2#8#6'Height'#2#13#3'To'
-  +'p'#3#8#1#5'Width'#2'U'#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6#12
-  +'Show caption'#8'OnChange'#7#19'cbShowCaptionChange'#8'TabOrder'#2#7#11'UseO'
-  +'nChange'#9#0#0#0#9'TTabSheet'#9'TabSheet2'#7'Caption'#6#7'Options'#12'Clien'
-  +'tHeight'#3'C'#1#11'ClientWidth'#3#182#1#0#9'TCheckBox'#10'cbShowHint'#4'Lef'
-  +'t'#2#9#6'Height'#2#20#3'Top'#2':'#5'Width'#2'R'#7'Caption'#6#9'Show hint'#7
-  +'OnClick'#7#15'CheckBox1Change'#8'TabOrder'#2#0#11'UseOnChange'#9#0#0#9'TChe'
-  +'ckBox'#8'cbTransp'#4'Left'#2#9#6'Height'#2#20#3'Top'#2'"'#5'Width'#2']'#7'C'
-  +'aption'#6#11'Transparent'#7'OnClick'#7#15'CheckBox1Change'#8'TabOrder'#2#1
-  +#11'UseOnChange'#9#0#0#9'TCheckBox'#9'cbFlatBtn'#4'Left'#2#9#6'Height'#2#20#3
-  +'Top'#2#10#5'Width'#2'\'#7'Caption'#6#12'Flat buttons'#7'OnClick'#7#15'Check'
-  +'Box1Change'#8'TabOrder'#2#2#11'UseOnChange'#9#0#0#9'TCheckBox'#11'cbsBarSty'
-  +'le'#4'Left'#2#9#6'Height'#2#20#3'Top'#2'O'#5'Width'#2'J'#7'Caption'#6#8'XP '
-  +'style'#7'OnClick'#7#15'CheckBox1Change'#8'TabOrder'#2#3#11'UseOnChange'#9#0
-  +#0#11'TRadioGroup'#11'RadioGroup1'#4'Left'#2#9#6'Height'#2'b'#3'Top'#2'j'#5
-  +'Width'#3#176#0#8'AutoFill'#9#7'Caption'#6#12'Button align'#28'ChildSizing.L'
-  +'eftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'ChildSizing.En'
-  +'largeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.EnlargeVerti'
-  +'cal'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizontal'#7#14'c'
-  +'rsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChilds'#18'Child'
-  ,'Sizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizing.ControlsP'
-  +'erLine'#2#1#12'ClientHeight'#2'Q'#11'ClientWidth'#3#172#0#13'Items.Strings'
-  +#1#6#4'None'#6#4'Left'#6#5'Rignt'#0#7'OnClick'#7#15'CheckBox1Change'#8'TabOr'
-  +'der'#2#4#0#0#0#0#0
+  +#3#166#1#3'Top'#3#169#0#5'Width'#3#246#1#11'HelpContext'#2#0#13'ActiveContro'
+  +'l'#7#7'BitBtn6'#5'Align'#7#6'alNone'#14'AllowDropFiles'#8#10'AutoScroll'#9#8
+  +'AutoSize'#8#11'BorderIcons'#11#12'biSystemMenu'#10'biMinimize'#10'biMaximiz'
+  +'e'#0#11'BorderStyle'#7#10'bsSizeable'#7'Caption'#6#16'Tool panel setup'#28
+  +'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29'C'
+  +'hildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'Ch'
+  +'ildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3#166#1#11'ClientWidth'#3
+  +#246#1#8'DockSite'#8#8'DragKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Ena'
+  +'bled'#9#11'Font.Height'#2#0#10'Font.Style'#11#0#9'FormStyle'#7#11'fsStayOnT'
+  +'op'#7'OnClose'#7#9'FormClose'#9'OnDestroy'#7#11'FormDestroy'#8'OnResize'#7
+  +#10'FormResize'#14'ParentBiDiMode'#9#10'ParentFont'#8#8'Position'#7#10'poDes'
+  +'igned'#13'ShowInTaskBar'#7#9'stDefault'#14'UseDockManager'#8#10'LCLVersion'
+  +#6#6'0.9.27'#11'WindowState'#7#8'wsNormal'#0#12'TPageControl'#12'PageControl'
+  +'1'#4'Left'#2#0#6'Height'#3'x'#1#3'Top'#2#0#5'Width'#3#246#1#11'HelpContext'
+  +#2#0#7'TabStop'#9#10'ActivePage'#7#9'TabSheet1'#5'Align'#7#8'alClient'#18'Bo'
+  +'rderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0
+  +#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#0'!BorderSpacing.Ce'
+  +'llAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'cca'
+  +'Fill'#8'DockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'Dr'
+  +'agMode'#7#8'dmManual'#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#8
+  +'TabIndex'#2#0#8'TabOrder'#2#0#11'TabPosition'#7#5'tpTop'#7'Visible'#9#0#9'T'
+  +'TabSheet'#9'TabSheet1'#11'HelpContext'#2#0#7'Caption'#6#15'Visible buttons'
+  +#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpacing'#2#0#29
+  +'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#27'C'
+  +'hildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3'Y'#1#11'ClientWidth'#3
+  +#242#1#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#0#6'TLabel'#6'Labe'
+  +'l1'#22'AnchorSideLeft.Control'#7#7'BitBtn3'#19'AnchorSideLeft.Side'#7#9'asr'
+  +'Bottom'#21'AnchorSideTop.Control'#7#9'TabSheet1'#4'Left'#3#14#1#6'Height'#2
+  +#18#3'Top'#2#6#5'Width'#2'n'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#9'Alig'
+  +'nment'#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'Bord'
+  +'erSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0
+  +#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFil'
+  +'l'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#17'Avaliab'
+  +'le buttons'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'
+  +#9#12'FocusControl'#7#16'ListBtnAvaliable'#6'Layout'#7#5'tlTop'#14'ParentBid'
+  +'iMode'#9#11'ParentColor'#8#10'ParentFont'#9#14'ParentShowHint'#9#13'ShowAcc'
+  +'elChar'#9#11'Transparent'#9#7'Visible'#9#8'WordWrap'#8#11'OptimalFill'#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'_'#11'HelpContext'#2#0#5'Align'#7#6'alNo'
+  +'ne'#9'Alignment'#7#13'taLeftJustify'#8'AutoSize'#9#18'BorderSpacing.Left'#2
+  +#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bo'
+  +'ttom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7
+  +#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#15
+  +'Visible buttons'#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Ena'
+  +'bled'#9#12'FocusControl'#7#14'ListBtnVisible'#6'Layout'#7#5'tlTop'#14'Paren'
+  +'tBidiMode'#9#11'ParentColor'#8#10'ParentFont'#9#14'ParentShowHint'#9#13'Sho'
+  +'wAccelChar'#9#11'Transparent'#9#7'Visible'#9#8'WordWrap'#8#11'OptimalFill'#8
+  +#0#0#7'TBitBtn'#7'BitBtn3'#4'Left'#3#234#0#6'Height'#2#30#3'Top'#3#157#0#5'W'
+  +'idth'#2#30#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#0
+  +#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'Borde'
+  +'rSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2
+  +#0#25'BorderSpacing.InnerBorder'#2#2'!BorderSpacing.CellAlignHorizontal'#7#7
+  +'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Cap'
+  +'tion'#6#2'<<'#7'Default'#8#7'Enabled'#9#4'Kind'#7#8'bkCustom'#6'Layout'#7#11
+  +'blGlyphLeft'#6'Margin'#2#255#11'ModalResult'#2#0#9'NumGlyphs'#2#0#7'OnClick'
+  +#7#12'BitBtn3Click'#10'ParentFont'#9#14'ParentShowHint'#9#7'Spacing'#2#3#8'T'
+  +'abOrder'#2#0#7'TabStop'#9#7'Visible'#9#0#0#7'TBitBtn'#7'BitBtn4'#4'Left'#3
+  +#234#0#6'Height'#2#30#3'Top'#2's'#5'Width'#2#30#11'HelpContext'#2#0#5'Align'
+  +#7#6'alNone'#7'Anchors'#11#5'akTop'#0#8'AutoSize'#8#18'BorderSpacing.Left'#2
+  +#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bo'
+  +'ttom'#2#0#20'BorderSpacing.Around'#2#0#25'BorderSpacing.InnerBorder'#2#2'!B'
+  +'orderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVe'
+  +'rtical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#1'<'#7'Default'#8#7'Enabled'#9
+  ,#4'Kind'#7#8'bkCustom'#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2#255#11'ModalR'
+  +'esult'#2#0#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn4Click'#10'ParentFont'#9
+  +#14'ParentShowHint'#9#7'Spacing'#2#3#8'TabOrder'#2#1#7'TabStop'#9#7'Visible'
+  +#9#0#0#7'TBitBtn'#7'BitBtn5'#4'Left'#3#234#0#6'Height'#2#30#3'Top'#2'J'#5'Wi'
+  +'dth'#2#30#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#0
+  +#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'Borde'
+  +'rSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2
+  +#0#25'BorderSpacing.InnerBorder'#2#2'!BorderSpacing.CellAlignHorizontal'#7#7
+  +'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#6'Cancel'#8#7'Cap'
+  +'tion'#6#1'>'#7'Default'#8#7'Enabled'#9#4'Kind'#7#8'bkCustom'#6'Layout'#7#11
+  +'blGlyphLeft'#6'Margin'#2#255#11'ModalResult'#2#0#9'NumGlyphs'#2#0#7'OnClick'
+  +#7#12'BitBtn5Click'#10'ParentFont'#9#14'ParentShowHint'#9#7'Spacing'#2#3#8'T'
+  +'abOrder'#2#2#7'TabStop'#9#7'Visible'#9#0#0#7'TBitBtn'#7'BitBtn6'#4'Left'#3
+  +#234#0#6'Height'#2#30#3'Top'#2'('#5'Width'#2#30#11'HelpContext'#2#0#5'Align'
+  +#7#6'alNone'#7'Anchors'#11#5'akTop'#0#8'AutoSize'#8#18'BorderSpacing.Left'#2
+  +#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bo'
+  +'ttom'#2#0#20'BorderSpacing.Around'#2#0#25'BorderSpacing.InnerBorder'#2#2'!B'
+  +'orderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVe'
+  +'rtical'#7#7'ccaFill'#6'Cancel'#8#7'Caption'#6#2'>>'#7'Default'#8#7'Enabled'
+  +#9#4'Kind'#7#8'bkCustom'#6'Layout'#7#11'blGlyphLeft'#6'Margin'#2#255#11'Moda'
+  +'lResult'#2#0#9'NumGlyphs'#2#0#7'OnClick'#7#12'BitBtn6Click'#10'ParentFont'#9
+  +#14'ParentShowHint'#9#7'Spacing'#2#3#8'TabOrder'#2#3#7'TabStop'#9#7'Visible'
+  +#9#0#0#8'TListBox'#16'ListBtnAvaliable'#22'AnchorSideLeft.Control'#7#7'BitBt'
+  +'n3'#19'AnchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#6'La'
+  +'bel1'#18'AnchorSideTop.Side'#7#9'asrBottom'#23'AnchorSideRight.Control'#7#9
+  +'TabSheet1'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSideBottom.Cont'
+  +'rol'#7#13'cbShowCaption'#4'Left'#3#14#1#6'Height'#3#216#0#3'Top'#2#30#5'Wid'
+  +'th'#3#222#0#11'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'
+  +#6'akLeft'#7'akRight'#8'akBottom'#0#18'BorderSpacing.Left'#2#0#17'BorderSpac'
+  +'ing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'Bo'
+  +'rderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31
+  +'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#11'BorderStyle'#7#8'bsSingle'
+  +#16'ClickOnSelChange'#9#7'Columns'#2#0#10'DragCursor'#7#6'crDrag'#8'DragKind'
+  +#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#14'ExtendedSelect'#9#7'Enabled'#9#14
+  +'IntegralHeight'#8#13'Items.Strings'#1#6#3'111'#6#3'222'#6#3'333'#6#2'44'#6#3
+  +'555'#6#3'666'#6#3'777'#0#10'ItemHeight'#2#0#11'MultiSelect'#8#7'OnClick'#7
+  +#21'ListBtnAvaliableClick'#10'OnDrawItem'#7#16'ListBox1DrawItem'#14'ParentBi'
+  +'diMode'#9#14'ParentShowHint'#9#10'ParentFont'#9#6'Sorted'#8#5'Style'#7#16'l'
+  +'bOwnerDrawFixed'#8'TabOrder'#2#4#7'TabStop'#9#8'TopIndex'#2#0#7'Visible'#9#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.Control'#7#13'cbS'
+  +'howCaption'#4'Left'#2#14#6'Height'#3#216#0#3'Top'#2#30#5'Width'#3#214#0#11
+  +'HelpContext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#6'akLeft'#7'ak'
+  +'Right'#8'akBottom'#0#18'BorderSpacing.Left'#2#0#17'BorderSpacing.Top'#2#0#19
+  +'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderSpacing.Arou'
+  +'nd'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'BorderSpacing.C'
+  +'ellAlignVertical'#7#7'ccaFill'#11'BorderStyle'#7#8'bsSingle'#16'ClickOnSelC'
+  +'hange'#9#7'Columns'#2#0#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8
+  +'DragMode'#7#8'dmManual'#14'ExtendedSelect'#9#7'Enabled'#9#14'IntegralHeight'
+  +#8#10'ItemHeight'#2#0#11'MultiSelect'#8#7'OnClick'#7#21'ListBtnAvaliableClic'
+  +'k'#10'OnDrawItem'#7#16'ListBox1DrawItem'#14'ParentBidiMode'#9#14'ParentShow'
+  +'Hint'#9#10'ParentFont'#9#6'Sorted'#8#5'Style'#7#16'lbOwnerDrawFixed'#8'TabO'
+  +'rder'#2#5#7'TabStop'#9#8'TopIndex'#2#255#7'Visible'#9#0#0#6'TPanel'#6'Panel'
+  +'1'#24'AnchorSideBottom.Control'#7#9'TabSheet1'#21'AnchorSideBottom.Side'#7#9
+  +'asrBottom'#4'Left'#2#3#6'Height'#2'>'#3'Top'#3#21#1#5'Width'#3#230#1#11'Hel'
+  +'pContext'#2#0#5'Align'#7#6'alNone'#9'Alignment'#7#13'taLeftJustify'#7'Ancho'
+  +'rs'#11#6'akLeft'#7'akRight'#8'akBottom'#0#8'AutoSize'#8#18'BorderSpacing.Le'
+  +'ft'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpac'
+  +'ing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizo'
+  +'ntal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#10'Beve'
+  +'lInner'#7#6'bvNone'#10'BevelOuter'#7#9'bvLowered'#10'BevelWidth'#2#1#11'Bor'
+  +'derWidth'#2#0#11'BorderStyle'#7#6'bsNone'#28'ChildSizing.LeftRightSpacing'#2
+  +#0#28'ChildSizing.TopBottomSpacing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0
+  ,#27'ChildSizing.VerticalSpacing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#8'D'
+  +'ockSite'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'DragMode'#7
+  +#8'dmManual'#7'Enabled'#9#11'FullRepaint'#8#11'ParentColor'#9#10'ParentFont'
+  +#9#14'ParentShowHint'#9#8'TabOrder'#2#6#7'TabStop'#8#7'Visible'#9#0#0#9'TChe'
+  +'ckBox'#13'cbShowCaption'#22'AnchorSideLeft.Control'#7#9'TabSheet1'#24'Ancho'
+  +'rSideBottom.Control'#7#6'Panel1'#4'Left'#2#6#6'Height'#2#19#3'Top'#3#252#0#5
+  +'Width'#2'i'#11'HelpContext'#2#0#5'Align'#7#6'alNone'#11'AllowGrayed'#8#7'An'
+  +'chors'#11#6'akLeft'#8'akBottom'#0#8'AutoSize'#9#18'BorderSpacing.Left'#2#0
+  +#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bott'
+  +'om'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7
+  +'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#12'S'
+  +'how caption'#7'Checked'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'
+  +#8'DragMode'#7#8'dmManual'#7'Enabled'#9#8'OnChange'#7#19'cbShowCaptionChange'
+  +#11'ParentColor'#9#10'ParentFont'#9#14'ParentShowHint'#9#14'ParentBidiMode'#9
+  +#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#7#7'TabStop'#9#11'UseOnChange'#9#7
+  +'Visible'#9#0#0#0#9'TTabSheet'#9'TabSheet2'#11'HelpContext'#2#0#7'Caption'#6
+  +#7'Options'#28'ChildSizing.LeftRightSpacing'#2#0#28'ChildSizing.TopBottomSpa'
+  +'cing'#2#0#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpac'
+  +'ing'#2#0#27'ChildSizing.ControlsPerLine'#2#0#12'ClientHeight'#3'Y'#1#11'Cli'
+  +'entWidth'#3#242#1#7'Enabled'#9#10'ParentFont'#9#14'ParentShowHint'#9#0#9'TC'
+  +'heckBox'#10'cbShowHint'#22'AnchorSideLeft.Control'#7#9'TabSheet2'#21'Anchor'
+  +'SideTop.Control'#7#8'cbTransp'#18'AnchorSideTop.Side'#7#9'asrBottom'#4'Left'
+  +#2#6#6'Height'#2#19#3'Top'#3#160#0#5'Width'#2'R'#11'HelpContext'#2#0#5'Align'
+  +#7#6'alNone'#11'AllowGrayed'#8#8'AutoSize'#9#18'BorderSpacing.Left'#2#0#17'B'
+  +'orderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2
+  +#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaF'
+  +'ill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#9'Show h'
+  +'int'#7'Checked'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkDrag'#8'Drag'
+  +'Mode'#7#8'dmManual'#7'Enabled'#9#7'OnClick'#7#15'CheckBox1Change'#11'Parent'
+  +'Color'#9#10'ParentFont'#9#14'ParentShowHint'#9#14'ParentBidiMode'#9#5'State'
+  +#7#11'cbUnchecked'#8'TabOrder'#2#0#7'TabStop'#9#11'UseOnChange'#9#7'Visible'
+  +#9#0#0#9'TCheckBox'#8'cbTransp'#22'AnchorSideLeft.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'#3#135#0#5'Width'#2'_'#11'HelpContext'#2#0
+  +#5'Align'#7#6'alNone'#11'AllowGrayed'#8#8'AutoSize'#9#18'BorderSpacing.Left'
+  +#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.'
+  +'Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'
+  +#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6
+  +#11'Transparent'#7'Checked'#8#10'DragCursor'#7#6'crDrag'#8'DragKind'#7#6'dkD'
+  +'rag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#7'OnClick'#7#15'CheckBox1Change'
+  +#11'ParentColor'#9#10'ParentFont'#9#14'ParentShowHint'#9#14'ParentBidiMode'#9
+  +#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#1#7'TabStop'#9#11'UseOnChange'#9#7
+  +'Visible'#9#0#0#9'TCheckBox'#9'cbFlatBtn'#22'AnchorSideLeft.Control'#7#9'Tab'
+  +'Sheet2'#21'AnchorSideTop.Control'#7#11'RadioGroup1'#18'AnchorSideTop.Side'#7
+  +#9'asrBottom'#4'Left'#2#6#6'Height'#2#19#3'Top'#2'n'#5'Width'#2'`'#11'HelpCo'
+  +'ntext'#2#0#5'Align'#7#6'alNone'#11'AllowGrayed'#8#8'AutoSize'#9#18'BorderSp'
+  +'acing.Left'#2#0#17'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'Bo'
+  +'rderSpacing.Bottom'#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAli'
+  +'gnHorizontal'#7#7'ccaFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'
+  +#7'Caption'#6#12'Flat buttons'#7'Checked'#8#10'DragCursor'#7#6'crDrag'#8'Dra'
+  +'gKind'#7#6'dkDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#7'OnClick'#7#15'C'
+  +'heckBox1Change'#11'ParentColor'#9#10'ParentFont'#9#14'ParentShowHint'#9#14
+  +'ParentBidiMode'#9#5'State'#7#11'cbUnchecked'#8'TabOrder'#2#2#7'TabStop'#9#11
+  +'UseOnChange'#9#7'Visible'#9#0#0#11'TRadioGroup'#11'RadioGroup1'#22'AnchorSi'
+  +'deLeft.Control'#7#9'TabSheet2'#21'AnchorSideTop.Control'#7#9'TabSheet2'#4'L'
+  +'eft'#2#6#6'Height'#2'b'#3'Top'#2#6#5'Width'#3#208#0#11'HelpContext'#2#0#5'A'
+  +'lign'#7#6'alNone'#8'AutoFill'#9#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17
+  +'BorderSpacing.Top'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'
+  +#2#0#20'BorderSpacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'cc'
+  +'aFill'#31'BorderSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#12'But'
+  +'ton align'#28'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpa'
+  +'cing'#2#6#29'ChildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpac'
+  +'ing'#2#0#29'ChildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27
+  +'ChildSizing.EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.'
+  ,'ShrinkHorizontal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14
+  +'crsScaleChilds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'
+  +#27'ChildSizing.ControlsPerLine'#2#1#12'ClientHeight'#2'Q'#11'ClientWidth'#3
+  +#208#0#12'ColumnLayout'#7#24'clHorizontalThenVertical'#7'Columns'#2#1#5'Ctl3'
+  +'D'#8#10'DragCursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#9'It'
+  +'emIndex'#2#255#13'Items.Strings'#1#6#4'None'#6#4'Left'#6#5'Rignt'#0#7'OnCli'
+  +'ck'#7#15'CheckBox1Change'#10'ParentFont'#9#11'ParentColor'#9#11'ParentCtl3D'
+  +#9#14'ParentShowHint'#9#8'TabOrder'#2#3#7'TabStop'#9#7'Visible'#9#0#0#11'TRa'
+  +'dioGroup'#11'RadioGroup2'#22'AnchorSideLeft.Control'#7#11'RadioGroup1'#19'A'
+  +'nchorSideLeft.Side'#7#9'asrBottom'#21'AnchorSideTop.Control'#7#9'TabSheet2'
+  +#23'AnchorSideRight.Control'#7#9'TabSheet2'#20'AnchorSideRight.Side'#7#9'asr'
+  +'Bottom'#4'Left'#3#220#0#6'Height'#2'a'#3'Top'#2#6#5'Width'#3#16#1#11'HelpCo'
+  +'ntext'#2#0#5'Align'#7#6'alNone'#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'
+  +#0#8'AutoFill'#9#8'AutoSize'#8#18'BorderSpacing.Left'#2#0#17'BorderSpacing.T'
+  +'op'#2#0#19'BorderSpacing.Right'#2#0#20'BorderSpacing.Bottom'#2#0#20'BorderS'
+  +'pacing.Around'#2#6'!BorderSpacing.CellAlignHorizontal'#7#7'ccaFill'#31'Bord'
+  +'erSpacing.CellAlignVertical'#7#7'ccaFill'#7'Caption'#6#14'Tool bar style'#28
+  +'ChildSizing.LeftRightSpacing'#2#6#28'ChildSizing.TopBottomSpacing'#2#6#29'C'
+  +'hildSizing.HorizontalSpacing'#2#0#27'ChildSizing.VerticalSpacing'#2#0#29'Ch'
+  +'ildSizing.EnlargeHorizontal'#7#24'crsHomogenousChildResize'#27'ChildSizing.'
+  +'EnlargeVertical'#7#24'crsHomogenousChildResize'#28'ChildSizing.ShrinkHorizo'
+  +'ntal'#7#14'crsScaleChilds'#26'ChildSizing.ShrinkVertical'#7#14'crsScaleChil'
+  +'ds'#18'ChildSizing.Layout'#7#29'cclLeftToRightThenTopToBottom'#27'ChildSizi'
+  +'ng.ControlsPerLine'#2#1#12'ClientHeight'#2'P'#11'ClientWidth'#3#16#1#12'Col'
+  +'umnLayout'#7#24'clHorizontalThenVertical'#7'Columns'#2#1#5'Ctl3D'#8#10'Drag'
+  +'Cursor'#7#6'crDrag'#8'DragMode'#7#8'dmManual'#7'Enabled'#9#9'ItemIndex'#2
+  +#255#13'Items.Strings'#1#6#8'Standart'#6#10'Windows XP'#6#6'Native'#0#7'OnCl'
+  +'ick'#7#15'CheckBox1Change'#10'ParentFont'#9#11'ParentColor'#9#11'ParentCtl3'
+  +'D'#9#14'ParentShowHint'#9#8'TabOrder'#2#4#7'TabStop'#9#7'Visible'#9#0#0#0#0
+  +#12'TButtonPanel'#12'ButtonPanel1'#4'Left'#2#6#6'Height'#2'.'#3'Top'#3'x'#1#5
+  +'Width'#3#234#1#11'HelpContext'#2#0#5'Align'#7#8'alBottom'#8'AutoSize'#9#11
+  +'ButtonOrder'#7#9'boDefault'#8'TabOrder'#2#1#13'DefaultButton'#7#4'pbOK'#11
+  +'ShowButtons'#11#7'pbClose'#6'pbHelp'#0#10'ShowGlyphs'#11#4'pbOK'#8'pbCancel'
+  +#7'pbClose'#6'pbHelp'#0#7'Visible'#9#0#0#0
 ]);
--- a/components/rx/rxtbrsetup.pas
+++ b/components/rx/rxtbrsetup.pas
@@ -6,24 +6,22 @@ interface

 uses
  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, Buttons,
-  rxtoolbar, StdCtrls, ComCtrls, ExtCtrls;
+  rxtoolbar, StdCtrls, ComCtrls, ExtCtrls, ButtonPanel;

 type

  { TToolPanelSetupForm }

  TToolPanelSetupForm = class(TForm)
-    BitBtn1: TBitBtn;
-    BitBtn2: TBitBtn;
    BitBtn3: TBitBtn;
    BitBtn4: TBitBtn;
    BitBtn5: TBitBtn;
    BitBtn6: TBitBtn;
+    ButtonPanel1: TButtonPanel;
    cbShowHint: TCheckBox;
    cbTransp: TCheckBox;
    cbFlatBtn: TCheckBox;
    cbShowCaption: TCheckBox;
-    cbsBarStyle: TCheckBox;
    Label1: TLabel;
    Label2: TLabel;
    ListBtnAvaliable: TListBox;
@@ -31,6 +29,7 @@ type
    PageControl1: TPageControl;
    Panel1: TPanel;
    RadioGroup1: TRadioGroup;
+    RadioGroup2: TRadioGroup;
    TabSheet1: TTabSheet;
    TabSheet2: TTabSheet;
    procedure BitBtn3Click(Sender: TObject);
@@ -168,6 +167,7 @@ begin

  BitBtn4.Enabled:=ListBtnAvaliable.Items.Count>0;
  BitBtn3.Enabled:=ListBtnAvaliable.Items.Count>0;
+  cbFlatBtn.Checked:=tpTransparentBtns in FToolPanel.Options;
 end;

 procedure TToolPanelSetupForm.FormClose(Sender: TObject;
@@ -187,13 +187,7 @@ begin
  else
    tpo:=tpo - [tpTransparentBtns];

-  if cbsBarStyle.Checked then
-  begin
-    FToolPanel.ToolBarStyle:=tbsWindowsXP;
-    cbFlatBtn.Checked:=true;
-  end
-  else
-    FToolPanel.ToolBarStyle:=tbsStandart;
+  FToolPanel.ToolBarStyle:=TToolBarStyle(RadioGroup2.ItemIndex);

  if cbFlatBtn.Checked then
    tpo:=tpo + [tpFlatBtns]
@@ -204,6 +198,7 @@ begin
  FToolPanel.Options:=tpo;
  
  FToolPanel.ButtonAllign:=TToolButtonAllign(RadioGroup1.ItemIndex);
+  cbFlatBtn.Checked:=tpTransparentBtns in FToolPanel.Options;
 end;

 procedure TToolPanelSetupForm.BitBtn4Click(Sender: TObject);
@@ -238,12 +233,13 @@ begin
  cbFlatBtn.Checked:=tpFlatBtns in FToolPanel.Options;
  cbTransp.Checked:=tpTransparentBtns in FToolPanel.Options;
  cbShowHint.Checked:=FToolPanel.ShowHint;
-  cbsBarStyle.Checked:=FToolPanel.ToolBarStyle=tbsWindowsXP;
  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);
+
  UpdateStates;
 end;