From 318afbd40f3ebdded8d9230cc049a25b3516fb38 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Thu, 23 Feb 2023 19:14:35 +0000 Subject: [PATCH] spktoolbar: Support the SpkPopupMenu in the AppearanceEditor. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8738 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../spktoolbar/SpkPopupMenu/spkpopup.pas | 15 +- .../spktoolbar/SpkToolbar/spkt_Appearance.pas | 89 +- .../designtime/spkte_AppearanceEditor.lfm | 1037 ++++++++++++++++- .../designtime/spkte_AppearanceEditor.pas | 454 +++++++- 4 files changed, 1490 insertions(+), 105 deletions(-) diff --git a/components/spktoolbar/SpkPopupMenu/spkpopup.pas b/components/spktoolbar/SpkPopupMenu/spkpopup.pas index a0216b13f..969acb9d9 100644 --- a/components/spktoolbar/SpkPopupMenu/spkpopup.pas +++ b/components/spktoolbar/SpkPopupMenu/spkpopup.pas @@ -115,6 +115,8 @@ begin TGUITools.DrawVLine(ACanvas, R.Right-1, R.Top, R.Bottom-1, FrameColor); end; + // Gutter + iconSize := GetIconSize; wGutter := iconSize.CX + 2*DropdownMenuMargin; {$IFDEF EnhancedRecordSupport} @@ -130,7 +132,7 @@ begin if not IsHot and (FAppearance.Popup.Style = psGutter) then begin - FrameColor := FAppearance.Popup.GutterLineColor; + FrameColor := FAppearance.Popup.GutterFrameColor; ColorFrom := FAppearance.Popup.GutterGradientFromColor; ColorTo := FAppearance.Popup.GutterGradientToColor; GradientType := FAppearance.Popup.GutterGradientType; @@ -226,10 +228,11 @@ begin if menuItem.IsLine then begin + // Menu dividing lines if FAppearance.Popup.Style <> psGutter then x := DropDownMenuMargin; y := (ARect.Top + ARect.Bottom) div 2; - FrameColor := FAppearance.Popup.GutterFrameColor; + FrameColor := FAppearance.Popup.DividerLineColor; if FrameColor <> clNone then TGUITools.DrawHLine(ACanvas, x, ARect.Right-DropdownMenuMargin, y, FrameColor); end else @@ -237,15 +240,17 @@ begin y := (ARect.Top + ARect.Bottom - hText) div 2; if menuItem.ShortCut <> scNone then begin + // Shortcut text shortCutText := ShortCutToText(menuItem.ShortCut); if menuItem.ShortCutKey2 <> scNone then shortCutText := ShortCutText + ', ' + ShortCutToText(menuItem.ShortCutKey2); - wText := ACanvas.TextWidth(shortCutText); - TGUITools.DrawText(ACanvas, ARect.Right - wText - DropdownMenuMargin, y, shortcutText, TextColor); + wText := ACanvas.TextWidth(shortCutText) + DropdownMenuMargin; + TGUITools.DrawText(ACanvas, ARect.Right - wText, y, shortcutText, TextColor); end else wText := 0; - R.Right := ARect.Right - wText; // ClipRect + // Caption + R.Right := ARect.Right - wText; // ClipRect to avoid painting into shortcut text TGUITools.DrawText(ACanvas, x, y, menuItem.Caption, TextColor, R, true); end; end; diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas index 01f9fe354..00c55ce8c 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas @@ -347,11 +347,11 @@ type FCheckedGradientToColor: TColor; FCheckedGradientType: TBackgroundKind; FDisabledCaptionColor: TColor; + FDividerLineColor: TColor; FGutterFrameColor: TColor; FGutterGradientFromColor: TColor; FGutterGradientToColor: TColor; FGutterGradientType: TBackgroundKind; - FGutterLineColor: TColor; FHotTrackCaptionColor: TColor; FHotTrackFrameColor: TColor; FHotTrackGradientFromColor: TColor; @@ -368,11 +368,11 @@ type procedure SetCheckedGradientToColor(const Value: TColor); procedure SetCheckedGradientType(const Value: TBackgroundKind); procedure SetDisabledCaptionColor(const Value: TColor); + procedure SetDividerLineColor(const Value: TColor); procedure SetGutterFrameColor(const Value: TColor); procedure SetGutterGradientFromColor(const Value: TColor); procedure SetGutterGradientToColor(const Value: TColor); procedure SetGutterGradientType(const Value: TBackgroundKind); - procedure SetGutterLineColor(const Value: TColor); procedure SetHotTrackCaptionColor(const Value: TColor); procedure SetHotTrackFrameColor(const Value: TColor); procedure SetHotTrackGradientFromColor(const Value: TColor); @@ -400,11 +400,11 @@ type property CheckedGradientToColor: TColor read FCheckedGradientToColor write SetCheckedGradientToColor; property CheckedGradientType: TBackgroundKind read FCheckedGradientType write SetCheckedGradientType; property DisabledCaptionColor: TColor read FDisabledCaptionColor write SetDisabledCaptionColor; + property DividerLineColor: TColor read FDividerLineColor write SetDividerLineColor; property GutterFrameColor: TColor read FGutterFrameColor write SetGutterFrameColor; property GutterGradientFromColor: TColor read FGutterGradientFromColor write SetGutterGradientFromColor; property GutterGradientToColor: TColor read FGutterGradientToColor write SetGutterGradientToColor; property GutterGradientType: TBackgroundKind read FGutterGradientType write SetGutterGradientType; - property GutterLineColor: TColor read FGutterLineColor write SetGutterLineColor; property HotTrackCaptionColor: TColor read FHotTrackCaptionColor write SetHotTrackCaptionColor; property HotTrackFrameColor: TColor read FHotTrackFrameColor write SetHotTrackFrameColor; property HotTrackGradientFromColor: TColor read FHotTrackGradientFromColor write SetHotTrackGradientFromColor; @@ -1780,33 +1780,24 @@ begin FCheckedGradientType := SrcAppearance.CheckedGradientType; FDisabledCaptionColor := SrcAppearance.DisabledCaptionColor; + FDividerLineColor := SrcAppearance.DividerLineColor; + + FIdleCaptionColor := SrcAppearance.IdleCaptionColor; + FIdleGradientFromColor := SrcAppearance.IdleGradientFromColor; + FIdleGradientToColor := SrcAppearance.IdleGradientToColor; + FIdleGradientType := SrcAppearance.IdleGradientType; FGutterFrameColor := SrcAppearance.GutterFrameColor; FGutterGradientFromColor := SrcAppearance.GutterGradientFromColor; FGutterGradientToColor := SrcAppearance.GutterGradientToColor; FGutterGradientType := SrcAppearance.GutterGradientType; - { - FIdleFrameColor := SrcAppearance.IdleFrameColor; - } - FIdleCaptionColor := SrcAppearance.IdleCaptionColor; - FIdleGradientFromColor := SrcAppearance.IdleGradientFromColor; - FIdleGradientToColor := SrcAppearance.IdleGradientToColor; - FIdleGradientType := SrcAppearance.IdleGradientType; - { - FIdleInnerLightColor := SrcAppearance.IdleInnerLightColor; - FIdleInnerDarkColor := SrcAppearance.IdleInnerDarkColor; - } FHotTrackCaptionColor := SrcAppearance.HotTrackCaptionColor; FHotTrackFrameColor := SrcAppearance.HotTrackFrameColor; FHotTrackGradientFromColor := SrcAppearance.HotTrackGradientFromColor; FHotTrackGradientToColor := SrcAppearance.HotTrackGradientToColor; FHotTrackGradientType := SrcAppearance.HotTrackGradientType; - { - FHotTrackInnerLightColor := SrcAppearance.HotTrackInnerLightColor; - FHotTrackInnerDarkColor := SrcAppearance.HotTrackInnerDarkColor; - FHotTrackBrightnessChange := SrcAppearance.HotTrackBrightnessChange; - } + FStyle := SrcAppearance.Style; if FDispatch <> nil then FDispatch.NotifyAppearanceChanged; @@ -1853,6 +1844,11 @@ begin if Assigned(SubNode) then FDisabledCaptionColor := Subnode.TextAsColor; + // Divider line + Subnode := Node['DividerLineColor', false]; + if Assigned(Subnode) then + FDividerLineColor := Subnode.TextAsColor; + // Idle Subnode := Node['IdleCaptionColor', false]; if Assigned(Subnode) then @@ -1901,10 +1897,6 @@ begin if Assigned(Subnode) then FGutterGradientType := TBackgroundKind(Subnode.TextAsInteger); - Subnode := Node['GutterLineColor', false]; - if Assigned(Subnode) then - FGutterLineColor := Subnode.TextAsColor; - // HotTrack Subnode := Node['HottrackCaptionColor', false]; @@ -1958,14 +1950,14 @@ begin FCheckedGradientFromColor := rgb(255, 227, 149); FCheckedGradientToColor := FCheckedGradientFromColor; FCheckedGradientType := bkSolid; + FDividerLineColor := rgb(141, 178, 227); { FIdleFrameColor := rgb(155, 183, 224); } - FGutterFrameColor := rgb(141, 178, 227); + FGutterFrameColor := rgb(197, 197, 197); FGutterGradientFromColor := rgb(233, 238, 238); FGutterGradientToColor := rgb(233, 238, 238); FGutterGradientType := bkSolid; - FGutterLineColor := rgb(197, 197, 197); { FIdleInnerLightColor := rgb(213, 227, 241); FIdleInnerDarkColor := rgb(190, 211, 236); @@ -2004,16 +1996,16 @@ begin FCheckedGradientFromColor := rgb(255, 227, 149); end; FCheckedGradientToColor := FCheckedGradientFromColor; + FDividerLineColor := $00BEBEBE; FIdleCaptionColor := $0060655F; FIdleGradientFromColor := rgb(250, 250, 250); FIdleGradientToColor := rgb(250, 250, 250); FIdleGradientType := bkSolid; - FGutterFrameColor := $00BEBEBE; + FGutterFrameColor := rgb(197, 197, 197); FGutterGradientFromColor := rgb(239, 239, 239); FGutterGradientToColor := rgb(239, 239, 239); FGutterGradientType := bkSolid; - FGutterLineColor := rgb(197, 197, 197); { FIdleInnerDarkColor := $00C7C0BA; FIdleInnerLightColor := $00F6F2F0; @@ -2049,12 +2041,13 @@ begin FCheckedGradientFromColor := $00F7EFE8; FCheckedGradientToColor := FCheckedGradientFromColor; FCheckedGradientType := bkSolid; + FDisabledCaptionColor := rgb(192, 192, 192); - FGutterFrameColor := $00D2D0CF; + FDividerLineColor := $00D2D0CF; + FGutterFrameColor := rgb(197, 197, 197); FGutterGradientFromColor := rgb(239, 239, 239); FGutterGradientToColor := rgb(239, 239, 239); FGutterGradientType := bkSolid; - FGutterLineColor := rgb(197, 197, 197); FHotTrackCaptionColor := $003F3F3F; FHotTrackFrameColor := $00F9CEA4; FHotTrackGradientFromColor := $00F7EFE8; @@ -2092,11 +2085,11 @@ begin FCheckedGradientToColor := FCheckedGradientFromColor; FCheckedGradientType := bkSolid; FDisabledCaptionColor := $787878; - FGutterFrameColor := $000000; + FDividerLineColor := $000000; + FGutterFrameColor := rgb(32, 32, 32); FGutterGradientFromColor := clBlack; FGutterGradientToColor := clBlack; FGutterGradientType := bkSolid; - FGutterLineColor := rgb(32, 32, 32); FHotTrackCaptionColor := $00F2F2F2; FHotTrackFrameColor := $00C4793C; FHotTrackGradientFromColor := $00805B3D; @@ -2135,12 +2128,12 @@ begin Add(' CheckedGradientType := %s;', [GradientTypeName(FCheckedGradientType)]); Add(' DisabledCaptionColor := $%.8x;', [FDisabledCaptionColor]); + Add(' DividerLineColor := $%.8x;', [FDividerLineColor]); Add(' GutterFrameColor := $%.8x;', [FGutterFrameColor]); Add(' GutterGradientFromColor := $%.8x;', [FGutterGradientFromColor]); Add(' GutterGradientToColor := $%.8x;', [FGutterGradientToColor]); Add(' GutterGradientType := %s;', [GradientTypeName(FGutterGradientType)]); - Add(' GutterLineColor := $%.8x;', [FGutterLineColor]); Add(' IdleCaptionColor := $%.8x;', [FIdleCaptionColor]); Add(' IdleGradientFromColor := $%.8x;', [FIdleGradientFromColor]); @@ -2181,6 +2174,9 @@ begin Subnode := Node['DisabledCaptionColor', true]; Subnode.TextAsColor := FDisabledCaptionColor; + Subnode := Node['DividerLineColor', true]; + Subnode.TextAsColor := FDividerlineColor; + Subnode := Node['IdleGradientType', true]; Subnode.TextAsInteger := integer(FIdleGradientType); @@ -2188,6 +2184,9 @@ begin Subnode := Node['IdleCaptionColor', true]; Subnode.TextAsColor := FIdleCaptionColor; +// Subnode := Node['IdleFrameColor', true]; +// Subnode.TextAsColor := FIdleFrameColor; + Subnode := Node['IdleGradientFromColor', true]; Subnode.TextAsColor := FIdleGradientFromColor; @@ -2196,6 +2195,13 @@ begin Subnode := Node['IdleGradientType', true]; Subnode.TextAsInteger := integer(FIdleGradientType); +{ + Subnode := Node['IdleInnerLightColor', true]; + Subnode.TextAsColor := FIdleInnerLightColor; + + Subnode := Node['IdleInnerDarkColor', true]; + Subnode.TextAsColor := FIdleInnerDarkColor; +} // Gutter Subnode := Node['GutterFrameColor', true]; @@ -2210,9 +2216,6 @@ begin Subnode := Node['GutterGradientType', true]; Subnode.TextAsInteger := integer(FGutterGradientType); - Subnode := Node['GutterLineColor', true]; - Subnode.TextAsColor := FGutterLineColor; - // HotTrack Subnode := Node['HottrackCaptionColor', true]; @@ -2287,9 +2290,9 @@ begin FDispatch.NotifyAppearanceChanged; end; -procedure TSpkPopupMenuAppearance.SetGutterFrameColor(const Value: TColor); +procedure TSpkPopupMenuAppearance.SetDividerLineColor(const Value: TColor); begin - FGutterFrameColor := Value; + FDividerLineColor := Value; if FDispatch <> nil then FDispatch.NotifyAppearanceChanged; end; @@ -2315,9 +2318,9 @@ begin FDispatch.NotifyAppearanceChanged; end; -procedure TSpkPopupMenuAppearance.SetGutterLineColor(const Value: TColor); +procedure TSpkPopupMenuAppearance.SetGutterFrameColor(const Value: TColor); begin - FGutterLineColor := Value; + FGutterFrameColor := Value; if FDispatch <> nil then FDispatch.NotifyAppearanceChanged; end; @@ -2482,6 +2485,10 @@ begin Subnode := Node['Element', false]; if Assigned(Subnode) then Element.LoadFromXML(Subnode); + + Subnode := Node['Popup', false]; + if Assigned(Subnode) then + Popup.LoadFromXML(Subnode); end; procedure TSpkToolbarAppearance.NotifyAppearanceChanged; @@ -2508,6 +2515,7 @@ begin FMenuButton.SaveToPascal(AList); FPane.SaveToPascal(AList); FElement.SaveToPascal(AList); + FPopup.SaveToPascal(AList); AList.Add('end;'); end; @@ -2526,6 +2534,9 @@ begin Subnode := Node['Element',true]; FElement.SaveToXML(Subnode); + + Subnode := Node['Popup', true]; + FPopup.SaveToXML(Subnode); end; procedure TSpkToolbarAppearance.SetElementAppearance( diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm index 40165ced6..c5ff51349 100644 --- a/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm +++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.lfm @@ -1,12 +1,12 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow - Left = 922 - Height = 555 + Left = 933 + Height = 546 Top = 211 - Width = 589 + Width = 723 AutoSize = True Caption = 'Toolbar appearance editor' - ClientHeight = 555 - ClientWidth = 589 + ClientHeight = 546 + ClientWidth = 723 Color = clBtnFace Font.Color = clWindowText OnActivate = FormActivate @@ -15,23 +15,24 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow OnShow = FormShow Position = poWorkAreaCenter ShowHint = True - LCLVersion = '2.1.0.0' + LCLVersion = '2.3.0.0' object gbPreview: TGroupBox Left = 0 Height = 133 Top = 0 - Width = 589 + Width = 723 Align = alTop AutoSize = True Caption = ' Preview ' ClientHeight = 113 - ClientWidth = 585 + ClientWidth = 719 + ParentBackground = False TabOrder = 0 object tbPreview: TSpkToolbar Left = 0 Height = 113 Top = 0 - Width = 585 + Width = 719 Color = clBtnFace Appearance.Tab.TabHeaderFont.Color = 9126421 Appearance.Tab.TabHeaderFont.Height = -13 @@ -95,6 +96,26 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Appearance.Element.ActiveInnerDarkColor = 961020 Appearance.Element.ActiveCaptionColor = 8405614 Appearance.Element.Style = esRounded + Appearance.Popup.CheckedFrameColor = 3577330 + Appearance.Popup.CheckedGradientFromColor = 9823231 + Appearance.Popup.CheckedGradientToColor = 9823231 + Appearance.Popup.CheckedGradientType = bkSolid + Appearance.Popup.DisabledCaptionColor = clSilver + Appearance.Popup.DividerLineColor = 14922381 + Appearance.Popup.GutterFrameColor = 12961221 + Appearance.Popup.GutterGradientFromColor = 15658729 + Appearance.Popup.GutterGradientToColor = 15658729 + Appearance.Popup.GutterGradientType = bkSolid + Appearance.Popup.HotTrackCaptionColor = 8864367 + Appearance.Popup.HotTrackFrameColor = 10079963 + Appearance.Popup.HotTrackGradientFromColor = 14351615 + Appearance.Popup.HotTrackGradientToColor = 5101567 + Appearance.Popup.HotTrackGradientType = bkConcave + Appearance.Popup.IdleCaptionColor = 11631958 + Appearance.Popup.IdleGradientFromColor = 16448250 + Appearance.Popup.IdleGradientToColor = 16448250 + Appearance.Popup.IdleGradientType = bkConcave + Appearance.Popup.Style = psGutter TabIndex = 0 Images = SmallImages LargeImages = LargeImages @@ -168,6 +189,26 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow CustomAppearance.Element.ActiveInnerDarkColor = 961020 CustomAppearance.Element.ActiveCaptionColor = 8405614 CustomAppearance.Element.Style = esRounded + CustomAppearance.Popup.CheckedFrameColor = 3577330 + CustomAppearance.Popup.CheckedGradientFromColor = 9823231 + CustomAppearance.Popup.CheckedGradientToColor = 9823231 + CustomAppearance.Popup.CheckedGradientType = bkSolid + CustomAppearance.Popup.DisabledCaptionColor = clSilver + CustomAppearance.Popup.DividerLineColor = 14922381 + CustomAppearance.Popup.GutterFrameColor = 12961221 + CustomAppearance.Popup.GutterGradientFromColor = 15658729 + CustomAppearance.Popup.GutterGradientToColor = 15658729 + CustomAppearance.Popup.GutterGradientType = bkSolid + CustomAppearance.Popup.HotTrackCaptionColor = 8864367 + CustomAppearance.Popup.HotTrackFrameColor = 10079963 + CustomAppearance.Popup.HotTrackGradientFromColor = 14351615 + CustomAppearance.Popup.HotTrackGradientToColor = 5101567 + CustomAppearance.Popup.HotTrackGradientType = bkConcave + CustomAppearance.Popup.IdleCaptionColor = 11631958 + CustomAppearance.Popup.IdleGradientFromColor = 16448250 + CustomAppearance.Popup.IdleGradientToColor = 16448250 + CustomAppearance.Popup.IdleGradientType = bkConcave + CustomAppearance.Popup.Style = psGutter Caption = 'Sample toolbar' Panes = ( 'SpkPane1' @@ -189,11 +230,13 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Caption = 'Button and dropdown' LargeImageIndex = 0 ButtonKind = bkButtonDropdown + DropdownMenu = SpkPopupMenu1 end object SpkLargeButton2: TSpkLargeButton Caption = 'Dropdown' LargeImageIndex = 0 ButtonKind = bkDropdown + DropdownMenu = SpkPopupMenu1 end end object SpkPane2: TSpkPane @@ -215,6 +258,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ImageIndex = 0 TableBehaviour = tbBeginsRow ButtonKind = bkButtonDropdown + DropdownMenu = SpkPopupMenu1 end object SpkSmallButton3: TSpkSmallButton Caption = 'Dropdown' @@ -222,6 +266,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ImageIndex = 0 TableBehaviour = tbBeginsRow ButtonKind = bkDropdown + DropdownMenu = SpkPopupMenu1 end end object SpkPane3: TSpkPane @@ -325,6 +370,26 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow CustomAppearance.Element.ActiveInnerDarkColor = 961020 CustomAppearance.Element.ActiveCaptionColor = 8405614 CustomAppearance.Element.Style = esRounded + CustomAppearance.Popup.CheckedFrameColor = 3577330 + CustomAppearance.Popup.CheckedGradientFromColor = 9823231 + CustomAppearance.Popup.CheckedGradientToColor = 9823231 + CustomAppearance.Popup.CheckedGradientType = bkSolid + CustomAppearance.Popup.DisabledCaptionColor = clSilver + CustomAppearance.Popup.DividerLineColor = 14922381 + CustomAppearance.Popup.GutterFrameColor = 12961221 + CustomAppearance.Popup.GutterGradientFromColor = 15658729 + CustomAppearance.Popup.GutterGradientToColor = 15658729 + CustomAppearance.Popup.GutterGradientType = bkSolid + CustomAppearance.Popup.HotTrackCaptionColor = 8864367 + CustomAppearance.Popup.HotTrackFrameColor = 10079963 + CustomAppearance.Popup.HotTrackGradientFromColor = 14351615 + CustomAppearance.Popup.HotTrackGradientToColor = 5101567 + CustomAppearance.Popup.HotTrackGradientType = bkConcave + CustomAppearance.Popup.IdleCaptionColor = 11631958 + CustomAppearance.Popup.IdleGradientFromColor = 16448250 + CustomAppearance.Popup.IdleGradientToColor = 16448250 + CustomAppearance.Popup.IdleGradientType = bkConcave + CustomAppearance.Popup.Style = psGutter Caption = 'Another tab' Panes = ( ) end @@ -332,17 +397,17 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object PageControl: TPageControl Left = 0 - Height = 381 + Height = 372 Top = 133 - Width = 589 - ActivePage = TabSheet6 + Width = 723 + ActivePage = pgPopup Align = alClient - TabIndex = 0 + TabIndex = 4 TabOrder = 1 object TabSheet6: TTabSheet Caption = 'Menu Button' - ClientHeight = 353 - ClientWidth = 581 + ClientHeight = 344 + ClientWidth = 715 object pMenuButtonIdleFrame: TPanel AnchorSideLeft.Control = lblMenuButtonFont AnchorSideLeft.Side = asrBottom @@ -357,6 +422,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 0 OnClick = pMenuButtonIdleFrameClick end @@ -388,6 +454,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 3 OnClick = pMenuButtonIdleGradientFromClick end @@ -406,6 +473,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 6 OnClick = pMenuButtonIdleGradientToClick end @@ -449,6 +517,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 12 OnClick = pMenuButtonIdleCaptionColorClick end @@ -533,6 +602,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Font' + ParentBackground = False TabOrder = 15 OnClick = pMenuButtonFontClick end @@ -632,6 +702,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 13 OnClick = pMenuButtonHottrackCaptionColorClick end @@ -677,6 +748,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 7 OnClick = pMenuButtonHottrackGradientToClick end @@ -697,6 +769,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 4 OnClick = pMenuButtonHottrackGradientFromClick end @@ -715,6 +788,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 1 OnClick = pMenuButtonHottrackFrameClick end @@ -748,6 +822,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 2 OnClick = pMenuButtonActiveFrameClick end @@ -768,6 +843,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 5 OnClick = pMenuButtonActiveGradientFromClick end @@ -788,6 +864,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 8 OnClick = pMenuButtonActiveGradientToClick end @@ -833,6 +910,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 14 OnClick = pMenuButtonActiveCaptionColorClick end @@ -1068,7 +1146,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 6 Height = 15 Top = 274 - Width = 569 + Width = 703 Anchors = [akTop, akLeft, akRight] BorderSpacing.Left = 6 BorderSpacing.Top = 32 @@ -1080,8 +1158,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet1: TTabSheet Caption = 'Tab' - ClientHeight = 353 - ClientWidth = 581 + ClientHeight = 344 + ClientWidth = 715 object sTabRectangle: TShape AnchorSideLeft.Control = lblTabFrame AnchorSideLeft.Side = asrBottom @@ -1180,6 +1258,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 1 OnClick = pTabFrameClick end @@ -1198,6 +1277,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 2 OnClick = pTabGradientFromClick end @@ -1216,6 +1296,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 3 OnClick = pTabGradientToClick end @@ -1260,6 +1341,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Font' + ParentBackground = False TabOrder = 7 OnClick = pTabHeaderFontClick end @@ -1278,6 +1360,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 5 OnClick = pActiveTabHeaderFontClick end @@ -1287,7 +1370,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 187 Height = 19 Top = 4 - Width = 169 + Width = 167 BorderSpacing.Top = 4 Caption = 'Link with pane and idle item' OnClick = cbLinkTabClick @@ -1334,6 +1417,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelOuter = bvLowered Caption = 'Color' Color = clBtnFace + ParentBackground = False ParentColor = False TabOrder = 6 OnClick = pInactiveTabHeaderFontClick @@ -1514,8 +1598,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet2: TTabSheet Caption = 'Pane' - ClientHeight = 353 - ClientWidth = 581 + ClientHeight = 344 + ClientWidth = 715 ImageIndex = 1 object lblPaneBorderDark: TLabel AnchorSideTop.Control = pPaneBorderDark @@ -1640,6 +1724,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 1 OnClick = pPaneBorderDarkClick end @@ -1658,6 +1743,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 2 OnClick = pPaneBorderLightClick end @@ -1676,6 +1762,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 3 OnClick = pPaneGradientFromClick end @@ -1694,6 +1781,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 4 OnClick = pPaneGradientToClick end @@ -1737,6 +1825,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 6 OnClick = pPaneCaptionBackgroundClick end @@ -1755,6 +1844,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Font' + ParentBackground = False TabOrder = 9 OnClick = pPaneCaptionFontClick end @@ -1773,6 +1863,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 8 OnClick = pPaneCaptionFontColorClick end @@ -1782,7 +1873,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 141 Height = 19 Top = 4 - Width = 160 + Width = 158 BorderSpacing.Top = 4 Caption = 'Link with tab and idle item' OnClick = cbLinkPaneClick @@ -2006,7 +2097,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Control = sTabRectangle AnchorSideBottom.Side = asrBottom Left = 268 - Height = 124 + Height = 115 Top = 32 Width = 8 Anchors = [akTop, akLeft, akBottom] @@ -2032,8 +2123,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet3: TTabSheet Caption = 'Item' - ClientHeight = 353 - ClientWidth = 581 + ClientHeight = 344 + ClientWidth = 715 ImageIndex = 2 object sItemRectangle: TShape AnchorSideLeft.Control = lblItemIdleFrame @@ -2216,6 +2307,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Font' + ParentBackground = False TabOrder = 22 OnClick = pItemFontClick end @@ -2259,6 +2351,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 7 OnClick = pItemIdleGradientToClick end @@ -2277,6 +2370,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 4 OnClick = pItemIdleGradientFromClick end @@ -2294,6 +2388,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 1 OnClick = pItemIdleFrameClick end @@ -2312,6 +2407,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 13 OnClick = pItemIdleCaptionColorClick end @@ -2330,6 +2426,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 16 OnClick = pItemIdleInnerDarkClick end @@ -2348,6 +2445,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 19 OnClick = pItemIdleInnerLightClick end @@ -2393,6 +2491,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 8 OnClick = pItemHottrackGradientToClick end @@ -2413,6 +2512,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 5 OnClick = pItemHottrackGradientFromClick end @@ -2431,6 +2531,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 2 OnClick = pItemHottrackFrameClick end @@ -2451,6 +2552,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 14 OnClick = pItemHottrackCaptionColorClick end @@ -2471,6 +2573,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 17 OnClick = pItemHottrackInnerDarkClick end @@ -2491,6 +2594,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 20 OnClick = pItemHottrackInnerLightClick end @@ -2536,6 +2640,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 9 OnClick = pItemActiveGradientToClick end @@ -2556,6 +2661,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 6 OnClick = pItemActiveGradientFromClick end @@ -2574,6 +2680,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 3 OnClick = pItemActiveFrameClick end @@ -2594,6 +2701,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 15 OnClick = pItemActiveCaptionColorClick end @@ -2614,6 +2722,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 18 OnClick = pItemActiveInnerDarkClick end @@ -2634,6 +2743,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BevelInner = bvRaised BevelOuter = bvLowered Caption = 'Color' + ParentBackground = False TabOrder = 21 OnClick = pItemActiveInnerLightClick end @@ -2644,7 +2754,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow Left = 120 Height = 19 Top = 4 - Width = 140 + Width = 138 BorderSpacing.Left = 20 BorderSpacing.Top = 4 Caption = 'Link with tab and pane' @@ -3064,10 +3174,783 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow ParentColor = False end end + object pgPopup: TTabSheet + Caption = 'Dropdown Menu' + ClientHeight = 344 + ClientWidth = 715 + object lblPopupIdle: TLabel + AnchorSideLeft.Control = bvPopupIdleFrame + AnchorSideLeft.Side = asrCenter + Left = 179 + Height = 15 + Top = 16 + Width = 19 + Caption = 'Idle' + end + object lblPopupHotTrack: TLabel + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideLeft.Side = asrCenter + AnchorSideTop.Control = lblPopupIdle + Left = 308 + Height = 15 + Top = 16 + Width = 46 + Caption = 'Hottrack' + end + object lblPopupGutter: TLabel + AnchorSideLeft.Control = pPopupGutterFrameColor + AnchorSideLeft.Side = asrCenter + AnchorSideTop.Control = lblPopupIdle + Left = 458 + Height = 15 + Top = 16 + Width = 33 + Caption = 'Gutter' + end + object lblPopupChecked: TLabel + AnchorSideLeft.Control = pPopupCheckedFrameColor + AnchorSideLeft.Side = asrCenter + AnchorSideTop.Control = lblPopupGutter + Left = 585 + Height = 15 + Top = 16 + Width = 64 + Caption = 'Checkboxes' + end + object lblPopupFrame: TLabel + AnchorSideTop.Control = bvPopupIdleFrame + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 89 + Height = 15 + Top = 40 + Width = 33 + Anchors = [akTop, akRight] + Caption = 'Frame' + end + object lblPopupGradientFrom: TLabel + AnchorSideTop.Control = pPopupIdleGradientFromColor + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 48 + Height = 15 + Top = 71 + Width = 74 + Anchors = [akTop, akRight] + Caption = 'Gradient from' + end + object lblPopupGradientTo: TLabel + AnchorSideTop.Control = pPopupIdleGradientToColor + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 63 + Height = 15 + Top = 102 + Width = 59 + Anchors = [akTop, akRight] + Caption = 'Gradient to' + end + object lblPopupGradientType: TLabel + AnchorSideTop.Control = cbPopupIdleGradientKind + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 51 + Height = 15 + Top = 132 + Width = 71 + Anchors = [akTop, akRight] + Caption = 'Gradient type' + end + object lblPopupCaption: TLabel + AnchorSideTop.Control = pPopupIdleCaptionColor + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 80 + Height = 15 + Top = 162 + Width = 42 + Anchors = [akTop, akRight] + Caption = 'Caption' + end + object lblPopupDisabledCaptionColor: TLabel + AnchorSideLeft.Control = pgPopup + AnchorSideTop.Control = pPopupDisabledCaptionColor + AnchorSideTop.Side = asrCenter + Left = 32 + Height = 15 + Top = 193 + Width = 90 + BorderSpacing.Left = 32 + Caption = 'Disabled Caption' + end + object lblPopupDividerLine: TLabel + AnchorSideTop.Control = pPopupDividerLineColor + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDisabledCaptionColor + AnchorSideRight.Side = asrBottom + Left = 60 + Height = 15 + Top = 224 + Width = 62 + Anchors = [akTop, akRight] + Caption = 'Divider Line' + end + object pPopupIdleGradientFromColor: TPanel + AnchorSideLeft.Control = lblPopupGradientFrom + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = bvPopupIdleFrame + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 66 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 0 + OnClick = pPopupIdleGradientFromColorClick + end + object pPopupIdleGradientToColor: TPanel + AnchorSideLeft.Control = lblPopupGradientTo + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleGradientFromColor + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 97 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 1 + OnClick = pPopupIdleGradientToColorClick + end + object pPopupIdleCaptionColor: TPanel + AnchorSideLeft.Control = lblPopupGradientTo + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = cbPopupIdleGradientKind + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 157 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 2 + OnClick = pPopupIdleCaptionColorClick + end + object cbPopupIdleGradientKind: TComboBox + AnchorSideLeft.Control = pPopupIdleGradientToColor + AnchorSideTop.Control = pPopupIdleGradientToColor + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = pPopupIdleGradientToColor + AnchorSideRight.Side = asrBottom + Left = 138 + Height = 23 + Top = 128 + Width = 100 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 + ItemIndex = 0 + Items.Strings = ( + 'None' + 'Horizontal' + 'Vertical' + 'Concave' + ) + OnChange = cbPopupIdleGradientKindChange + Style = csDropDownList + TabOrder = 3 + Text = 'None' + end + object pPopupDisabledCaptionColor: TPanel + AnchorSideLeft.Control = lblPopupGradientTo + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleCaptionColor + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 188 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 4 + OnClick = pPopupDisabledCaptionColorClick + end + object pPopupDividerLineColor: TPanel + AnchorSideLeft.Control = lblPopupGradientTo + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupDisabledCaptionColor + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 219 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 5 + OnClick = pPopupDividerLineColorClick + end + object bvPopupIdleFrame: TBevel + AnchorSideLeft.Control = lblPopupFrame + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = lblPopupIdle + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 35 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 4 + Shape = bsSpacer + end + object pPopupFont: TPanel + AnchorSideLeft.Control = lblPopupGradientTo + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupDividerLineColor + AnchorSideTop.Side = asrBottom + Left = 138 + Height = 25 + Top = 250 + Width = 100 + BorderSpacing.Left = 16 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Font' + ParentBackground = False + TabOrder = 6 + OnClick = pPopupFontClick + end + object lblPopupFont: TLabel + AnchorSideTop.Control = pPopupFont + AnchorSideTop.Side = asrCenter + AnchorSideRight.Control = lblPopupDividerLine + AnchorSideRight.Side = asrBottom + Left = 71 + Height = 15 + Top = 255 + Width = 51 + Anchors = [akTop, akRight] + Caption = 'Item Font' + end + object bPopupIdleGradientFromColor: TSpeedButton + AnchorSideLeft.Control = pPopupIdleGradientFromColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleGradientFromColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 240 + Height = 24 + Top = 66 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupIdleGradientFromColorClick + end + object bPopupIdleGradientToColor: TSpeedButton + AnchorSideLeft.Control = pPopupIdleGradientToColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleGradientToColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 240 + Height = 24 + Top = 97 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupIdleGradientToColorClick + end + object bPopupIdleCaptionColor: TSpeedButton + AnchorSideLeft.Control = pPopupIdleCaptionColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleCaptionColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 240 + Height = 24 + Top = 157 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupIdleCaptionColorClick + end + object bPopupDisabledCaptionColor: TSpeedButton + AnchorSideLeft.Control = pPopupDisabledCaptionColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupDisabledCaptionColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 240 + Height = 24 + Top = 188 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupDisabledCaptionColorClick + end + object bPopupDividerLineColor: TSpeedButton + AnchorSideLeft.Control = pPopupDividerLineColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupDividerLineColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 240 + Height = 24 + Top = 219 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupDividerLineColorClick + end + object pPopupHotTrackFrameColor: TPanel + AnchorSideLeft.Control = bvPopupIdleFrame + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = bvPopupIdleFrame + Left = 281 + Height = 25 + Top = 35 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 7 + OnClick = pPopupHotTrackFrameColorClick + end + object pPopupHotTrackGradientFromColor: TPanel + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideTop.Control = pPopupIdleGradientFromColor + Left = 281 + Height = 25 + Top = 66 + Width = 100 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 8 + OnClick = pPopupHotTrackGradientFromColorClick + end + object pPopupHotTrackGradientToColor: TPanel + AnchorSideLeft.Control = pPopupHotTrackGradientFromColor + AnchorSideTop.Control = pPopupHotTrackGradientFromColor + AnchorSideTop.Side = asrBottom + Left = 281 + Height = 25 + Top = 97 + Width = 100 + BorderSpacing.Top = 6 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 9 + OnClick = pPopupHotTrackGradientToColorClick + end + object pPopupHotTrackCaptionColor: TPanel + AnchorSideLeft.Control = pPopupIdleCaptionColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupIdleCaptionColor + Left = 281 + Height = 25 + Top = 157 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 10 + OnClick = pPopupHotTrackCaptionColorClick + end + object cbPopupHotTrackGradientKind: TComboBox + AnchorSideLeft.Control = pPopupHotTrackGradientToColor + AnchorSideTop.Control = pPopupHotTrackGradientToColor + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = pPopupHotTrackGradientToColor + AnchorSideRight.Side = asrBottom + Left = 281 + Height = 23 + Top = 128 + Width = 100 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 + ItemIndex = 0 + Items.Strings = ( + 'None' + 'Horizontal' + 'Vertical' + 'Concave' + ) + OnChange = cbPopupHotTrackGradientKindChange + Style = csDropDownList + TabOrder = 11 + Text = 'None' + end + object bPopupHotTrackFrameColor: TSpeedButton + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackFrameColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 383 + Height = 24 + Top = 35 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupHotTrackFrameColorClick + end + object bPopupHotTrackGradientFromColor: TSpeedButton + AnchorSideLeft.Control = pPopupHotTrackGradientFromColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackGradientFromColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 383 + Height = 24 + Top = 66 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupHotTrackGradientFromColorClick + end + object bPopupHotTrackGradientToColor: TSpeedButton + AnchorSideLeft.Control = pPopupHotTrackGradientToColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackGradientToColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 383 + Height = 24 + Top = 97 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupHotTrackGradientToColorClick + end + object bPopupHotTrackCaptionColor: TSpeedButton + AnchorSideLeft.Control = pPopupHotTrackCaptionColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackCaptionColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 383 + Height = 24 + Top = 157 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupHotTrackCaptionColorClick + end + object pPopupGutterFrameColor: TPanel + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = bvPopupIdleFrame + Left = 424 + Height = 25 + Top = 35 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 12 + OnClick = pPopupGutterFrameColorClick + end + object pPopupCheckedFrameColor: TPanel + AnchorSideLeft.Control = pPopupGutterFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = bvPopupIdleFrame + Left = 567 + Height = 25 + Top = 35 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 13 + OnClick = pPopupCheckedFrameColorClick + end + object bPopupGutterFrameColor: TSpeedButton + AnchorSideLeft.Control = pPopupGutterFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupGutterFrameColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 526 + Height = 24 + Top = 35 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupGutterFrameColorClick + end + object bPopupCheckedFrameColor: TSpeedButton + AnchorSideLeft.Control = pPopupCheckedFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupCheckedFrameColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 669 + Height = 24 + Top = 35 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupCheckedFrameColorClick + end + object pPopupGutterGradientFromColor: TPanel + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = bPopupHotTrackGradientFromColor + Left = 424 + Height = 25 + Top = 66 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 14 + OnClick = pPopupGutterGradientFromColorClick + end + object bPopupGutterGradientFromColor: TSpeedButton + AnchorSideLeft.Control = pPopupGutterGradientFromColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupGutterGradientFromColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 526 + Height = 24 + Top = 66 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupGutterGradientFromColorClick + end + object pPopupCheckedGradientFromColor: TPanel + AnchorSideLeft.Control = pPopupGutterGradientFromColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackGradientFromColor + Left = 567 + Height = 25 + Top = 66 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 15 + OnClick = pPopupCheckedGradientFromColorClick + end + object bPopupCheckedGradientFromColor: TSpeedButton + AnchorSideLeft.Control = pPopupCheckedGradientFromColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupCheckedGradientFromColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 669 + Height = 24 + Top = 66 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupCheckedGradientFromColorClick + end + object pPopupGutterGradientToColor: TPanel + AnchorSideLeft.Control = pPopupHotTrackFrameColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupHotTrackGradientToColor + Left = 424 + Height = 25 + Top = 97 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 16 + OnClick = pPopupGutterGradientToColorClick + end + object bPopupGutterGradientToColor: TSpeedButton + AnchorSideLeft.Control = pPopupGutterGradientToColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupGutterGradientToColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 526 + Height = 24 + Top = 97 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupGutterGradientToColorClick + end + object pPopupCheckedGradientToColor: TPanel + AnchorSideLeft.Control = pPopupGutterGradientToColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupGutterGradientToColor + Left = 567 + Height = 25 + Top = 97 + Width = 100 + BorderSpacing.Left = 43 + BevelInner = bvRaised + BevelOuter = bvLowered + Caption = 'Color' + ParentBackground = False + TabOrder = 17 + OnClick = pPopupCheckedGradientToColorClick + end + object bPopupCheckedGradientToColor: TSpeedButton + AnchorSideLeft.Control = pPopupCheckedGradientToColor + AnchorSideLeft.Side = asrBottom + AnchorSideTop.Control = pPopupCheckedGradientToColor + AnchorSideTop.Side = asrCenter + AnchorSideBottom.Control = pTabFrame + AnchorSideBottom.Side = asrBottom + Left = 669 + Height = 24 + Top = 97 + Width = 25 + AllowAllUp = True + BorderSpacing.Left = 2 + Flat = True + GroupIndex = 1 + OnClick = bPopupCheckedGradientToColorClick + end + object cbPopupGutterGradientKind: TComboBox + AnchorSideLeft.Control = pPopupGutterGradientToColor + AnchorSideTop.Control = pPopupHotTrackGradientToColor + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = pPopupGutterGradientToColor + AnchorSideRight.Side = asrBottom + Left = 424 + Height = 23 + Top = 128 + Width = 100 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 + ItemIndex = 0 + Items.Strings = ( + 'None' + 'Horizontal' + 'Vertical' + 'Concave' + ) + OnChange = cbPopupGutterGradientKindChange + Style = csDropDownList + TabOrder = 18 + Text = 'None' + end + object cbPopupCheckedGradientKind: TComboBox + AnchorSideLeft.Control = pPopupCheckedGradientToColor + AnchorSideTop.Control = pPopupHotTrackGradientToColor + AnchorSideTop.Side = asrBottom + AnchorSideRight.Control = pPopupCheckedGradientToColor + AnchorSideRight.Side = asrBottom + Left = 567 + Height = 23 + Top = 128 + Width = 100 + Anchors = [akTop, akLeft, akRight] + BorderSpacing.Top = 6 + ItemHeight = 15 + ItemIndex = 0 + Items.Strings = ( + 'None' + 'Horizontal' + 'Vertical' + 'Concave' + ) + OnChange = cbPopupCheckedGradientKindChange + Style = csDropDownList + TabOrder = 19 + Text = 'None' + end + end object TabSheet4: TTabSheet Caption = 'Import / Export' - ClientHeight = 353 - ClientWidth = 581 + ClientHeight = 344 + ClientWidth = 715 ImageIndex = 3 object bImport: TButton AnchorSideLeft.Control = bExportToXML @@ -3108,9 +3991,9 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideBottom.Control = TabSheet4 AnchorSideBottom.Side = asrBottom Left = 4 - Height = 316 + Height = 307 Top = 33 - Width = 573 + Width = 707 Anchors = [akTop, akLeft, akRight, akBottom] BorderSpacing.Left = 4 BorderSpacing.Top = 4 @@ -3141,7 +4024,7 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Control = TabSheet4 AnchorSideRight.Control = TabSheet4 AnchorSideRight.Side = asrBottom - Left = 523 + Left = 657 Height = 25 Top = 4 Width = 54 @@ -3156,8 +4039,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow end object TabSheet5: TTabSheet Caption = 'Tools' - ClientHeight = 353 - ClientWidth = 544 + ClientHeight = 344 + ClientWidth = 715 ImageIndex = 4 object Label17: TLabel AnchorSideLeft.Control = TabSheet5 @@ -3195,8 +4078,8 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object ButtonPanel: TPanel Left = 8 Height = 33 - Top = 518 - Width = 572 + Top = 509 + Width = 706 Align = alBottom AutoSize = True BorderSpacing.Left = 8 @@ -3205,20 +4088,23 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow BorderSpacing.Bottom = 4 BevelOuter = bvNone ClientHeight = 33 - ClientWidth = 572 + ClientWidth = 706 + Constraints.MinWidth = 75 + ParentBackground = False TabOrder = 2 object bOK: TButton AnchorSideTop.Control = bCancel AnchorSideRight.Control = bCancel AnchorSideBottom.Control = bCancel AnchorSideBottom.Side = asrBottom - Left = 462 + Left = 550 Height = 25 Top = 4 - Width = 42 + Width = 75 Anchors = [akTop, akRight, akBottom] BorderSpacing.Right = 6 Caption = 'OK' + Constraints.MinWidth = 75 Default = True ModalResult = 1 TabOrder = 0 @@ -3228,16 +4114,17 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow AnchorSideTop.Side = asrCenter AnchorSideRight.Control = ButtonPanel AnchorSideRight.Side = asrBottom - Left = 510 + Left = 631 Height = 25 Top = 4 - Width = 62 + Width = 75 Anchors = [akTop, akRight] AutoSize = True BorderSpacing.Top = 10 BorderSpacing.Bottom = 4 Cancel = True Caption = 'Cancel' + Constraints.MinWidth = 75 ModalResult = 2 TabOrder = 1 end @@ -3402,4 +4289,74 @@ object frmAppearanceEditWindow: TfrmAppearanceEditWindow object SmallImages: TImageList Left = 272 end + object SpkPopupMenu1: TSpkPopupMenu + OwnerDraw = True + Left = 616 + Top = 5 + object MenuItem1: TMenuItem + Caption = 'Item 1' + end + object MenuItem2: TMenuItem + Caption = 'Item 2' + end + object MenuItem3: TMenuItem + Caption = 'Item 3' + end + object Separator1: TMenuItem + Caption = '-' + end + object MenuItem4: TMenuItem + Caption = 'Disabled item' + Enabled = False + end + object Separator2: TMenuItem + Caption = '-' + end + object MenuItem5: TMenuItem + AutoCheck = True + Caption = 'Checkbox Item 1' + Checked = True + end + object MenuItem6: TMenuItem + AutoCheck = True + Caption = 'Checkbox Item 2' + Checked = True + end + object Separator3: TMenuItem + Caption = '-' + end + object MenuItem12: TMenuItem + AutoCheck = True + Caption = 'Radiobox Item 1' + Checked = True + GroupIndex = 1 + RadioItem = True + end + object MenuItem11: TMenuItem + AutoCheck = True + Caption = 'Radiobox Item 2' + GroupIndex = 1 + RadioItem = True + end + object MenuItem13: TMenuItem + AutoCheck = True + Caption = 'Radiobox Item 3' + GroupIndex = 1 + end + object Separator4: TMenuItem + Caption = '-' + end + object MenuItem7: TMenuItem + Caption = 'Submenu' + object MenuItem8: TMenuItem + Caption = 'MenuItem8' + end + object MenuItem9: TMenuItem + Caption = 'MenuItem9' + end + object MenuItem10: TMenuItem + Caption = 'MenuItem10' + end + end + end end diff --git a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas index 46406a5da..b50ac3935 100644 --- a/components/spktoolbar/designtime/spkte_AppearanceEditor.pas +++ b/components/spktoolbar/designtime/spkte_AppearanceEditor.pas @@ -6,15 +6,31 @@ interface uses LCLIntf, LCLType, SysUtils, Variants, Classes, Graphics, Controls, Forms, - Dialogs, ExtCtrls, StdCtrls, ComCtrls, Buttons, Spin, LCLVersion, + Dialogs, ExtCtrls, StdCtrls, ComCtrls, Buttons, Spin, LCLVersion, Menus, SpkGUITools, SpkXMLParser, SpkToolbar, - spkt_Buttons, spkt_Pane, spkt_Tab, spkt_Appearance; + spkt_Buttons, spkt_Pane, spkt_Tab, spkt_Appearance, SpkPopup; type { TfrmAppearanceEditWindow } TfrmAppearanceEditWindow = class(TForm) + bPopupCheckedGradientFromColor: TSpeedButton; + bPopupCheckedGradientToColor: TSpeedButton; + bPopupGutterFrameColor: TSpeedButton; + bPopupCheckedFrameColor: TSpeedButton; + bPopupGutterGradientFromColor: TSpeedButton; + bPopupGutterGradientToColor: TSpeedButton; + bPopupHotTrackGradientFromColor: TSpeedButton; + bPopupHotTrackGradientToColor: TSpeedButton; + bPopupHotTrackCaptionColor: TSpeedButton; + bPopupIdleGradientFromColor: TSpeedButton; + bPopupHotTrackFrameColor: TSpeedButton; + bPopupIdleGradientToColor: TSpeedButton; + bPopupIdleCaptionColor: TSpeedButton; + bPopupDisabledCaptionColor: TSpeedButton; + bPopupDividerLineColor: TSpeedButton; + bvPopupIdleFrame: TBevel; bvHorSpacer: TBevel; bvPaneHorSpacer: TBevel; bvVertSpacer: TBevel; @@ -31,19 +47,35 @@ type bMenuButtonIdleGradientFromColor: TSpeedButton; bMenuButtonIdleGradientToColor: TSpeedButton; bvPaneVertSpacer: TBevel; + cbPopupGutterGradientKind: TComboBox; + cbPopupCheckedGradientKind: TComboBox; + cbPopupIdleGradientKind: TComboBox; cbMenuButtonActiveGradientKind: TComboBox; cbMenuButtonHottrackGradientKind: TComboBox; cbMenuButtonIdleGradientKind: TComboBox; cbMenuButtonShapeStyle: TComboBox; + cbPopupHotTrackGradientKind: TComboBox; edMenuButtonHotTrackBrightnessChange: TSpinEdit; edTabCaptionHeight: TSpinEdit; + lblPopupFont: TLabel; + lblPopupDisabledCaptionColor: TLabel; + lblPopupCaption: TLabel; + lblPopupDividerLine: TLabel; + lblPopupFrame: TLabel; + lblPopupGradientFrom: TLabel; + lblPopupGradientTo: TLabel; + lblPopupGradientType: TLabel; + lblPopupIdle: TLabel; + lblPopupHotTrack: TLabel; Label22: TLabel; Label23: TLabel; Label24: TLabel; Label30: TLabel; Label31: TLabel; Label32: TLabel; + lblPopupGutter: TLabel; + lblPopupChecked: TLabel; lblMenuButtonFont: TLabel; Label34: TLabel; lMenuButtonIdleFrame: TLabel; @@ -52,6 +84,29 @@ type lblMenuButtonIdle: TLabel; lblTabCornerRadius: TLabel; lblTabCaptionHeight: TLabel; + MenuItem1: TMenuItem; + MenuItem10: TMenuItem; + MenuItem11: TMenuItem; + MenuItem12: TMenuItem; + MenuItem13: TMenuItem; + MenuItem2: TMenuItem; + MenuItem3: TMenuItem; + MenuItem4: TMenuItem; + MenuItem5: TMenuItem; + MenuItem6: TMenuItem; + MenuItem7: TMenuItem; + MenuItem8: TMenuItem; + MenuItem9: TMenuItem; + pPopupCheckedGradientFromColor: TPanel; + pPopupCheckedGradientToColor: TPanel; + pPopupDisabledCaptionColor: TPanel; + pPopupDividerLineColor: TPanel; + pPopupFont: TPanel; + pPopupGutterFrameColor: TPanel; + pPopupCheckedFrameColor: TPanel; + pPopupGutterGradientFromColor: TPanel; + pPopupGutterGradientToColor: TPanel; + pPopupIdleGradientFromColor: TPanel; pMenuButtonActiveCaptionColor: TPanel; pMenuButtonActiveFrame: TPanel; @@ -66,6 +121,16 @@ type pMenuButtonIdleFrame: TPanel; pMenuButtonIdleGradientFrom: TPanel; pMenuButtonIdleGradientTo: TPanel; + pPopupHotTrackFrameColor: TPanel; + pPopupHotTrackGradientFromColor: TPanel; + pPopupHotTrackGradientToColor: TPanel; + pPopupHotTrackCaptionColor: TPanel; + pPopupIdleGradientToColor: TPanel; + pPopupIdleCaptionColor: TPanel; + Separator1: TMenuItem; + Separator2: TMenuItem; + Separator3: TMenuItem; + Separator4: TMenuItem; SmallImages: TImageList; LargeImages: TImageList; @@ -79,6 +144,7 @@ type edPaneHotTrackBrightnessChange: TSpinEdit; edItemHotTrackBrightnessChange: TSpinEdit; edTabCornerRadius: TSpinEdit; + SpkPopupMenu1: TSpkPopupMenu; TabSheet6: TTabSheet; bInactiveTabHeaderFontColor: TSpeedButton; bItemActiveInnerDarkColor: TSpeedButton; @@ -127,6 +193,7 @@ type ButtonPanel: TPanel; bTabFrameColor: TSpeedButton; SpkTab2: TSpkTab; + pgPopup: TTabSheet; tbPreview: TSpkToolbar; SpkTab1: TSpkTab; SpkPane1: TSpkPane; @@ -254,6 +321,21 @@ type procedure bPaneCaptionFontColorClick(Sender: TObject); procedure bPaneGradientFromColorClick(Sender: TObject); procedure bPaneGradientToColorClick(Sender: TObject); + procedure bPopupCheckedFrameColorClick(Sender: TObject); + procedure bPopupCheckedGradientFromColorClick(Sender: TObject); + procedure bPopupCheckedGradientToColorClick(Sender: TObject); + procedure bPopupDisabledCaptionColorClick(Sender: TObject); + procedure bPopupDividerLineColorClick(Sender: TObject); + procedure bPopupGutterFrameColorClick(Sender: TObject); + procedure bPopupGutterGradientFromColorClick(Sender: TObject); + procedure bPopupGutterGradientToColorClick(Sender: TObject); + procedure bPopupHotTrackCaptionColorClick(Sender: TObject); + procedure bPopupHotTrackFrameColorClick(Sender: TObject); + procedure bPopupHotTrackGradientFromColorClick(Sender: TObject); + procedure bPopupHotTrackGradientToColorClick(Sender: TObject); + procedure bPopupIdleCaptionColorClick(Sender: TObject); + procedure bPopupIdleGradientFromColorClick(Sender: TObject); + procedure bPopupIdleGradientToColorClick(Sender: TObject); procedure bResetClick(Sender: TObject); procedure bTabBorderColorClick(Sender: TObject); @@ -266,6 +348,10 @@ type procedure cbItemStyleChange(Sender: TObject); procedure cbPaneGradientKindChange(Sender: TObject); procedure cbPaneStyleChange(Sender: TObject); + procedure cbPopupCheckedGradientKindChange(Sender: TObject); + procedure cbPopupGutterGradientKindChange(Sender: TObject); + procedure cbPopupHotTrackGradientKindChange(Sender: TObject); + procedure cbPopupIdleGradientKindChange(Sender: TObject); procedure cbTabGradientKindChange(Sender: TObject); procedure cbLinkItemClick(Sender: TObject); @@ -286,6 +372,22 @@ type procedure pActiveTabHeaderFontClick(Sender: TObject); procedure pInactiveTabHeaderFontClick(Sender: TObject); + procedure pPopupCheckedFrameColorClick(Sender: TObject); + procedure pPopupCheckedGradientFromColorClick(Sender: TObject); + procedure pPopupCheckedGradientToColorClick(Sender: TObject); + procedure pPopupFontClick(Sender: TObject); + procedure pPopupGutterFrameColorClick(Sender: TObject); + procedure pPopupGutterGradientFromColorClick(Sender: TObject); + procedure pPopupGutterGradientToColorClick(Sender: TObject); + procedure pPopupHotTrackFrameColorClick(Sender: TObject); + procedure pPopupHotTrackGradientFromColorClick(Sender: TObject); + procedure pPopupHotTrackGradientToColorClick(Sender: TObject); + procedure pPopupIdleCaptionColorClick(Sender: TObject); + procedure pPopupDisabledCaptionColorClick(Sender: TObject); + procedure pPopupDividerLineColorClick(Sender: TObject); + procedure pPopupIdleGradientFromColorClick(Sender: TObject); + procedure pPopupIdleGradientToColorClick(Sender: TObject); + procedure pPopupHotTrackCaptionColorClick(Sender: TObject); procedure pTabFrameClick(Sender: TObject); procedure pTabGradientFromClick(Sender: TObject); procedure pTabGradientToClick(Sender: TObject); @@ -497,7 +599,7 @@ procedure TfrmAppearanceEditWindow.SetPanelColor(Panel: TPanel; AColor: TColor); begin Panel.Color := AColor; if Panel.Color <> AColor then - Showmessage('lipa!'); + Showmessage('lipa!'); // wp: what is this? if (GetRValue(AColor) + GetGValue(AColor) + GetBValue(AColor)) div 3 >= 128 then Panel.Font.Color := clBlack else @@ -665,8 +767,8 @@ end; procedure TfrmAppearanceEditWindow.bItemHotTrackFrameColorClick(Sender: TObject); begin (Sender as TSpeedButton).Down := true; - if PickColor(pItemHotTrackFrame) then - tbPreview.Appearance.Element.HotTrackFrameColor := pItemHotTrackFrame.Color; + if PickColor(pItemHottrackFrame) then + tbPreview.Appearance.Element.HotTrackFrameColor := pItemHottrackFrame.Color; (Sender as TSpeedButton).Down := false; end; @@ -841,6 +943,140 @@ begin (Sender as TSpeedButton).Down := false; end; +procedure TfrmAppearanceEditWindow.bPopupCheckedFrameColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupCheckedFrameColor) then + tbPreview.Appearance.Popup.CheckedFrameColor := pPopupCheckedFrameColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupCheckedGradientFromColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupCheckedGradientFromColor) then + tbPreview.Appearance.Popup.CheckedGradientFromColor := pPopupCheckedGradientFromColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupCheckedGradientToColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupCheckedGradientFromColor) then + tbPreview.Appearance.Popup.CheckedGradientToColor := pPopupCheckedGradientToColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupDisabledCaptionColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupDisabledCaptionColor) then + tbPreview.Appearance.Popup.DisabledCaptionColor := pPopupDisabledCaptionColor.Color; + (Sender as TSpeedButton).Down := false; + +end; + +procedure TfrmAppearanceEditWindow.bPopupDividerLineColorClick(Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupDividerLineColor) then + tbPreview.Appearance.Popup.DividerLineColor := pPopupDividerLineColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupGutterFrameColorClick(Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupGutterFrameColor) then + tbPreview.Appearance.Popup.GutterFrameColor := pPopupGutterFrameColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupGutterGradientFromColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupGutterGradientFromColor) then + tbPreview.Appearance.Popup.GutterGradientFromColor := pPopupGutterGradientFromColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupGutterGradientToColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupGutterGradientToColor) then + tbPreview.Appearance.Popup.GutterGradientToColor := pPopupGutterGradientToColor.Color; + (Sender as TSpeedButton).Down := false; + +end; + +procedure TfrmAppearanceEditWindow.bPopupHotTrackCaptionColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupHotTrackCaptionColor) then + tbPreview.Appearance.Popup.HotTrackCaptionColor := pPopupHotTrackCaptionColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupHotTrackFrameColorClick(Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupHotTrackFrameColor) then + tbPreview.Appearance.Popup.HotTrackFrameColor := pPopupHotTrackFrameColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupHotTrackGradientFromColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupHotTrackGradientFromColor) then + tbPreview.Appearance.Popup.HotTrackGradientFromColor := pPopupHotTrackGradientFromColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupHotTrackGradientToColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupHotTrackGradientToColor) then + tbPreview.Appearance.Popup.HotTrackGradientToColor := pPopupHotTrackGradientToColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupIdleCaptionColorClick(Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupIdleCaptionColor) then + tbPreview.Appearance.Popup.IdleCaptionColor := pPopupIdleCaptionColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupIdleGradientFromColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupIdleGradientFromColor) then + tbPreview.Appearance.Popup.IdleGradientFromColor := pPopupIdleGradientFromColor.Color; + (Sender as TSpeedButton).Down := false; +end; + +procedure TfrmAppearanceEditWindow.bPopupIdleGradientToColorClick( + Sender: TObject); +begin + (Sender as TSpeedButton).Down := true; + if PickColor(pPopupIdleGradientToColor) then + tbPreview.Appearance.Popup.IdleGradientToColor := pPopupIdleGradientToColor.Color; + (Sender as TSpeedButton).Down := false; +end; + + procedure TfrmAppearanceEditWindow.SwitchAttributesLink(const Value: boolean); begin cbLinkTab.checked := Value; @@ -898,25 +1134,17 @@ end; function TfrmAppearanceEditWindow.ChangeColor(Panel: TPanel): boolean; begin cdColorDialog.Color := Panel.Color; - if cdColorDialog.Execute then - begin + Result := cdColorDialog.Execute; + if Result then SetPanelColor(Panel, cdColorDialog.Color); - Result := true - end - else - Result := false; end; function TfrmAppearanceEditWindow.ChangeFont(Panel: TPanel): boolean; begin fdFontDialog.Font.Assign(Panel.Font); - if fdFontDialog.Execute then - begin + Result := fdFontDialog.Execute; + if Result then SetPanelFont(Panel, fdFontDialog.Font); - Result := true; - end - else - Result := false; end; procedure TfrmAppearanceEditWindow.edItemHotTrackBrightnessChangeChange( @@ -1070,6 +1298,36 @@ begin cbItemStyle.ItemIndex := ord(Style); edItemHotTrackBrightnessChange.Value := HotTrackBrightnessChange; end; + + with Popup do + begin + SetPanelFont(pPopupFont, CaptionFont); + SetPanelColor(pPopupDisabledCaptionColor, DisabledCaptionColor); + SetPanelColor(pPopupIdleGradientFromColor, IdleGradientFromColor); + SetPanelColor(pPopupIdleGradientToColor, IdleGradientToColor); + SetComboGradientKind(cbPopupIdleGradientKind, IdleGradientType); + SetPanelColor(pPopupIdleCaptionColor, IdleCaptionColor); + SetPanelColor(pPopupDividerLineColor, DividerLineColor); + + SetPanelColor(pPopupHottrackFrameColor, HottrackFrameColor); + SetPanelColor(pPopupHottrackGradientFromColor, HottrackGradientFromColor); + SetPanelColor(pPopupHottrackGradientToColor, HottrackGradientToColor); + SetComboGradientKind(cbPopupHottrackGradientKind, HottrackGradientType); + SetPanelColor(pPopupHottrackCaptionColor, HottrackCaptionColor); + + SetPanelColor(pPopupGutterFrameColor, GutterFrameColor); + SetPanelColor(pPopupGutterGradientFromColor, GutterGradientFromColor); + SetPanelColor(pPopupGutterGradientTocolor, GutterGradientToColor); + SetComboGradientKind(cbPopupGutterGradientKind, GutterGradientType); + + SetPanelColor(pPopupCheckedFrameColor, CheckedFrameColor); + SetPanelColor(pPopupCheckedGradientFromcolor, CheckedGradientFromColor); + SetPanelColor(pPopupCheckedGradientTocolor, CheckedGradientToColor); + SetComboGradientKind(cbPopupCheckedGradientKind, CheckedGradientType); + +// cbPopupStyle.ItemIndex := ord(Style); +// edItemHotTrackBrightnessChange.Value := HotTrackBrightnessChange; + end; end; end; @@ -1303,6 +1561,34 @@ begin Style := TSpkPaneStyle((Sender as TCombobox).ItemIndex); end; +procedure TfrmAppearanceEditWindow.cbPopupCheckedGradientKindChange( + Sender: TObject); +begin + with tbPreview.Appearance.Popup do + CheckedGradientType := TBackgroundKind((Sender as TCombobox).ItemIndex); +end; + +procedure TfrmAppearanceEditWindow.cbPopupGutterGradientKindChange( + Sender: TObject); +begin + with tbPreview.Appearance.Popup do + GutterGradientType := TBackgroundKind((Sender as TCombobox).ItemIndex); +end; + +procedure TfrmAppearanceEditWindow.cbPopupHotTrackGradientKindChange( + Sender: TObject); +begin + with tbPreview.Appearance.Popup do + HotTrackGradientType := TBackgroundKind((Sender as TCombobox).ItemIndex); +end; + +procedure TfrmAppearanceEditWindow.cbPopupIdleGradientKindChange( + Sender: TObject); +begin + with tbPreview.Appearance.Popup do + IdleGradientType := TBackgroundKind((Sender as TCombobox).ItemIndex); +end; + procedure TfrmAppearanceEditWindow.pPaneGradientToClick(Sender: TObject); begin if ChangeColor(Sender as TPanel) then @@ -1370,6 +1656,113 @@ begin end; end; +procedure TfrmAppearanceEditWindow.pPopupCheckedFrameColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.CheckedFrameColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupCheckedGradientFromColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.CheckedGradientFromColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupCheckedGradientToColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.CheckedGradientToColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupFontClick(Sender: TObject); +begin + if ChangeFont(Sender as TPanel) then + tbPreview.Appearance.Popup.CaptionFont.Assign((Sender as TPanel).Font); + tbPreview.ForceRepaint; +end; + +procedure TfrmAppearanceEditWindow.pPopupGutterFrameColorClick(Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.GutterFrameColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupGutterGradientFromColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.GutterGradientFromColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupGutterGradientToColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.GutterGradientToColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupHotTrackFrameColorClick(Sender: TObject + ); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.HotTrackFrameColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupHotTrackGradientFromColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.HotTrackGradientFromColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupHotTrackGradientToColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.HotTrackGradientToColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupIdleCaptionColorClick(Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.IdleCaptionColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupDisabledCaptionColorClick( + Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.DisabledCaptionColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupDividerLineColorClick(Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.DividerLineColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupIdleGradientFromColorClick(Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.IdleGradientFromColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupIdleGradientToColorClick(Sender: TObject); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.IdleGradientToColor := (Sender as TPanel).Color; +end; + +procedure TfrmAppearanceEditWindow.pPopupHotTrackCaptionColorClick(Sender: TObject + ); +begin + if ChangeColor(Sender as TPanel) then + tbPreview.Appearance.Popup.HotTrackCaptionColor := (Sender as TPanel).Color; +end; + function TfrmAppearanceEditWindow.PickColor(APanel: TPanel): Boolean; var screenDC: HDC; @@ -1509,20 +1902,20 @@ begin finally ico.Free; end; - + // --- imglist.GetBitmap(0, bTabFrameColor.Glyph); imglist.GetBitmap(0, bTabGradientFromColor.Glyph); imglist.GetBitmap(0, bTabGradientToColor.Glyph); imglist.GetBitmap(0, bActiveTabHeaderFontColor.Glyph); imglist.GetBitmap(0, bInactiveTabHeaderFontColor.Glyph); - + // --- imglist.GetBitmap(0, bPaneBorderDarkColor.Glyph); imglist.GetBitmap(0, bPaneBorderLightColor.Glyph); imglist.GetBitmap(0, bPaneGradientFromColor.Glyph); imglist.GetBitmap(0, bPaneGradientToColor.Glyph); imglist.GetBitmap(0, bPaneCaptionBackgroundColor.Glyph); imglist.GetBitmap(0, bPaneCaptionFontColor.Glyph); - + // --- imglist.GetBitmap(0, bItemIdleCaptionColor.Glyph); imglist.GetBitmap(0, bItemIdleFrameColor.Glyph); imglist.GetBitmap(0, bItemIdleGradientFromColor.Glyph); @@ -1543,7 +1936,7 @@ begin imglist.GetBitmap(0, bItemActiveGradientToColor.Glyph); imglist.GetBitmap(0, bItemActiveInnerDarkColor.Glyph); imglist.GetBitmap(0, bItemActiveInnerLightColor.Glyph); - + // --- imglist.GetBitmap(0, bMenuButtonIdleCaptionColor.Glyph); imglist.GetBitmap(0, bMenuButtonIdleFrameColor.Glyph); imglist.GetBitmap(0, bMenuButtonIdleGradientFromColor.Glyph); @@ -1558,6 +1951,25 @@ begin imglist.GetBitmap(0, bMenuButtonActiveFrameColor.Glyph); imglist.GetBitmap(0, bMenuButtonActiveGradientFromColor.Glyph); imglist.GetBitmap(0, bMenuButtonActiveGradientToColor.Glyph); + // --- + imglist.GetBitmap(0, bPopupIdleGradientFromColor.Glyph); + imglist.GetBitmap(0, bPopupIdleGradientToColor.Glyph); + imglist.GetBitmap(0, bPopupIdleCaptionColor.Glyph); + imglist.GetBitmap(0, bPopupDisabledCaptionColor.Glyph); + imglist.GetBitmap(0, bPopupDividerLineColor.Glyph); + + imglist.GetBitmap(0, bPopupHotTrackFrameColor.Glyph); + imglist.GetBitmap(0, bPopupHotTrackGradientFromColor.Glyph); + imglist.GetBitmap(0, bPopupHotTrackGradientToColor.Glyph); + imglist.GetBitmap(0, bPopupHotTrackCaptionColor.Glyph); + + imglist.GetBitmap(0, bPopupGutterFrameColor.Glyph); + imglist.GetBitmap(0, bPopupGutterGradientFromColor.Glyph); + imglist.GetBitmap(0, bPopupGutterGradientToColor.Glyph); + + imglist.GetBitmap(0, bPopupCheckedFrameColor.Glyph); + imglist.GetBitmap(0, bPopupCheckedGradientFromColor.Glyph); + imglist.GetBitmap(0, bPopupCheckedGradientToColor.Glyph); end; procedure TfrmAppearanceEditWindow.UpdateSizes;