diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm index 5f6f5f9e2..40165ced6 100644 --- a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm +++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm @@ -1,35 +1,37 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow - Left = 664 + Left = 922 Height = 555 - Top = 224 - Width = 552 + Top = 211 + Width = 589 + AutoSize = True Caption = 'Toolbar appearance editor' ClientHeight = 555 - ClientWidth = 552 + ClientWidth = 589 Color = clBtnFace Font.Color = clWindowText OnActivate = FormActivate OnCloseQuery = FormCloseQuery OnCreate = FormCreate OnShow = FormShow + Position = poWorkAreaCenter ShowHint = True LCLVersion = '2.1.0.0' object gbPreview: TGroupBox Left = 0 Height = 133 Top = 0 - Width = 552 + Width = 589 Align = alTop AutoSize = True Caption = ' Preview ' ClientHeight = 113 - ClientWidth = 548 + ClientWidth = 585 TabOrder = 0 object tbPreview: TSpkToolbar Left = 0 Height = 113 Top = 0 - Width = 548 + Width = 585 Color = clBtnFace Appearance.Tab.TabHeaderFont.Color = 9126421 Appearance.Tab.TabHeaderFont.Height = -13 @@ -328,11 +330,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end end end - object PageControl1: TPageControl + object PageControl: TPageControl Left = 0 Height = 381 Top = 133 - Width = 552 + Width = 589 ActivePage = TabSheet6 Align = alClient TabIndex = 0 @@ -340,15 +342,17 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object TabSheet6: TTabSheet Caption = 'Menu Button' ClientHeight = 353 - ClientWidth = 544 + ClientWidth = 581 object pMenuButtonIdleFrame: TPanel - AnchorSideLeft.Control = cbLinkItem - AnchorSideTop.Control = LblIdle1 + AnchorSideLeft.Control = lblMenuButtonFont + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = lblMenuButtonIdle AnchorSideTop.Side = asrBottom - Left = 120 + Left = 127 Height = 25 - Top = 50 + Top = 27 Width = 100 + BorderSpacing.Left = 16 BorderSpacing.Top = 4 BevelInner = bvRaised BevelOuter = bvLowered @@ -356,14 +360,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow TabOrder = 0 OnClick = pMenuButtonIdleFrameClick end - object LblIdle1: TLabel + object lblMenuButtonIdle: TLabel AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideLeft.Side = asrCenter - AnchorSideTop.Control = cbLinkItem - AnchorSideTop.Side = asrBottom - Left = 161 + AnchorSideTop.Control = TabSheet6 + Left = 168 Height = 15 - Top = 31 + Top = 8 Width = 19 Alignment = taCenter BorderSpacing.Top = 8 @@ -376,45 +379,45 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 25 - Top = 81 + Top = 58 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 1 + TabOrder = 3 OnClick = pMenuButtonIdleGradientFromClick end object pMenuButtonIdleGradientTo: TPanel - AnchorSideLeft.Control = pMenuButtonIdleGradientFrom + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideTop.Control = pMenuButtonIdleGradientFrom AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonIdleGradientFrom + AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 25 - Top = 112 + Top = 89 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 2 + TabOrder = 6 OnClick = pMenuButtonIdleGradientToClick end object cbMenuButtonIdleGradientKind: TComboBox - AnchorSideLeft.Control = pMenuButtonIdleGradientFrom + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideTop.Control = pMenuButtonIdleGradientTo AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonIdleGradientTo + AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 23 - Top = 143 + Top = 120 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -428,46 +431,48 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ) OnChange = cbMenuButtonIdleGradientKindChange Style = csDropDownList - TabOrder = 3 + TabOrder = 9 Text = 'None' end object pMenuButtonIdleCaptionColor: TPanel - AnchorSideLeft.Control = cbMenuButtonIdleGradientKind + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideTop.Control = cbMenuButtonIdleGradientKind AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonIdleGradientTo + AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 25 - Top = 172 + Top = 149 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 4 + TabOrder = 12 OnClick = pMenuButtonIdleCaptionColorClick end - object Label6: TLabel + object lMenuButtonIdleFrame: TLabel AnchorSideTop.Control = pMenuButtonIdleFrame AnchorSideTop.Side = asrCenter - AnchorSideRight.Side = asrBottom - Left = 67 + AnchorSideRight.Control = pMenuButtonIdleFrame + Left = 78 Height = 15 - Top = 55 + Top = 32 Width = 33 Anchors = [akTop, akRight] + BorderSpacing.Right = 16 Caption = 'Frame' ParentColor = False end object Label22: TLabel AnchorSideTop.Control = pMenuButtonIdleGradientFrom AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 26 + Left = 37 Height = 15 - Top = 86 + Top = 63 Width = 74 Anchors = [akTop, akRight] Caption = 'Gradient from' @@ -476,10 +481,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label23: TLabel AnchorSideTop.Control = pMenuButtonIdleGradientTo AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 41 + Left = 52 Height = 15 - Top = 117 + Top = 94 Width = 59 Anchors = [akTop, akRight] Caption = 'Gradient to' @@ -488,10 +494,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label30: TLabel AnchorSideTop.Control = cbMenuButtonIdleGradientKind AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 29 + Left = 40 Height = 15 - Top = 147 + Top = 124 Width = 71 Anchors = [akTop, akRight] Caption = 'Gradient kind' @@ -500,21 +507,25 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label31: TLabel AnchorSideTop.Control = pMenuButtonIdleCaptionColor AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 28 + Left = 39 Height = 15 - Top = 177 + Top = 154 Width = 72 Anchors = [akTop, akRight] Caption = 'Caption color' ParentColor = False end object pMenuButtonFont: TPanel + AnchorSideLeft.Control = pMenuButtonIdleFrame + AnchorSideTop.Control = pMenuButtonIdleCaptionColor AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 25 - Top = 224 + Top = 188 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 14 @@ -522,42 +533,45 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Font' - TabOrder = 5 + TabOrder = 15 OnClick = pMenuButtonFontClick end - object Label33: TLabel + object lblMenuButtonFont: TLabel + AnchorSideLeft.Control = TabSheet6 AnchorSideTop.Control = pMenuButtonFont AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 5 + Left = 16 Height = 15 - Top = 229 + Top = 193 Width = 95 - Anchors = [akTop, akRight] + BorderSpacing.Left = 16 Caption = 'Menu Button font' ParentColor = False end object Label34: TLabel AnchorSideTop.Control = cbMenuButtonShapeStyle AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 40 + Left = 51 Height = 15 - Top = 259 + Top = 223 Width = 60 Anchors = [akTop, akRight] Caption = 'Shape Style' ParentColor = False end object cbMenuButtonShapeStyle: TComboBox - AnchorSideLeft.Control = pMenuButtonIdleGradientFrom + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideTop.Control = pMenuButtonFont AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonIdleGradientTo + AnchorSideRight.Control = pMenuButtonIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 127 Height = 23 - Top = 255 + Top = 219 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -569,29 +583,31 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ) OnChange = cbMenuButtonShapeStyleChange Style = csDropDownList - TabOrder = 6 + TabOrder = 16 Text = 'Rounded' end object edMenuButtonHotTrackBrightnessChange: TSpinEdit + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideTop.Control = cbMenuButtonShapeStyle AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = pMenuButtonHottrackFrame AnchorSideRight.Side = asrBottom - Left = 263 + Left = 270 Height = 23 - Top = 255 + Top = 219 Width = 100 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] MinValue = -100 OnChange = edMenuButtonHotTrackBrightnessChangeChange - TabOrder = 7 + TabOrder = 17 end object Label24: TLabel - AnchorSideLeft.Control = edMenuButtonHotTrackBrightnessChange + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideBottom.Control = edMenuButtonHotTrackBrightnessChange - Left = 263 + Left = 270 Height = 15 - Top = 236 + Top = 200 Width = 97 Alignment = taRightJustify Anchors = [akLeft, akBottom] @@ -600,34 +616,34 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ParentColor = False end object pMenuButtonHottrackCaptionColor: TPanel - AnchorSideLeft.Control = cbMenuButtonHottrackGradientKind + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideTop.Control = cbMenuButtonHottrackGradientKind AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonHottrackGradientTo + AnchorSideRight.Control = pMenuButtonHottrackFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonIdleCaptionColor AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 270 Height = 25 - Top = 172 + Top = 149 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 8 + TabOrder = 13 OnClick = pMenuButtonHottrackCaptionColorClick end object cbMenuButtonHottrackGradientKind: TComboBox - AnchorSideLeft.Control = pMenuButtonHottrackGradientTo + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideTop.Control = pMenuButtonHottrackGradientTo AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonHottrackGradientTo + AnchorSideRight.Control = pMenuButtonHottrackFrame AnchorSideRight.Side = asrBottom - Left = 263 + Left = 270 Height = 23 - Top = 143 + Top = 120 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -641,27 +657,27 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ) OnChange = cbMenuButtonHottrackGradientKindChange Style = csDropDownList - TabOrder = 9 + TabOrder = 10 Text = 'None' end object pMenuButtonHottrackGradientTo: TPanel - AnchorSideLeft.Control = pMenuButtonHottrackGradientFrom + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideTop.Control = pMenuButtonHottrackGradientFrom AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonHottrackGradientFrom + AnchorSideRight.Control = pMenuButtonHottrackFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonIdleGradientTo AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 270 Height = 25 - Top = 112 + Top = 89 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 10 + TabOrder = 7 OnClick = pMenuButtonHottrackGradientToClick end object pMenuButtonHottrackGradientFrom: TPanel @@ -672,16 +688,16 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonIdleGradientFrom AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 270 Height = 25 - Top = 81 + Top = 58 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 11 + TabOrder = 4 OnClick = pMenuButtonHottrackGradientFromClick end object pMenuButtonHottrackFrame: TPanel @@ -690,27 +706,27 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = pMenuButtonIdleFrame AnchorSideBottom.Control = pMenuButtonIdleFrame AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 270 Height = 25 - Top = 50 + Top = 27 Width = 100 Anchors = [akTop, akLeft, akBottom] BorderSpacing.Left = 43 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 12 + TabOrder = 1 OnClick = pMenuButtonHottrackFrameClick end - object LblActive1: TLabel + object lblMenuButtonActive: TLabel AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideLeft.Side = asrCenter - AnchorSideTop.Control = LblHotTrack1 - AnchorSideBottom.Control = LblHotTrack1 + AnchorSideTop.Control = lblMenuButtonHotTrack + AnchorSideBottom.Control = lblMenuButtonHotTrack AnchorSideBottom.Side = asrBottom - Left = 440 + Left = 447 Height = 15 - Top = 31 + Top = 8 Width = 33 Alignment = taCenter Anchors = [akTop, akLeft, akBottom] @@ -723,16 +739,16 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = pMenuButtonHottrackFrame AnchorSideBottom.Control = pMenuButtonHottrackFrame AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 413 Height = 25 - Top = 50 + Top = 27 Width = 100 Anchors = [akTop, akLeft, akBottom] BorderSpacing.Left = 43 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 13 + TabOrder = 2 OnClick = pMenuButtonActiveFrameClick end object pMenuButtonActiveGradientFrom: TPanel @@ -743,47 +759,47 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonHottrackGradientFrom AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 413 Height = 25 - Top = 81 + Top = 58 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 14 + TabOrder = 5 OnClick = pMenuButtonActiveGradientFromClick end object pMenuButtonActiveGradientTo: TPanel - AnchorSideLeft.Control = pMenuButtonActiveGradientFrom + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideTop.Control = pMenuButtonActiveGradientFrom AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonActiveGradientFrom + AnchorSideRight.Control = pMenuButtonActiveFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonHottrackGradientTo AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 413 Height = 25 - Top = 112 + Top = 89 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 15 + TabOrder = 8 OnClick = pMenuButtonActiveGradientToClick end object cbMenuButtonActiveGradientKind: TComboBox - AnchorSideLeft.Control = pMenuButtonActiveGradientTo + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideTop.Control = pMenuButtonActiveGradientTo AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pMenuButtonActiveGradientTo + AnchorSideRight.Control = pMenuButtonActiveFrame AnchorSideRight.Side = asrBottom - Left = 406 + Left = 413 Height = 23 - Top = 143 + Top = 120 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -797,38 +813,38 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ) OnChange = cbMenuButtonActiveGradientKindChange Style = csDropDownList - TabOrder = 16 + TabOrder = 11 Text = 'None' end object pMenuButtonActiveCaptionColor: TPanel - AnchorSideLeft.Control = cbMenuButtonActiveGradientKind + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideTop.Control = cbMenuButtonActiveGradientKind AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = cbMenuButtonActiveGradientKind + AnchorSideRight.Control = pMenuButtonActiveFrame AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pMenuButtonHottrackCaptionColor AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 413 Height = 25 - Top = 172 + Top = 149 Width = 100 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Top = 6 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' - TabOrder = 17 + TabOrder = 14 OnClick = pMenuButtonActiveCaptionColorClick end - object LblHotTrack1: TLabel + object lblMenuButtonHotTrack: TLabel AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideLeft.Side = asrCenter - AnchorSideTop.Control = LblIdle1 - AnchorSideBottom.Control = LblIdle1 + AnchorSideTop.Control = lblMenuButtonIdle + AnchorSideBottom.Control = lblMenuButtonIdle AnchorSideBottom.Side = asrBottom - Left = 290 + Left = 297 Height = 15 - Top = 31 + Top = 8 Width = 46 Alignment = taCenter Anchors = [akTop, akLeft, akBottom] @@ -836,15 +852,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ParentColor = False end object bMenuButtonIdleGradientFromColor: TSpeedButton - AnchorSideLeft.Control = pItemIdleFrame + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemHottrackGradientFrom + AnchorSideTop.Control = pMenuButtonHottrackGradientFrom AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 229 Height = 24 - Top = 81 + Top = 58 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -853,15 +869,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonIdleGradientFromColorClick end object bMenuButtonIdleFrameColor: TSpeedButton - AnchorSideLeft.Control = pItemIdleFrame + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemIdleFrame + AnchorSideTop.Control = pMenuButtonIdleFrame AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 229 Height = 24 - Top = 50 + Top = 27 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -870,13 +886,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonIdleFrameColorClick end object bMenuButtonIdleGradientToColor: TSpeedButton - AnchorSideLeft.Control = pItemIdleFrame + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = pItemIdleGradientTo AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 229 Height = 24 Top = 112 Width = 25 @@ -887,15 +903,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonIdleGradientToColorClick end object bMenuButtonIdleCaptionColor: TSpeedButton - AnchorSideLeft.Control = pItemIdleFrame + AnchorSideLeft.Control = pMenuButtonIdleFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemIdleCaptionColor + AnchorSideTop.Control = pMenuButtonIdleCaptionColor AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 229 Height = 24 - Top = 172 + Top = 149 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -904,15 +920,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonIdleCaptionColorClick end object bMenuButtonHotTrackCaptionColor: TSpeedButton - AnchorSideLeft.Control = pItemHottrackFrame + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemHottrackCaptionColor + AnchorSideTop.Control = pMenuButtonHottrackCaptionColor AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 372 Height = 24 - Top = 172 + Top = 149 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -921,15 +937,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonHotTrackCaptionColorClick end object bMenuButtonHotTrackGradientToColor: TSpeedButton - AnchorSideLeft.Control = pItemHottrackFrame + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemHottrackGradientTo + AnchorSideTop.Control = pMenuButtonHottrackGradientTo AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 372 Height = 24 - Top = 112 + Top = 89 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -938,15 +954,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonHotTrackGradientToColorClick end object bMenuButtonHotTrackGradientFromColor: TSpeedButton - AnchorSideLeft.Control = pItemHottrackFrame + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemHottrackGradientFrom + AnchorSideTop.Control = pMenuButtonHottrackGradientFrom AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 372 Height = 24 - Top = 81 + Top = 58 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -955,15 +971,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonHotTrackGradientFromColorClick end object bMenuButtonHotTrackFrameColor: TSpeedButton - AnchorSideLeft.Control = pItemHottrackFrame + AnchorSideLeft.Control = pMenuButtonHottrackFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemHottrackFrame + AnchorSideTop.Control = pMenuButtonHottrackFrame AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 372 Height = 24 - Top = 50 + Top = 27 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -972,15 +988,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonHotTrackFrameColorClick end object bMenuButtonActiveFrameColor: TSpeedButton - AnchorSideLeft.Control = pItemActiveFrame + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemActiveFrame + AnchorSideTop.Control = pMenuButtonActiveFrame AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 515 Height = 24 - Top = 50 + Top = 27 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -990,15 +1006,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonActiveFrameColorClick end object bMenuButtonActiveGradientFromColor: TSpeedButton - AnchorSideLeft.Control = pItemActiveFrame + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemActiveGradientFrom + AnchorSideTop.Control = pMenuButtonActiveGradientFrom AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 515 Height = 24 - Top = 81 + Top = 58 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1008,15 +1024,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonActiveGradientFromColorClick end object bMenuButtonActiveGradientToColor: TSpeedButton - AnchorSideLeft.Control = pItemActiveFrame + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemActiveGradientTo + AnchorSideTop.Control = pMenuButtonActiveGradientTo AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 515 Height = 24 - Top = 112 + Top = 89 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1026,15 +1042,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonActiveGradientToColorClick end object bMenuButtonActiveCaptionColor: TSpeedButton - AnchorSideLeft.Control = pItemActiveFrame + AnchorSideLeft.Control = pMenuButtonActiveFrame AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pItemActiveCaptionColor + AnchorSideTop.Control = pMenuButtonActiveCaptionColor AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 515 Height = 24 - Top = 172 + Top = 149 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1044,11 +1060,19 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bMenuButtonActiveCaptionColorClick end object Label32: TLabel - Left = 5 + AnchorSideLeft.Control = TabSheet6 + AnchorSideTop.Control = cbMenuButtonShapeStyle + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = TabSheet6 + AnchorSideRight.Side = asrBottom + Left = 6 Height = 15 - Top = 312 - Width = 534 + Top = 274 + Width = 569 Anchors = [akTop, akLeft, akRight] + BorderSpacing.Left = 6 + BorderSpacing.Top = 32 + BorderSpacing.Right = 6 Caption = 'Menu Button drawing use Tab Corner Radius and Tab Caption Height to ensure consistancy in design.' ParentColor = False WordWrap = True @@ -1057,33 +1081,34 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object TabSheet1: TTabSheet Caption = 'Tab' ClientHeight = 353 - ClientWidth = 544 + ClientWidth = 581 object sTabRectangle: TShape - AnchorSideLeft.Control = LblInactiveTabHeaderFontColor + AnchorSideLeft.Control = lblTabFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbLinkTab AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = TabHSpacer + AnchorSideRight.Control = bvHorSpacer AnchorSideRight.Side = asrBottom - AnchorSideBottom.Control = TabVSpacer + AnchorSideBottom.Control = bvVertSpacer AnchorSideBottom.Side = asrBottom - Left = 183 - Height = 133 - Top = 27 + Left = 179 + Height = 131 + Top = 29 Width = 141 Anchors = [akTop, akLeft, akRight, akBottom] - BorderSpacing.Left = 12 - BorderSpacing.Top = 4 + BorderSpacing.Left = 8 + BorderSpacing.Top = 6 Visible = False end - object Label2: TLabel + object lblTabFrame: TLabel + AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = pTabFrame AnchorSideTop.Side = asrCenter AnchorSideRight.Control = LblInactiveTabHeaderFontColor AnchorSideRight.Side = asrBottom Left = 138 Height = 15 - Top = 41 + Top = 42 Width = 33 Anchors = [akTop, akRight] Caption = 'Frame' @@ -1096,7 +1121,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 97 Height = 15 - Top = 72 + Top = 73 Width = 74 Anchors = [akTop, akRight] Caption = 'Gradient from' @@ -1109,7 +1134,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 112 Height = 15 - Top = 103 + Top = 104 Width = 59 Anchors = [akTop, akRight] Caption = 'Gradient to' @@ -1122,7 +1147,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 100 Height = 15 - Top = 133 + Top = 134 Width = 71 Anchors = [akTop, akRight] Caption = 'Gradient kind' @@ -1135,21 +1160,23 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 89 Height = 15 - Top = 235 + Top = 236 Width = 82 Anchors = [akTop, akRight] Caption = 'Tab header font' ParentColor = False end object pTabFrame: TPanel - AnchorSideLeft.Control = cbLinkTab + AnchorSideLeft.Control = lblTabFrame + AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbLinkTab AnchorSideTop.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 36 + Top = 37 Width = 100 - BorderSpacing.Top = 13 + BorderSpacing.Left = 16 + BorderSpacing.Top = 14 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' @@ -1162,9 +1189,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pTabFrame AnchorSideRight.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 67 + Top = 68 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1175,14 +1202,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pTabGradientFromClick end object pTabGradientTo: TPanel - AnchorSideLeft.Control = pTabGradientFrom + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = pTabGradientFrom AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pTabGradientFrom + AnchorSideRight.Control = pTabFrame AnchorSideRight.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 98 + Top = 99 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1193,14 +1220,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pTabGradientToClick end object cbTabGradientKind: TComboBox - AnchorSideLeft.Control = pTabGradientTo + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = pTabGradientTo AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pTabGradientTo AnchorSideRight.Side = asrBottom - Left = 191 + AnchorSideBottom.Side = asrBottom + Left = 187 Height = 23 - Top = 129 + Top = 130 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1218,15 +1246,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Text = 'None' end object pTabHeaderFont: TPanel - AnchorSideLeft.Control = pInactiveTabHeaderFont + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = pInactiveTabHeaderFont AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = bInactiveTabHeaderFontColor + AnchorSideRight.Control = pTabFrame AnchorSideRight.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 230 - Width = 127 + Top = 231 + Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 BevelInner = bvRaised @@ -1236,14 +1264,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pTabHeaderFontClick end object pActiveTabHeaderFont: TPanel - AnchorSideLeft.Control = cbTabGradientKind + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = cbTabGradientKind AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = cbTabGradientKind + AnchorSideRight.Control = pTabFrame AnchorSideRight.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 168 + Top = 169 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 16 @@ -1254,14 +1282,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pActiveTabHeaderFontClick end object cbLinkTab: TCheckBox - AnchorSideLeft.Control = LblInactiveTabHeaderFontColor - AnchorSideLeft.Side = asrBottom + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = TabSheet1 - Left = 191 + Left = 187 Height = 19 Top = 4 Width = 169 - BorderSpacing.Left = 20 BorderSpacing.Top = 4 Caption = 'Link with pane and idle item' OnClick = cbLinkTabClick @@ -1274,7 +1300,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 24 Height = 15 - Top = 173 + Top = 174 Width = 147 Anchors = [akTop, akRight] Caption = 'Active tab header font color' @@ -1286,21 +1312,21 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter Left = 16 Height = 15 - Top = 204 + Top = 205 Width = 155 BorderSpacing.Left = 16 Caption = 'Inactive tab header font color' ParentColor = False end object pInactiveTabHeaderFont: TPanel - AnchorSideLeft.Control = pActiveTabHeaderFont + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = pActiveTabHeaderFont AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pActiveTabHeaderFont + AnchorSideRight.Control = pTabFrame AnchorSideRight.Side = asrBottom - Left = 191 + Left = 187 Height = 25 - Top = 199 + Top = 200 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1319,9 +1345,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 293 + Left = 289 Height = 25 - Top = 36 + Top = 37 Width = 25 AllowAllUp = True Anchors = [akTop, akLeft, akBottom] @@ -1337,9 +1363,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 293 + Left = 289 Height = 25 - Top = 67 + Top = 68 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1354,9 +1380,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 293 + Left = 289 Height = 25 - Top = 98 + Top = 99 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1371,9 +1397,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 293 + Left = 289 Height = 25 - Top = 168 + Top = 169 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1388,9 +1414,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 293 + Left = 289 Height = 25 - Top = 199 + Top = 200 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1398,36 +1424,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow GroupIndex = 1 OnClick = bInactiveTabHeaderFontColorClick end - object TabVSpacer: TBevel - AnchorSideTop.Control = cbTabGradientKind - AnchorSideTop.Side = asrBottom - Left = 192 - Height = 8 - Top = 152 - Width = 50 - Shape = bsSpacer - end - object TabHSpacer: TBevel - AnchorSideLeft.Control = bTabFrameColor - AnchorSideLeft.Side = asrBottom - AnchorSideTop.Control = pTabFrame - AnchorSideBottom.Control = cbTabGradientKind - AnchorSideBottom.Side = asrBottom - Left = 318 - Height = 116 - Top = 36 - Width = 6 - Anchors = [akTop, akLeft, akBottom] - Shape = bsSpacer - end object edTabCornerRadius: TSpinEdit - AnchorSideLeft.Control = pTabHeaderFont + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = pTabHeaderFont AnchorSideTop.Side = asrBottom - Left = 191 + Left = 187 Height = 23 - Top = 261 - Width = 82 + Top = 262 + Width = 66 + Alignment = taRightJustify BorderSpacing.Top = 6 OnChange = edTabCornerRadiusChange TabOrder = 8 @@ -1439,7 +1444,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 81 Height = 15 - Top = 265 + Top = 266 Width = 90 Anchors = [akTop, akRight] Caption = 'Tab corner radius' @@ -1452,40 +1457,73 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 73 Height = 15 - Top = 294 + Top = 295 Width = 98 Anchors = [akTop, akRight] Caption = 'Tab caption height' ParentColor = False end object edTabCaptionHeight: TSpinEdit - AnchorSideLeft.Control = pTabHeaderFont + AnchorSideLeft.Control = pTabFrame AnchorSideTop.Control = lblTabCornerRadius AnchorSideTop.Side = asrBottom - Left = 191 + AnchorSideRight.Control = edTabCornerRadius + AnchorSideRight.Side = asrBottom + Left = 187 Height = 23 - Top = 290 - Width = 82 + Top = 291 + Width = 66 + Alignment = taRightJustify + Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 10 MaxValue = 999 MinValue = -1 OnChange = edTabCaptionHeightChange TabOrder = 9 end + object bvVertSpacer: TBevel + AnchorSideLeft.Control = sTabRectangle + AnchorSideTop.Control = cbTabGradientKind + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = sTabRectangle + AnchorSideRight.Side = asrBottom + Left = 181 + Height = 7 + Top = 153 + Width = 137 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Left = 2 + BorderSpacing.Right = 2 + Shape = bsSpacer + end + object bvHorSpacer: TBevel + AnchorSideLeft.Control = bTabFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = sTabRectangle + AnchorSideBottom.Control = sTabRectangle + AnchorSideBottom.Side = asrBottom + Left = 314 + Height = 124 + Top = 32 + Width = 6 + Anchors = [akTop, akLeft, akBottom] + BorderSpacing.Top = 3 + BorderSpacing.Bottom = 4 + Shape = bsSpacer + end end object TabSheet2: TTabSheet Caption = 'Pane' ClientHeight = 353 - ClientWidth = 544 + ClientWidth = 581 ImageIndex = 1 - object Label8: TLabel + object lblPaneBorderDark: TLabel AnchorSideTop.Control = pPaneBorderDark AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground - AnchorSideRight.Side = asrBottom - Left = 60 + AnchorSideRight.Control = pPaneBorderDark + Left = 64 Height = 15 - Top = 41 + Top = 42 Width = 61 Anchors = [akTop, akRight] Caption = 'Border dark' @@ -1494,11 +1532,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label21: TLabel AnchorSideTop.Control = pPaneBorderLight AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 59 + Left = 63 Height = 15 - Top = 72 + Top = 73 Width = 62 Anchors = [akTop, akRight] Caption = 'Border light' @@ -1507,11 +1545,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label9: TLabel AnchorSideTop.Control = pPaneGradientFrom AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 47 + Left = 51 Height = 15 - Top = 103 + Top = 104 Width = 74 Anchors = [akTop, akRight] Caption = 'Gradient from' @@ -1520,11 +1558,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label10: TLabel AnchorSideTop.Control = pPaneGradientTo AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 62 + Left = 66 Height = 15 - Top = 134 + Top = 135 Width = 59 Anchors = [akTop, akRight] Caption = 'Gradient to' @@ -1533,68 +1571,72 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label11: TLabel AnchorSideTop.Control = cbPaneGradientKind AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 50 + Left = 54 Height = 15 - Top = 164 + Top = 165 Width = 71 Anchors = [akTop, akRight] Caption = 'Gradient kind' ParentColor = False end - object LblPaneCaptionBackground: TLabel + object lblPaneCaptionBackground: TLabel AnchorSideLeft.Control = TabSheet2 AnchorSideTop.Control = pPaneCaptionBackground AnchorSideTop.Side = asrCenter - Left = 12 + AnchorSideRight.Control = lblPaneBorderDark + AnchorSideRight.Side = asrBottom + Left = 16 Height = 15 - Top = 204 + Top = 205 Width = 109 - BorderSpacing.Left = 12 + BorderSpacing.Left = 16 Caption = 'Caption background' ParentColor = False end object Label13: TLabel AnchorSideTop.Control = pPaneCaptionFont AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 27 + Left = 31 Height = 15 - Top = 295 + Top = 296 Width = 94 Anchors = [akTop, akRight] Caption = 'Pane caption font' ParentColor = False end object sPaneRectangle: TShape - AnchorSideLeft.Control = LblPaneCaptionBackground + AnchorSideLeft.Control = lblPaneBorderDark AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbLinkPane AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = PaneHSpacer + AnchorSideRight.Control = bvPaneHorSpacer AnchorSideRight.Side = asrBottom - AnchorSideBottom.Control = bPaneCaptionBackgroundColor + AnchorSideBottom.Control = bvPaneVertSpacer + AnchorSideBottom.Side = asrBottom Left = 133 Height = 164 Top = 27 Width = 143 Anchors = [akTop, akLeft, akRight, akBottom] - BorderSpacing.Left = 12 + BorderSpacing.Left = 8 BorderSpacing.Top = 4 - BorderSpacing.Bottom = 8 Visible = False end object pPaneBorderDark: TPanel - AnchorSideLeft.Control = cbLinkPane + AnchorSideLeft.Control = lblPaneCaptionBackground + AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbLinkPane AnchorSideTop.Side = asrBottom Left = 141 Height = 25 - Top = 36 + Top = 37 Width = 100 - BorderSpacing.Top = 13 + BorderSpacing.Left = 16 + BorderSpacing.Top = 14 BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' @@ -1609,7 +1651,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 67 + Top = 68 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1627,7 +1669,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 98 + Top = 99 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1645,7 +1687,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 129 + Top = 130 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1663,7 +1705,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 23 - Top = 160 + Top = 161 Width = 127 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1681,14 +1723,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Text = 'None' end object pPaneCaptionBackground: TPanel - AnchorSideLeft.Control = cbPaneGradientKind + AnchorSideLeft.Control = pPaneBorderDark AnchorSideTop.Control = cbPaneGradientKind AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pPaneGradientTo AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 199 + Top = 200 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 16 @@ -1706,7 +1748,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 290 + Top = 291 Width = 127 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1724,7 +1766,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 25 - Top = 259 + Top = 260 Width = 100 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1735,14 +1777,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pPaneCaptionFontColorClick end object cbLinkPane: TCheckBox - AnchorSideLeft.Control = LblPaneCaptionBackground - AnchorSideLeft.Side = asrBottom + AnchorSideLeft.Control = pPaneBorderDark AnchorSideTop.Control = TabSheet2 Left = 141 Height = 19 Top = 4 Width = 160 - BorderSpacing.Left = 20 BorderSpacing.Top = 4 Caption = 'Link with tab and idle item' OnClick = cbLinkPaneClick @@ -1756,7 +1796,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 23 - Top = 321 + Top = 322 Width = 127 Anchors = [akTop, akLeft, akRight] BorderSpacing.Top = 6 @@ -1779,11 +1819,11 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label12: TLabel AnchorSideTop.Control = cbPaneStyle AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 68 + Left = 72 Height = 15 - Top = 325 + Top = 326 Width = 53 Anchors = [akTop, akRight] Caption = 'Pane style' @@ -1798,7 +1838,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 36 + Top = 37 Width = 25 AllowAllUp = True Anchors = [akTop, akLeft, akBottom] @@ -1816,7 +1856,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 67 + Top = 68 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1833,7 +1873,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 98 + Top = 99 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1850,7 +1890,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 129 + Top = 130 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1859,14 +1899,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bPaneGradientToColorClick end object LblCaptionBackground1: TLabel - AnchorSideLeft.Control = TabSheet2 AnchorSideTop.Control = pPaneCaptionFontColor AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 49 + Left = 53 Height = 15 - Top = 264 + Top = 265 Width = 72 Anchors = [akTop, akRight] BorderSpacing.Left = 12 @@ -1882,7 +1921,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 199 + Top = 200 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1899,7 +1938,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Side = asrBottom Left = 243 Height = 25 - Top = 259 + Top = 260 Width = 25 AllowAllUp = True BorderSpacing.Left = 2 @@ -1919,14 +1958,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label15: TLabel AnchorSideTop.Control = edPaneHotTrackBrightnessChange AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblPaneCaptionBackground + AnchorSideRight.Control = lblPaneBorderDark AnchorSideRight.Side = asrBottom - Left = 16 + Left = 20 Height = 30 - Top = 226 + Top = 227 Width = 105 Alignment = taRightJustify - Anchors = [akTop, akLeft, akRight] + Anchors = [akTop, akRight] Caption = 'HotTrack brightness'#13#10'change' ParentColor = False end @@ -1938,7 +1977,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom Left = 141 Height = 23 - Top = 230 + Top = 231 Width = 100 Alignment = taRightJustify Anchors = [akTop, akLeft, akRight] @@ -1954,41 +1993,69 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter Left = 247 Height = 15 - Top = 234 + Top = 235 Width = 10 BorderSpacing.Left = 6 Caption = '%' ParentColor = False end + object bvPaneHorSpacer: TBevel + AnchorSideLeft.Control = bPaneBorderDarkColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = sTabRectangle + AnchorSideBottom.Control = sTabRectangle + AnchorSideBottom.Side = asrBottom + Left = 268 + Height = 124 + Top = 32 + Width = 8 + Anchors = [akTop, akLeft, akBottom] + BorderSpacing.Top = 3 + BorderSpacing.Bottom = 4 + Shape = bsSpacer + end + object bvPaneVertSpacer: TBevel + AnchorSideLeft.Control = sPaneRectangle + AnchorSideTop.Control = cbPaneGradientKind + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = sPaneRectangle + AnchorSideRight.Side = asrBottom + Left = 135 + Height = 7 + Top = 184 + Width = 139 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Left = 2 + BorderSpacing.Right = 2 + Shape = bsSpacer + end end object TabSheet3: TTabSheet Caption = 'Item' ClientHeight = 353 - ClientWidth = 544 + ClientWidth = 581 ImageIndex = 2 object sItemRectangle: TShape - AnchorSideLeft.Control = LblLinkInnerLightColor + AnchorSideLeft.Control = lblItemIdleFrame AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbLinkItem AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = ItemHSpacer AnchorSideRight.Side = asrBottom - AnchorSideBottom.Control = ItemVSpacer + AnchorSideBottom.Control = bvItemVertSpacer AnchorSideBottom.Side = asrBottom - Left = 112 + Left = 108 Height = 239 Top = 27 Width = 141 - Anchors = [akTop, akLeft, akRight, akBottom] - BorderSpacing.Left = 12 + Anchors = [akTop, akLeft, akBottom] + BorderSpacing.Left = 8 BorderSpacing.Top = 4 Visible = False end - object Label1: TLabel + object lblItemIdleFrame: TLabel AnchorSideTop.Control = pItemIdleFrame AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor - AnchorSideRight.Side = asrBottom + AnchorSideRight.Control = pItemIdleFrame Left = 67 Height = 15 Top = 55 @@ -2000,7 +2067,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label7: TLabel AnchorSideTop.Control = pItemIdleGradientFrom AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 26 Height = 15 @@ -2013,7 +2080,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label14: TLabel AnchorSideTop.Control = pItemIdleGradientTo AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 41 Height = 15 @@ -2026,7 +2093,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label25: TLabel AnchorSideTop.Control = cbItemIdleGradientKind AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 29 Height = 15 @@ -2039,7 +2106,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label26: TLabel AnchorSideTop.Control = pItemFont AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 51 Height = 15 @@ -2049,12 +2116,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Caption = 'Item font' ParentColor = False end - object LblIdle: TLabel + object lblItemIdle: TLabel AnchorSideLeft.Control = pItemIdleFrame AnchorSideLeft.Side = asrCenter AnchorSideTop.Control = cbLinkItem AnchorSideTop.Side = asrBottom - Left = 161 + Left = 157 Height = 15 Top = 31 Width = 19 @@ -2066,7 +2133,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label28: TLabel AnchorSideTop.Control = pItemIdleCaptionColor AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 28 Height = 15 @@ -2079,7 +2146,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label29: TLabel AnchorSideTop.Control = pItemIdleInnerDark AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 17 Height = 15 @@ -2089,10 +2156,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Caption = 'Inner dark color' ParentColor = False end - object LblLinkInnerLightColor: TLabel + object lblItemInnerLightColor: TLabel AnchorSideLeft.Control = TabSheet3 AnchorSideTop.Control = pItemIdleInnerLight AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblItemIdleFrame + AnchorSideRight.Side = asrBottom Left = 16 Height = 15 Top = 239 @@ -2104,10 +2173,10 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object LblHotTrack: TLabel AnchorSideLeft.Control = pItemHottrackFrame AnchorSideLeft.Side = asrCenter - AnchorSideTop.Control = LblIdle - AnchorSideBottom.Control = LblIdle + AnchorSideTop.Control = lblItemIdle + AnchorSideBottom.Control = lblItemIdle AnchorSideBottom.Side = asrBottom - Left = 290 + Left = 286 Height = 15 Top = 31 Width = 46 @@ -2122,7 +2191,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = LblHotTrack AnchorSideBottom.Control = LblHotTrack AnchorSideBottom.Side = asrBottom - Left = 440 + Left = 436 Height = 15 Top = 31 Width = 33 @@ -2132,12 +2201,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ParentColor = False end object pItemFont: TPanel - AnchorSideLeft.Control = pItemIdleInnerLight + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemIdleInnerLight AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleInnerLight + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 273 Width = 100 @@ -2151,12 +2220,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemFontClick end object cbItemIdleGradientKind: TComboBox - AnchorSideLeft.Control = pItemIdleGradientFrom + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemIdleGradientTo AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleGradientTo + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 23 Top = 143 Width = 100 @@ -2176,12 +2245,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Text = 'None' end object pItemIdleGradientTo: TPanel - AnchorSideLeft.Control = pItemIdleGradientFrom + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemIdleGradientFrom AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleGradientFrom + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 112 Width = 100 @@ -2199,7 +2268,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 81 Width = 100 @@ -2212,13 +2281,15 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemIdleGradientFromClick end object pItemIdleFrame: TPanel - AnchorSideLeft.Control = cbLinkItem - AnchorSideTop.Control = LblIdle + AnchorSideLeft.Control = lblItemInnerLightColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = lblItemIdle AnchorSideTop.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 50 Width = 100 + BorderSpacing.Left = 16 BorderSpacing.Top = 4 BevelInner = bvRaised BevelOuter = bvLowered @@ -2227,12 +2298,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemIdleFrameClick end object pItemIdleCaptionColor: TPanel - AnchorSideLeft.Control = cbItemIdleGradientKind + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = cbItemIdleGradientKind AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleGradientTo + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 172 Width = 100 @@ -2245,12 +2316,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemIdleCaptionColorClick end object pItemIdleInnerDark: TPanel - AnchorSideLeft.Control = pItemIdleCaptionColor + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemIdleCaptionColor AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleCaptionColor + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 203 Width = 100 @@ -2263,12 +2334,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemIdleInnerDarkClick end object pItemIdleInnerLight: TPanel - AnchorSideLeft.Control = pItemIdleInnerDark + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemIdleInnerDark AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleInnerDark + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 25 Top = 234 Width = 100 @@ -2286,7 +2357,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pItemHottrackGradientTo AnchorSideRight.Side = asrBottom - Left = 263 + Left = 259 Height = 23 Top = 143 Width = 100 @@ -2313,7 +2384,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemIdleGradientTo AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 112 Width = 100 @@ -2333,7 +2404,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemIdleGradientFrom AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 81 Width = 100 @@ -2351,7 +2422,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = pItemIdleFrame AnchorSideBottom.Control = pItemIdleFrame AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 50 Width = 100 @@ -2371,7 +2442,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemIdleCaptionColor AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 172 Width = 100 @@ -2391,7 +2462,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemIdleInnerDark AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 203 Width = 100 @@ -2411,7 +2482,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemIdleInnerLight AnchorSideBottom.Side = asrBottom - Left = 263 + Left = 259 Height = 25 Top = 234 Width = 100 @@ -2429,7 +2500,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrBottom AnchorSideRight.Control = pItemActiveGradientTo AnchorSideRight.Side = asrBottom - Left = 406 + Left = 402 Height = 23 Top = 143 Width = 100 @@ -2456,7 +2527,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemHottrackGradientTo AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 112 Width = 100 @@ -2476,7 +2547,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemHottrackGradientFrom AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 81 Width = 100 @@ -2494,7 +2565,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = pItemHottrackFrame AnchorSideBottom.Control = pItemHottrackFrame AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 50 Width = 100 @@ -2514,7 +2585,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemHottrackCaptionColor AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 172 Width = 100 @@ -2534,7 +2605,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemHottrackInnerDark AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 203 Width = 100 @@ -2554,7 +2625,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = pItemHottrackInnerLight AnchorSideBottom.Side = asrBottom - Left = 406 + Left = 402 Height = 25 Top = 234 Width = 100 @@ -2567,7 +2638,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = pItemActiveInnerLightClick end object cbLinkItem: TCheckBox - AnchorSideLeft.Control = LblLinkInnerLightColor + AnchorSideLeft.Control = lblItemInnerLightColor AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = TabSheet3 Left = 120 @@ -2587,7 +2658,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 50 Width = 25 @@ -2604,7 +2675,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 50 Width = 25 @@ -2621,7 +2692,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 50 Width = 25 @@ -2639,7 +2710,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 81 Width = 25 @@ -2656,7 +2727,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 81 Width = 25 @@ -2673,7 +2744,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 81 Width = 25 @@ -2691,7 +2762,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 112 Width = 25 @@ -2708,7 +2779,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 112 Width = 25 @@ -2725,7 +2796,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 112 Width = 25 @@ -2743,7 +2814,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 172 Width = 25 @@ -2760,7 +2831,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 203 Width = 25 @@ -2777,7 +2848,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 222 + Left = 218 Height = 24 Top = 234 Width = 25 @@ -2794,7 +2865,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 172 Width = 25 @@ -2811,7 +2882,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 172 Width = 25 @@ -2829,7 +2900,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 203 Width = 25 @@ -2846,7 +2917,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 203 Width = 25 @@ -2864,7 +2935,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 365 + Left = 361 Height = 24 Top = 234 Width = 25 @@ -2881,7 +2952,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideBottom.Control = pTabFrame AnchorSideBottom.Side = asrBottom - Left = 508 + Left = 504 Height = 24 Top = 234 Width = 25 @@ -2893,12 +2964,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnClick = bItemActiveInnerLightColorClick end object cbItemStyle: TComboBox - AnchorSideLeft.Control = pItemIdleGradientFrom + AnchorSideLeft.Control = pItemIdleFrame AnchorSideTop.Control = pItemFont AnchorSideTop.Side = asrBottom - AnchorSideRight.Control = pItemIdleGradientTo + AnchorSideRight.Control = pItemIdleFrame AnchorSideRight.Side = asrBottom - Left = 120 + Left = 116 Height = 23 Top = 304 Width = 100 @@ -2918,7 +2989,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label27: TLabel AnchorSideTop.Control = cbItemStyle AnchorSideTop.Side = asrCenter - AnchorSideRight.Control = LblLinkInnerLightColor + AnchorSideRight.Control = lblItemIdleFrame AnchorSideRight.Side = asrBottom Left = 75 Height = 15 @@ -2928,7 +2999,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Caption = 'Style' ParentColor = False end - object ItemVSpacer: TBevel + object bvItemVertSpacer: TBevel AnchorSideTop.Control = bItemIdleInnerLightColor AnchorSideTop.Side = asrBottom Left = 192 @@ -2937,13 +3008,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Width = 50 Shape = bsSpacer end - object ItemHSpacer: TBevel + object bvItemHorSpacer: TBevel AnchorSideLeft.Control = bItemIdleFrameColor AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = pItemIdleFrame AnchorSideBottom.Control = pItemIdleInnerLight AnchorSideBottom.Side = asrBottom - Left = 247 + Left = 243 Height = 209 Top = 50 Width = 6 @@ -2953,7 +3024,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object Label19: TLabel AnchorSideLeft.Control = edItemHotTrackBrightnessChange AnchorSideBottom.Control = edItemHotTrackBrightnessChange - Left = 263 + Left = 259 Height = 15 Top = 285 Width = 97 @@ -2969,7 +3040,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = pItemHottrackInnerLight AnchorSideRight.Side = asrBottom - Left = 263 + Left = 259 Height = 23 Top = 304 Width = 100 @@ -2984,7 +3055,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = edItemHotTrackBrightnessChange AnchorSideTop.Side = asrCenter - Left = 367 + Left = 363 Height = 15 Top = 308 Width = 10 @@ -2994,9 +3065,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end end object TabSheet4: TTabSheet - Caption = 'Import / export' + Caption = 'Import / Export' ClientHeight = 353 - ClientWidth = 544 + ClientWidth = 581 ImageIndex = 3 object bImport: TButton AnchorSideLeft.Control = bExportToXML @@ -3039,7 +3110,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 4 Height = 316 Top = 33 - Width = 536 + Width = 573 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 4 BorderSpacing.Top = 4 @@ -3070,7 +3141,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = TabSheet4 AnchorSideRight.Control = TabSheet4 AnchorSideRight.Side = asrBottom - Left = 486 + Left = 523 Height = 25 Top = 4 Width = 54 @@ -3125,7 +3196,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 8 Height = 33 Top = 518 - Width = 535 + Width = 572 Align = alBottom AutoSize = True BorderSpacing.Left = 8 @@ -3134,14 +3205,14 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BorderSpacing.Bottom = 4 BevelOuter = bvNone ClientHeight = 33 - ClientWidth = 535 + ClientWidth = 572 TabOrder = 2 object bOK: TButton AnchorSideTop.Control = bCancel AnchorSideRight.Control = bCancel AnchorSideBottom.Control = bCancel AnchorSideBottom.Side = asrBottom - Left = 425 + Left = 462 Height = 25 Top = 4 Width = 42 @@ -3157,7 +3228,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = ButtonPanel AnchorSideRight.Side = asrBottom - Left = 473 + Left = 510 Height = 25 Top = 4 Width = 62 diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas index cf34686d6..46406a5da 100644 --- a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas +++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas @@ -15,6 +15,9 @@ type { TfrmAppearanceEditWindow } TfrmAppearanceEditWindow = class(TForm) + bvHorSpacer: TBevel; + bvPaneHorSpacer: TBevel; + bvVertSpacer: TBevel; bMenuButtonActiveCaptionColor: TSpeedButton; bMenuButtonActiveFrameColor: TSpeedButton; bMenuButtonActiveGradientFromColor: TSpeedButton; @@ -27,6 +30,7 @@ type bMenuButtonIdleFrameColor: TSpeedButton; bMenuButtonIdleGradientFromColor: TSpeedButton; bMenuButtonIdleGradientToColor: TSpeedButton; + bvPaneVertSpacer: TBevel; cbMenuButtonActiveGradientKind: TComboBox; cbMenuButtonHottrackGradientKind: TComboBox; cbMenuButtonIdleGradientKind: TComboBox; @@ -40,12 +44,12 @@ type Label30: TLabel; Label31: TLabel; Label32: TLabel; - Label33: TLabel; + lblMenuButtonFont: TLabel; Label34: TLabel; - Label6: TLabel; - LblActive1: TLabel; - LblHotTrack1: TLabel; - LblIdle1: TLabel; + lMenuButtonIdleFrame: TLabel; + lblMenuButtonActive: TLabel; + lblMenuButtonHotTrack: TLabel; + lblMenuButtonIdle: TLabel; lblTabCornerRadius: TLabel; lblTabCaptionHeight: TLabel; @@ -71,12 +75,11 @@ type Label19: TLabel; Label20: TLabel; PaneHSpacer: TBevel; - ItemHSpacer: TBevel; + bvItemHorSpacer: TBevel; edPaneHotTrackBrightnessChange: TSpinEdit; edItemHotTrackBrightnessChange: TSpinEdit; edTabCornerRadius: TSpinEdit; TabSheet6: TTabSheet; - TabVSpacer: TBevel; bInactiveTabHeaderFontColor: TSpeedButton; bItemActiveInnerDarkColor: TSpeedButton; bItemActiveGradientFromColor: TSpeedButton; @@ -110,7 +113,7 @@ type cbItemStyle: TComboBox; cbPaneStyle: TComboBox; ColorView: TShape; - ItemVSpacer: TBevel; + bvItemVertSpacer: TBevel; gbPreview: TGroupBox; Label12: TLabel; Label27: TLabel; @@ -124,7 +127,6 @@ type ButtonPanel: TPanel; bTabFrameColor: TSpeedButton; SpkTab2: TSpkTab; - TabHSpacer: TBevel; tbPreview: TSpkToolbar; SpkTab1: TSpkTab; SpkPane1: TSpkPane; @@ -141,11 +143,11 @@ type SpkSmallButton6: TSpkSmallButton; SpkSmallButton7: TSpkSmallButton; SpkSmallButton8: TSpkSmallButton; - PageControl1: TPageControl; + PageControl: TPageControl; TabSheet1: TTabSheet; TabSheet2: TTabSheet; TabSheet3: TTabSheet; - Label2: TLabel; + lblTabFrame: TLabel; pTabFrame: TPanel; pTabGradientFrom: TPanel; Label3: TLabel; @@ -155,7 +157,7 @@ type Label5: TLabel; lblTabHeaderFont: TLabel; pTabHeaderFont: TPanel; - Label8: TLabel; + lblPaneBorderDark: TLabel; pPaneBorderDark: TPanel; pPaneBorderLight: TPanel; Label21: TLabel; @@ -166,10 +168,10 @@ type Label11: TLabel; cbPaneGradientKind: TComboBox; pPaneCaptionBackground: TPanel; - LblPaneCaptionBackground: TLabel; + lblPaneCaptionBackground: TLabel; Label13: TLabel; pPaneCaptionFont: TPanel; - Label1: TLabel; + lblItemIdleFrame: TLabel; Label7: TLabel; Label14: TLabel; Label25: TLabel; @@ -179,12 +181,12 @@ type pItemIdleGradientTo: TPanel; pItemIdleGradientFrom: TPanel; pItemIdleFrame: TPanel; - LblIdle: TLabel; + lblItemIdle: TLabel; Label28: TLabel; pItemIdleCaptionColor: TPanel; Label29: TLabel; pItemIdleInnerDark: TPanel; - LblLinkInnerLightColor: TLabel; + lblItemInnerLightColor: TLabel; pItemIdleInnerLight: TPanel; cbItemHottrackGradientKind: TComboBox; pItemHottrackGradientTo: TPanel; @@ -390,6 +392,7 @@ type {%H-}Shift: TShiftState; {%H-}X, {%H-}Y: integer); private + FAutoSized: Boolean; procedure UpdateImages; procedure UpdateSizes; @@ -411,7 +414,7 @@ implementation {$R *.lfm} uses - Types, clipbrd, spkt_Const; + Types, clipbrd; var CurrPageIndex: Integer = 0; @@ -955,12 +958,12 @@ end; procedure TfrmAppearanceEditWindow.FormCloseQuery(Sender: TObject; var CanClose: boolean); begin - if CanClose then CurrPageIndex := PageControl1.PageIndex; + if CanClose then CurrPageIndex := PageControl.PageIndex; end; procedure TfrmAppearanceEditWindow.FormCreate(Sender: TObject); begin - PageControl1.PageIndex := CurrPageIndex; + PageControl.PageIndex := CurrPageIndex; end; procedure TfrmAppearanceEditWindow.FormShow(Sender: TObject); @@ -1561,91 +1564,39 @@ procedure TfrmAppearanceEditWindow.UpdateSizes; var w, h: Integer; - procedure AddToHeight(var AHeight: Integer; AControl: TControl); + function Max(a, b: Integer): Integer; begin - inc(AHeight, AControl.Height); - with AControl.BorderSpacing do - inc(AHeight, Top + Bottom + Around); + if a > b then Result := a else Result := b; end; begin + if FAutoSized then + exit; + // Update layout of controls bOK.AutoSize := false; bOK.Width := bCancel.Width; ColorView.Width := ColorView.Height; - h := CbTabGradientKind.Height; - {$IF lcl_fullversion < 1080000} - w := SpkScaleX(pTabFrame.Width, 96); - {$ELSE} - w := pTabFrame.Width; - {$ENDIF} -// h := SpkScaleY(pTabFrame.Height, 96); + h := cbPaneStyle.Top + cbPanestyle.Height + cbPaneStyle.BorderSpacing.Bottom; + PageControl.Constraints.MinHeight := PageControl.Height - PageControl.Clientheight + h; - pTabFrame.Width := w; - pTabFrame.Height := h; - pTabGradientFrom.Height := h; - pTabGradientTo.Height := h; - pActiveTabHeaderFont.Height := h; - pInactiveTabHeaderFont.Height := h; - pTabHeaderFont.Height := h; + w := bMenuButtonActiveFramecolor.Left + bMenuButtonActiveFrameColor.Width; + PageControl.Constraints.MinWidth := PageControl.Width - PageControl.ClientWidth + w; - pPaneBorderDark.Width := w; - pPaneBorderDark.Height := h; - pPaneBorderLight.Height := h; - pPaneGradientFrom.Height := h; - pPaneGradientTo.Height := h; - pPaneCaptionBackground.Height := h; - pPaneCaptionFontColor.Height := h; - pPaneCaptionFont.Height := h; + Constraints.MinHeight := PageControl.Constraints.MinHeight + gbPreview.Height + + ButtonPanel.Height + ButtonPanel.BorderSpacing.Top * 2; + Constraints.MinWidth := Max( + tbPreview.Tabs[0].Panes[2].Rect.Right + 2, + PageControl.Constraints.MinWidth + ); - pItemIdleFrame.Width := w; - pItemHotTrackFrame.Width := w; - pItemActiveFrame.Width := w; - pItemIdleFrame.Height := h; - pItemIdleGradientFrom.Height := h; - pItemIdleGradientTo.Height := h; - pItemIdleCaptionColor.Height := h; - pItemIdleInnerDark.Height := h; - pItemIdleInnerLight.Height := h; - pItemFont.Height := h; - pMenuButtonIdleFrame.Width := w; - pMenuButtonHotTrackFrame.Width := w; - pMenuButtonActiveFrame.Width := w; - pMenuButtonIdleFrame.Height := h; - pMenuButtonIdleGradientFrom.Height := h; - pMenuButtonIdleGradientTo.Height := h; - pMenuButtonIdleCaptionColor.Height := h; - pMenuButtonFont.Height := h; + AutoSize := false; + FAutoSized := true; - // TabSheet2 requires the largest height - h := Height - TabSheet2.ClientHeight; // This is the height outside the tabsheet - // Add the heights of all controls - AddToHeight(h, cbLinkPane); - AddToHeight(h, pPaneBorderDark); - AddToHeight(h, pPaneBorderLight); - AddToHeight(h, pPaneGradientFrom); - AddToHeight(h, pPaneGradientTo); - AddToHeight(h, cbPaneGradientKind); - AddToHeight(h, pPaneCaptionBackground); - AddToHeight(h, edPaneHotTrackBrightnessChange); - AddToHeight(h, pPaneCaptionFontColor); - AddToHeight(h, pPaneCaptionFont); - AddToHeight(h, cbPaneStyle); - - // Adjust width and height - {$IF lcl_fullversion < 1080000} - Width := SpkScaleX(Width, 96); - Height := SpkScaleY(Height, 96); -// Height := h; - {$ENDIF} -(* - Constraints.MinHeight := h; - Height := 0; *) - - Position := poScreenCenter; + Position := poDesigned; end; procedure TfrmAppearanceEditWindow.bMenuButtonIdleFrameColorClick(Sender: TObject);