From 47c02cf7e4d1c4d509341556db1d302356f99395 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Thu, 17 Nov 2016 22:01:53 +0000 Subject: [PATCH] SpkToolbar: Add property "Style" to TSpkToolbar for quick change of appearance style. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5362 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../spktoolbar/SpkToolbar/SpkToolbar.pas | 16 + .../spktoolbar/SpkToolbar/spkt_Appearance.pas | 336 +++++++++++----- .../spktoolbar/demos/actions/project1.lpi | 14 +- components/spktoolbar/demos/actions/unit1.lfm | 366 +++++------------- components/spktoolbar/demos/actions/unit1.pas | 15 + .../spktoolbar/demos/basic/Project1.res | Bin 138128 -> 138936 bytes .../designtime/spkte_AppearanceEditor.lfm | 44 ++- .../designtime/spkte_AppearanceEditor.pas | 11 +- 8 files changed, 409 insertions(+), 393 deletions(-) diff --git a/components/spktoolbar/SpkToolbar/SpkToolbar.pas b/components/spktoolbar/SpkToolbar/SpkToolbar.pas index bb43ea9c1..61bea4fbc 100644 --- a/components/spktoolbar/SpkToolbar/SpkToolbar.pas +++ b/components/spktoolbar/SpkToolbar/SpkToolbar.pas @@ -144,6 +144,9 @@ type FUpdating is controlled by user } FUpdating: boolean; + { Quick selection of different appearances } + FStyle: TSpkStyle; + FOnTabChanging: TSpkTabChangingEvent; FOnTabChanged: TNotifyEvent; @@ -309,6 +312,9 @@ type { Setter for property DisabledLargeImages } procedure SetDisabledLargeImages(const Value: TImageList); + { Setter for toolbar style, i.e. quick selection of new appearance theme } + procedure SetStyle(const Value: TSpkStyle); + public // ************************* @@ -381,6 +387,9 @@ type { Component background color } property Color: TColor read GetColor write SetColor default clSkyBlue; + { Appearance style - don't move after Appearance! } + property Style: TSpkStyle read FStyle write SetStyle default spkOffice2007Blue; + { Object containing attributes of toolbar appearance } property Appearance: TSpkToolbarAppearance read FAppearance write SetAppearance; @@ -1117,6 +1126,13 @@ begin Repaint; end; +procedure TSpkToolbar.SetStyle(const Value: TSpkStyle); +begin + FStyle := Value; + FAppearance.Reset(FStyle); + ForceRepaint; +end; + function TSpkToolbar.DoTabChanging(OldIndex, NewIndex: integer): boolean; begin Result := True; diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas index 47bc7c3cc..3c354fb36 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas @@ -24,7 +24,9 @@ type TSpkElementStyle = (esRounded, esRectangle); -type TSpkTabAppearance = class(TPersistent) + TSpkStyle = (spkOffice2007Blue, spkOffice2007Silver, spkMetroLight, spkMetroDark); + + TSpkTabAppearance = class(TPersistent) private FDispatch: TSpkBaseAppearanceDispatch; protected @@ -53,7 +55,7 @@ type TSpkTabAppearance = class(TPersistent) procedure SaveToXML(Node: TSpkXMLNode); procedure LoadFromXML(Node: TSpkXMLNode); destructor Destroy; override; - procedure Reset; + procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); published property TabHeaderFont: TFont read FTabHeaderFont write SetHeaderFont; property BorderColor: TColor read FBorderColor write SetBorderColor; @@ -75,7 +77,6 @@ type TSpkPaneAppearance = class(TPersistent) FGradientToColor: TColor; FGradientType: TBackgroundKind; FStyle: TSpkPaneStyle; - procedure SetCaptionBgColor(const Value: TColor); procedure SetCaptionFont(const Value: TFont); procedure SetBorderDarkColor(const Value: TColor); @@ -91,7 +92,7 @@ type TSpkPaneAppearance = class(TPersistent) procedure SaveToPascal(AList: TStrings); procedure SaveToXML(Node: TSpkXMLNode); procedure LoadFromXML(Node: TSpkXMLNode); - procedure Reset; + procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); published property BorderDarkColor: TColor read FBorderDarkColor write SetBorderDarkColor; property BorderLightColor: TColor read FBorderLightColor write SetBorderLightColor; @@ -159,7 +160,7 @@ type TSpkElementAppearance = class(TPersistent) procedure SaveToPascal(AList: TStrings); procedure SaveToXML(Node: TSpkXMLNode); procedure LoadFromXML(Node: TSpkXMLNode); - procedure Reset; + procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); published property CaptionFont: TFont read FCaptionFont write SetCaptionFont; property IdleFrameColor: TColor read FIdleFrameColor write SetIdleFrameColor; @@ -200,7 +201,6 @@ type TSpkToolbarAppearance = class; TSpkToolbarAppearance = class(TPersistent) private FAppearanceDispatch: TSpkToolbarAppearanceDispatch; - protected FTab: TSpkTabAppearance; FPane: TSpkPaneAppearance; FElement: TSpkElementAppearance; @@ -208,12 +208,14 @@ type TSpkToolbarAppearance = class; procedure SetElementAppearance(const Value: TSpkElementAppearance); procedure SetPaneAppearance(const Value: TSpkPaneAppearance); procedure SetTabAppearance(const Value: TSpkTabAppearance); + protected + // public constructor Create(ADispatch: TSpkBaseAppearanceDispatch); reintroduce; destructor Destroy; override; procedure Assign(Source: TPersistent); override; procedure NotifyAppearanceChanged; - procedure Reset; + procedure Reset(AStyle: TSpkStyle = spkOffice2007Blue); procedure SaveToPascal(AList: TStrings); procedure SaveToXML(Node: TSpkXMLNode); procedure LoadFromXML(Node: TSpkXMLNode); @@ -223,7 +225,8 @@ type TSpkToolbarAppearance = class; property Element: TSpkElementAppearance read FElement write SetElementAppearance; end; - procedure SetDefaultFont(AFont: TFont); +procedure SetDefaultFont(AFont: TFont); + implementation @@ -319,15 +322,54 @@ begin FInactiveHeaderFontColor := Subnode.TextAsColor; end; -procedure TSpkTabAppearance.Reset; +procedure TSpkTabAppearance.Reset(AStyle: TSpkStyle); begin SetDefaultFont(FTabHeaderFont); - FTabHeaderFont.Size := FTabHeaderFont.Size; - FBorderColor := rgb(141, 178, 227); - FGradientFromColor := rgb(222, 232, 245); - FGradientToColor := rgb(199, 216, 237); - FGradientType := bkConcave; - FInactiveHeaderFontColor := FTabHeaderFont.Color; + + case AStyle of + spkOffice2007Blue: + begin + FTabHeaderFont.Color := rgb(21, 66, 139); + FBorderColor := rgb(141, 178, 227); + FGradientFromColor := rgb(222, 232, 245); + FGradientToColor := rgb(199, 216, 237); + FGradientType := bkConcave; + FInactiveHeaderFontColor := FTabHeaderFont.Color; + end; + + spkOffice2007Silver: + begin + FTabHeaderFont.Style := []; + FTabHeaderFont.Color := $007A534C; + FBorderColor := $00BEBEBE; + FGradientFromColor := $00F4F2F2; + FGradientToColor := $00EFE6E1; + FGradientType := bkConcave; + FInactiveHeaderFontColor := $007A534C; + end; + + spkMetroLight: + begin + FTabHeaderFont.Style := []; + FTabHeaderFont.Color := $0095572A; + FBorderColor := $00D2D0CF; + FGradientFromColor := $00F1F1F1; + FGradientToColor := $00F1F1F1; + FGradientType := bkSolid; + FInactiveHeaderFontColor := $00696969; + end; + + spkMetroDark: + begin + FTabHeaderFont.Style := []; + FTabHeaderFont.Color := $00FFFFFF; + FBorderColor := $00000000; + FGradientFromColor := $00464646; + FGradientToColor := $00464646; + FGradientType := bkSolid; + FInactiveHeaderFontColor := $00787878; + end; + end; end; procedure TSpkTabAppearance.SaveToPascal(AList: TStrings); @@ -339,7 +381,7 @@ begin Add(' GradientFromColor := $' + IntToHex(FGradientFromColor, 8) + ';'); Add(' GradientToColor := $' + IntToHex(FGradientToColor, 8) + ';'); Add(' GradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FGradientType)) + ';'); - Add(' InactiveTabHeaderFontColor := $' + IntToHex(FInactiveHeaderFontColor, 8) + ';'); + Add(' InactiveHeaderFontColor := $' + IntToHex(FInactiveHeaderFontColor, 8) + ';'); Add(' end;'); end; end; @@ -494,16 +536,63 @@ begin FStyle := TSpkPaneStyle(SubNode.TextAsInteger); end; -procedure TSpkPaneAppearance.Reset; +procedure TSpkPaneAppearance.Reset(AStyle: TSpkStyle = spkOffice2007Blue); begin SetDefaultFont(FCaptionFont); - FBorderDarkColor := rgb(158, 190, 218); - FBorderLightColor := rgb(237, 242, 248); - FCaptionBgColor := rgb(194, 217, 241); - FGradientFromColor := rgb(222, 232, 245); - FGradientToColor := rgb(199, 216, 237); - FGradientType := bkConcave; - FStyle := psRectangleEtched; + + case AStyle of + spkOffice2007Blue: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := rgb(21, 66, 139); + FBorderDarkColor := rgb(158, 190, 218); + FBorderLightColor := rgb(237, 242, 248); + FCaptionBgColor := rgb(194, 217, 241); + FGradientFromColor := rgb(222, 232, 245); + FGradientToColor := rgb(199, 216, 237); + FGradientType := bkConcave; + FStyle := psRectangleEtched; + end; + + spkOffice2007Silver: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $00363636; + FBorderDarkColor := $00A6A6A6; + FBorderLightColor := $00FFFFFF; + FCaptionBgColor := $00E4E4E4; + FGradientFromColor := $00F8F8F8; + FGradientToColor := $00E9E9E9; + FGradientType := bkConcave; + FStyle := psRectangleEtched; + end; + + spkMetroLight: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $00696969; + FBorderDarkColor := $00D2D0CF; + FBorderLightColor := $00F8F2ED; + FCaptionBgColor := $00F1F1F1; + FGradientFromColor := $00F1F1F1; + FGradientToColor := $00F1F1F1; + FGradientType := bkSolid; + FStyle := psDividerFlat; + end; + + spkMetroDark: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $00FFFFFF; + FBorderDarkColor := $008C8482; + FBorderLightColor := $00A29D9B; + FCaptionBgColor := $00464646; + FGradientFromColor := $00464646; + FGradientToColor := $00F1F1F1; + FGradientType := bkSolid; + FStyle := psDividerFlat; + end; + end; end; procedure TSpkPaneAppearance.SaveToPascal(AList: TStrings); @@ -517,7 +606,7 @@ begin Add(' GradientFromColor := $' + IntToHex(FGradientFromColor, 8) + ';'); Add(' GradientToColor := $' + IntToHex(FGradientToColor, 8) + ';'); Add(' GradientType := ' + GetEnumName(TypeInfo(TBackgroundKind), ord(FGradientType)) + ';'); - Add(' Style := ' + GetEnumName(TypeInfo(TSpkPaneStyle), ord(FStyle))); + Add(' Style := ' + GetEnumName(TypeInfo(TSpkPaneStyle), ord(FStyle)) +';'); Add(' end;'); end; end; @@ -769,32 +858,121 @@ begin FStyle := TSpkElementStyle(Subnode.TextAsInteger); end; -procedure TSpkElementAppearance.Reset; +procedure TSpkElementAppearance.Reset(AStyle: TSpkStyle = spkOffice2007Blue); begin SetDefaultFont(FCaptionFont); - FCaptionFont.Size := FCaptionFont.Size; - FIdleFrameColor := rgb(155, 183, 224); - FIdleGradientFromColor := rgb(200, 219, 238); - FIdleGradientToColor := rgb(188, 208, 233); - FIdleGradientType := bkConcave; - FIdleInnerLightColor := rgb(213, 227, 241); - FIdleInnerDarkColor := rgb(190, 211, 236); - FIdleCaptionColor := rgb(86, 125, 177); - FHotTrackFrameColor := rgb(221, 207, 155); - FHotTrackGradientFromColor := rgb(255, 252, 218); - FHotTrackGradientToColor := rgb(255, 215, 77); - FHotTrackGradientType := bkConcave; - FHotTrackInnerLightColor := rgb(255, 241, 197); - FHotTrackInnerDarkColor := rgb(216, 194, 122); - FHotTrackCaptionColor := rgb(111, 66, 135); - FActiveFrameColor := rgb(139, 118, 84); - FActiveGradientFromColor := rgb(254, 187, 108); - FActiveGradientToColor := rgb(252, 146, 61); - FActiveGradientType := bkConcave; - FActiveInnerLightColor := rgb(252, 169, 14); - FActiveInnerDarkColor := rgb(252, 169, 14); - FActiveCaptionColor := rgb(110, 66, 128); - FStyle := esRounded; + + case AStyle of + spkOffice2007Blue: + begin + FIdleFrameColor := rgb(155, 183, 224); + FIdleGradientFromColor := rgb(200, 219, 238); + FIdleGradientToColor := rgb(188, 208, 233); + FIdleGradientType := bkConcave; + FIdleInnerLightColor := rgb(213, 227, 241); + FIdleInnerDarkColor := rgb(190, 211, 236); + FIdleCaptionColor := rgb(86, 125, 177); + FHotTrackFrameColor := rgb(221, 207, 155); + FHotTrackGradientFromColor := rgb(255, 252, 218); + FHotTrackGradientToColor := rgb(255, 215, 77); + FHotTrackGradientType := bkConcave; + FHotTrackInnerLightColor := rgb(255, 241, 197); + FHotTrackInnerDarkColor := rgb(216, 194, 122); + FHotTrackCaptionColor := rgb(111, 66, 135); + FActiveFrameColor := rgb(139, 118, 84); + FActiveGradientFromColor := rgb(254, 187, 108); + FActiveGradientToColor := rgb(252, 146, 61); + FActiveGradientType := bkConcave; + FActiveInnerLightColor := rgb(252, 169, 14); + FActiveInnerDarkColor := rgb(252, 169, 14); + FActiveCaptionColor := rgb(110, 66, 128); + FStyle := esRounded; + end; + + spkOffice2007Silver: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $008B4215; + FIdleFrameColor := $00B8B1A9; + FIdleGradientFromColor := $00F4F4F2; + FIdleGradientToColor := $00E6E5E3; + FIdleGradientType := bkConcave; + FIdleInnerDarkColor := $00C7C0BA; + FIdleInnerLightColor := $00F6F2F0; + FIdleCaptionColor := $0060655F; + FHotTrackFrameColor := $009BCFDD; + FHotTrackGradientFromColor := $00DAFCFF; + FHotTrackGradientToColor := $004DD7FF; + FHotTrackGradientType := bkConcave; + FHotTrackInnerDarkColor := $007AC2D8; + FHotTrackInnerLightColor := $00C5F1FF; + FHotTrackCaptionColor := $0087426F; + FActiveFrameColor := $0054768B; + FActiveGradientFromColor := $006CBBFE; + FActiveGradientToColor := $003D92FC; + FActiveGradientType := bkConcave; + FActiveInnerDarkColor := $000EA9FC; + FActiveInnerLightColor := $000EA9FC; + FActiveCaptionColor := $0080426E; + FStyle := esRounded; + end; + + spkMetroLight: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $003F3F3F; + FIdleFrameColor := $00CDCDCD; + FIdleGradientFromColor := $00DFDFDF; + FIdleGradientToColor := $00DFDFDF; + FIdleGradientType := bkSolid; + FIdleInnerDarkColor := $00CDCDCD; + FIdleInnerLightColor := $00EBEBEB; + FIdleCaptionColor := $00696969; + FHotTrackFrameColor := $00F9CEA4; + FHotTrackGradientFromColor := $00F7EFE8; + FHotTrackGradientToColor := $00F7EFE8; + FHotTrackGradientType := bkSolid; + FHotTrackInnerDarkColor := $00F7EFE8; + FHotTrackInnerLightColor := $00F7EFE8; + FHotTrackCaptionColor := $003F3F3F; + FActiveFrameColor := $00E4A262; + FActiveGradientFromColor := $00F7E0C9; + FActiveGradientToColor := $00F7E0C9; + FActiveGradientType := bkSolid; + FActiveInnerDarkColor := $00F7E0C9; + FActiveInnerLightColor := $00F7E0C9; + FActiveCaptionColor := $002C2C2C; + FStyle := esRectangle; + end; + + spkMetroDark: + begin + FCaptionFont.Style := []; + FCaptionFont.Color := $003F3F3F; + FIdleFrameColor := $008C8482; + FIdleGradientFromColor := $00444444; + FIdleGradientToColor := $00444444; + FIdleGradientType := bkSolid; + FIdleInnerDarkColor := $008C8482; + FIdleInnerLightColor := $00444444; + FIdleCaptionColor := $00B6B6B6; + FHotTrackFrameColor := $00C4793C; + FHotTrackGradientFromColor := $00805B3D; + FHotTrackGradientToColor := $00805B3D; + FHotTrackGradientType := bkSolid; + FHotTrackInnerDarkColor := $00A56733; + FHotTrackInnerLightColor := $00A56733; + FHotTrackCaptionColor := $00F2F2F2; + FActiveFrameColor := $00000000; + FActiveGradientFromColor := $00000000; + FActiveGradientToColor := $00000000; + FActiveGradientType := bkSolid; + FActiveInnerDarkColor := $00000000; + FActiveInnerLightColor := $00000000; + FActiveCaptionColor := $00E4E4E4; + FStyle := esRectangle; + end; + end; end; procedure TSpkElementAppearance.SaveToPascal(AList: TStrings); @@ -1091,22 +1269,21 @@ end; { TSpkToolbarAppearance } procedure TSpkToolbarAppearance.Assign(Source: TPersistent); - -var Src : TSpkToolbarAppearance; - +var + Src: TSpkToolbarAppearance; begin if Source is TSpkToolbarAppearance then - begin - Src:=TSpkToolbarAppearance(Source); + begin + Src := TSpkToolbarAppearance(Source); - self.FTab.assign(Src.Tab); - self.FPane.assign(Src.Pane); - self.FElement.Assign(Src.Element); + self.FTab.Assign(Src.Tab); + self.FPane.Assign(Src.Pane); + self.FElement.Assign(Src.Element); - if FDispatch<>nil then - FDispatch.NotifyAppearanceChanged; - end else - raise AssignException.create('TSpkToolbarAppearance.Assign: Nie mogê przypisaæ obiektu '+Source.ClassName+' do TSpkToolbarAppearance!'); + if FDispatch <> nil then + FDispatch.NotifyAppearanceChanged; + end else + raise AssignException.create('TSpkToolbarAppearance.Assign: Nie mogê przypisaæ obiektu '+Source.ClassName+' do TSpkToolbarAppearance!'); end; constructor TSpkToolbarAppearance.Create(ADispatch : TSpkBaseAppearanceDispatch); @@ -1159,12 +1336,12 @@ begin FDispatch.NotifyAppearanceChanged; end; -procedure TSpkToolbarAppearance.Reset; +procedure TSpkToolbarAppearance.Reset(AStyle: TSpkStyle = spkOffice2007Blue); begin - FTab.Reset; - FPane.Reset; - FElement.Reset; - if assigned(FAppearanceDispatch) then + FTab.Reset(AStyle); + FPane.Reset(AStyle); + FElement.Reset(AStyle); + if Assigned(FAppearanceDispatch) then FAppearanceDispatch.NotifyAppearanceChanged; end; @@ -1194,43 +1371,22 @@ end; procedure TSpkToolbarAppearance.SetElementAppearance( const Value: TSpkElementAppearance); begin - FElement.assign(Value); + FElement.Assign(Value); end; procedure TSpkToolbarAppearance.SetPaneAppearance(const Value: TSpkPaneAppearance); begin - FPane.assign(Value); + FPane.Assign(Value); end; procedure TSpkToolbarAppearance.SetTabAppearance(const Value: TSpkTabAppearance); begin - FTab.assign(Value); + FTab.Assign(Value); end; procedure SetDefaultFont(AFont: TFont); begin AFont.Assign(Screen.MenuFont); - { - if Screen.Fonts.IndexOf('Calibri') >= 0 then - begin - AFont.Name := 'Calibri'; - AFont.Size := 9; - end - else if Screen.Fonts.IndexOf('Verdana') >= 0 then - begin - AFont.Name := 'Verdana'; - AFont.Size := 8; - end else - begin - AFont.Name := 'Arial'; - AFont.Size := 8; - end; - AFont.Style := []; - AFont.Charset := DEFAULT_CHARSET; - AFont.Orientation := 0; - AFont.Pitch := fpDefault; - } - AFont.Color := rgb(21, 66, 139); end; end. diff --git a/components/spktoolbar/demos/actions/project1.lpi b/components/spktoolbar/demos/actions/project1.lpi index a507e72dc..8ea74fdeb 100644 --- a/components/spktoolbar/demos/actions/project1.lpi +++ b/components/spktoolbar/demos/actions/project1.lpi @@ -1,7 +1,7 @@ - + - + @@ -13,9 +13,6 @@ - - - @@ -41,7 +38,6 @@ - @@ -78,12 +74,6 @@ - - - - - - diff --git a/components/spktoolbar/demos/actions/unit1.lfm b/components/spktoolbar/demos/actions/unit1.lfm index 9a8f7a8e4..d4691ebc8 100644 --- a/components/spktoolbar/demos/actions/unit1.lfm +++ b/components/spktoolbar/demos/actions/unit1.lfm @@ -9,7 +9,7 @@ object Form1: TForm1 Menu = MainMenu OnCloseQuery = FormCloseQuery OnCreate = FormCreate - LCLVersion = '1.1' + LCLVersion = '1.7' object ToolBar1: TToolBar Left = 0 Height = 26 @@ -31,6 +31,7 @@ object Form1: TForm1 end object ToolButton3: TToolButton Left = 47 + Height = 22 Top = 0 Width = 10 Caption = 'ToolButton3' @@ -53,6 +54,7 @@ object Form1: TForm1 end object ToolButton7: TToolButton Left = 126 + Height = 22 Top = 0 Width = 10 Caption = 'ToolButton7' @@ -76,9 +78,9 @@ object Form1: TForm1 TabOrder = 1 object Label1: TLabel Left = 16 - Height = 16 + Height = 15 Top = 8 - Width = 35 + Width = 34 Caption = 'Label1' ParentColor = False end @@ -94,15 +96,16 @@ object Form1: TForm1 Appearance.Tab.GradientFromColor = 16115934 Appearance.Tab.GradientToColor = 15587527 Appearance.Tab.GradientType = bkConcave + Appearance.Tab.InactiveTabHeaderFontColor = 9126421 + Appearance.Pane.BorderDarkColor = 14335646 + Appearance.Pane.BorderLightColor = 16315117 + Appearance.Pane.CaptionBgColor = 15849922 Appearance.Pane.CaptionFont.Color = 11168318 Appearance.Pane.CaptionFont.Height = -12 Appearance.Pane.CaptionFont.Name = 'Calibri' - Appearance.Pane.BorderDarkColor = 14335646 - Appearance.Pane.BorderLightColor = 16315117 Appearance.Pane.GradientFromColor = 16115934 Appearance.Pane.GradientToColor = 15587527 Appearance.Pane.GradientType = bkConcave - Appearance.Pane.CaptionBgColor = 15849922 Appearance.Element.CaptionFont.Color = 9126421 Appearance.Element.CaptionFont.Height = -12 Appearance.Element.CaptionFont.Name = 'Calibri' @@ -127,7 +130,8 @@ object Form1: TForm1 Appearance.Element.ActiveInnerLightColor = 961020 Appearance.Element.ActiveInnerDarkColor = 961020 Appearance.Element.ActiveCaptionColor = 8405614 - TabIndex = 0 + Appearance.Element.Style = esRounded + TabIndex = 2 Images = ImageList LargeImages = LargeImageList Tabs = ( @@ -143,15 +147,16 @@ object Form1: TForm1 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 CustomAppearance.Tab.GradientType = bkConcave + CustomAppearance.Tab.InactiveTabHeaderFontColor = 9126421 + CustomAppearance.Pane.BorderDarkColor = 14335646 + CustomAppearance.Pane.BorderLightColor = 16315117 + CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 11168318 CustomAppearance.Pane.CaptionFont.Height = -12 CustomAppearance.Pane.CaptionFont.Name = 'Calibri' - CustomAppearance.Pane.BorderDarkColor = 14335646 - CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave - CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Element.CaptionFont.Color = 9126421 CustomAppearance.Element.CaptionFont.Height = -12 CustomAppearance.Element.CaptionFont.Name = 'Calibri' @@ -176,6 +181,7 @@ object Form1: TForm1 CustomAppearance.Element.ActiveInnerLightColor = 961020 CustomAppearance.Element.ActiveInnerDarkColor = 961020 CustomAppearance.Element.ActiveCaptionColor = 8405614 + CustomAppearance.Element.Style = esRounded Caption = 'File' OverrideAppearance = False Visible = True @@ -227,15 +233,16 @@ object Form1: TForm1 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 CustomAppearance.Tab.GradientType = bkConcave + CustomAppearance.Tab.InactiveTabHeaderFontColor = 9126421 + CustomAppearance.Pane.BorderDarkColor = 14335646 + CustomAppearance.Pane.BorderLightColor = 16315117 + CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 11168318 CustomAppearance.Pane.CaptionFont.Height = -12 CustomAppearance.Pane.CaptionFont.Name = 'Calibri' - CustomAppearance.Pane.BorderDarkColor = 14335646 - CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave - CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Element.CaptionFont.Color = 9126421 CustomAppearance.Element.CaptionFont.Height = -12 CustomAppearance.Element.CaptionFont.Name = 'Calibri' @@ -260,6 +267,7 @@ object Form1: TForm1 CustomAppearance.Element.ActiveInnerLightColor = 961020 CustomAppearance.Element.ActiveInnerDarkColor = 961020 CustomAppearance.Element.ActiveCaptionColor = 8405614 + CustomAppearance.Element.Style = esRounded Caption = 'Edit' OverrideAppearance = False Visible = True @@ -323,15 +331,16 @@ object Form1: TForm1 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 CustomAppearance.Tab.GradientType = bkConcave + CustomAppearance.Tab.InactiveTabHeaderFontColor = 9126421 + CustomAppearance.Pane.BorderDarkColor = 14335646 + CustomAppearance.Pane.BorderLightColor = 16315117 + CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 11168318 CustomAppearance.Pane.CaptionFont.Height = -12 CustomAppearance.Pane.CaptionFont.Name = 'Calibri' - CustomAppearance.Pane.BorderDarkColor = 14335646 - CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave - CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Element.CaptionFont.Color = 9126421 CustomAppearance.Element.CaptionFont.Height = -12 CustomAppearance.Element.CaptionFont.Name = 'Calibri' @@ -356,6 +365,7 @@ object Form1: TForm1 CustomAppearance.Element.ActiveInnerLightColor = 961020 CustomAppearance.Element.ActiveInnerDarkColor = 961020 CustomAppearance.Element.ActiveCaptionColor = 8405614 + CustomAppearance.Element.Style = esRounded Caption = 'Options' OverrideAppearance = False Visible = True @@ -369,6 +379,7 @@ object Form1: TForm1 Items = ( 'SpkRadioButton1' 'SpkRadioButton2' + 'SpkSmallButton3' ) object SpkRadioButton1: TSpkRadioButton Visible = True @@ -392,6 +403,18 @@ object Form1: TForm1 TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem end + object SpkSmallButton3: TSpkSmallButton + Visible = True + Enabled = True + Caption = 'Style' + ShowCaption = True + TableBehaviour = tbContinuesRow + GroupBehaviour = gbSingleItem + HideFrameWhenIdle = False + ImageIndex = 6 + ButtonKind = bkDropdown + DropdownMenu = StyleMenu + end end object SpkPane5: TSpkPane Caption = 'Save settings' @@ -431,7 +454,7 @@ object Form1: TForm1 left = 166 top = 179 Bitmap = { - 4C69060000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + 4C69070000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000A8000000A7000000A4000000 A0280203A4972123B1E64042BDFA3C3EBBFA1D1FA9E80405919E0000862D0000 @@ -623,7 +646,39 @@ object Form1: TForm1 D3FF81D3D5FF82D3D5FF81D1D5FF81D1D6FF80CFD6FF80CFD7FF7FCCD5FF81DE EDFF89FEFFFF2968BAFFFFFFFF00FFFFFF000E4CCBDD2C9EE0EF2A96E0ED2796 E2ED2795DFED2794DCED2691DBED268FD9ED268DD7ED258BD5ED2489D3ED2684 - CDED2885CCEF0C359CE1FFFFFF00 + CDED2885CCEF0C359CE1FFFFFF003378B5003378B5003176B4002F75B3332C72 + B1A72B70B0FF2A6FAFFF3275B3FF3B7CB8FF296EAFFF2B71B0E32E73B26E3176 + B4003278B5003378B5003378B5003378B5003176B3002C73B1D24D8BBFFF84B2 + D8FFABCBE6FFBFD8EDFFBED5ECFFBED3ECFFBFD3EDFFA3C1E2FF5F95C7FF2A70 + B0FF2F75B3463277B5003378B5003176B4002D74B0E47FB6D4FFC0E5EFFFA2CF + E5FF5BC1E5FF00C3FFFF4EC2EDFF4DCDE7FF00FFFFFF47E1F3FFB7D1ECFFA0C7 + E6FF3275B4FF2F75B35A3277B5002E75B2AA79B0D1FF4D8AE6FF0025F2FF4584 + E1FF00CCFFFF00C4FFFF00BEFFFF00FFFFFF00FCFFFF00FFFFFF5596D8FF94BF + EDFFA7C8ECFF3577B6FF3075B40B2B72B0FFAFDFECFF0127F3FF092EF1FF0A25 + F0FF51BAE1FF00C7FFFF59BDE5FF3CD8EDFF00FFFFFF3CD7F0FF51BACCFF00DA + 83FF46C8C1FF7AA6D8FF2E72B2A93E80B8FF7EC8E5FF4586E4FF0527F2FF4786 + E4FF5BAFD7FF5AA9D8FF5AA8D9FF5AA6DAFF5BA4DBFF5EA1E1FF00DB84FF00D9 + 8BFF00DC87FFB1D4F9FF2C71B2FF5390C1FF73C1E7FF57B5DEFF5AB8DDFF59B5 + DDFF57B1DEFF56ADDDFF418CC5FF3A80BCFF3D83BFFF56A0DEFF49C3C8FF00DE + 93FF48C3CCFF7CC4FEFF2B71B7FF3076B5FF5AB6E3FF5DB9E5FF5DB8E4FF5CB7 + E3FF5CB7E4FF428FC7FF2B669DAE16344F4F265C8E8D3C85C3FF59B4F7FF83B1 + A9FFD38C00FF91AE8BFF2773C0FF2558857E3074B2FF2F72B0FF3176B3FF3A83 + BDFF57B0DFFF3A84BEFF1B42653E000000071E4A71373D84C1FF55BCFAFFCF8D + 00FFC89000FFD29400FF2675C5FF00000013000000330000003300000033275D + 90913D8AC3FF5E98C8FF296DAA752C73B223286DAC9D6CA4D2FF56BEF6FF7DAD + A5FFCE8E00FF89A987FF2974BEF73378B5003378B5003378B5003378B5002354 + 80433986C0FFADD9F0FF5492C6FF4988BEFF68A2CEFFB6E1F5FF5BBEEDFF5BC1 + F8FF5CC6FFFF449DDEFF2A6AA7BA3378B5003378B5003378B5003378B5000000 + 000A2E74B3FF97DCF7FFC6EDFAFFC5ECFAFFBEE9FAFF79CBEEFF62C3EBFF66C7 + EFFF62BFEBFF3177B6FF0C1E2D2C3378B5003378B5003378B5003378B5003277 + B4002D71B0FF6CD0F5FF66CAF1FF65CAF0FF66CAF1FF69CCF1FF6DCFF3FF55AA + DAFF3277B3FF2456837C000000023378B5003378B5003378B5003378B5003377 + B5003074B2FF3F8AC1FF3C86BFFF3C86BEFF3D87C0FF3075B3FF2E70AFFF2D6C + A7C91B42645D000000123378B500000000000000000000000000000000000000 + 0000000000330000003300000033000000330000003300000033000000330000 + 00260000000A0000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00 } end object LargeImageList: TImageList @@ -1493,243 +1548,27 @@ object Form1: TForm1 Caption = 'File' object MenuItem4: TMenuItem Action = AcOpen - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000000000000000 - 0013000000270000002F0000002F0000002F0000002F0000002F0000002F0000 - 002F0000002F0000002F0000002F0000002F0000002700000013000000130000 - 00490000007F0000008F0000008F0000008F0000008F0000008F0000008F0000 - 008F0000008F0000008F0000008F0000008F0000007F0000004986340068B546 - 00FFF65F00FFF65F00FFF65F00FFF65F00FFF65F00FFF65F00FFF65F00FFF65F - 00FFF65F00FFF65F00FFE12F00FFE35800FF441A00CC0000007FB54600FFFF74 - 12FFFF7A17FFFFA85EFFFFA75DFFFFA65BFFFFA458FFFFA254FFFFA050FFFF9D - 4BFFFF9B47FFFF9B47FFE54D23FFFF9B47FFF65F00FF0000008FB54600FFFF7E - 20FFFF7A17FFFFB271FFFFB170FFFFB16FFFFFAF6BFFFFAB65FFFFA85FFFFFA7 - 5CFFFFA457FFFFA253FFE55028FFFFA253FFF65F00FF0000008FB54600FFFF88 - 32FFFF7A17FFFFBE87FFFFBE86FFFFBC83FFFFBA7EFFFFB779FFFFB372FFFFB0 - 6CFFFFAD67FFFFAA62FFE5542FFFFFA95FFFF65F00FF0000008FB54600FFFF95 - 46FFFF7A17FFFFC89AFFFFC898FFFFC696FFFFC490FFFFC08BFFFFBD84FFFFB9 - 7DFFFFB676FFFFB271FFE55836FFFFB06CFFF65F00FF0000008FB54600FFFFA1 - 5BFFFF7A17FFFFD3ACFFFFD3ADFFFFD1A9FFFFCEA4FFFFCB9EFF574433FF4E3D - 35FF503D35FF503D34FF4C2E29FF503C35FF4B2D20FF000000DEB54600FFFFAE - 71FFFF7A17FFFFDCBEFFFFDCBEFFFFDAB9FFFFD8B5FFFFD5AFFFB29F9CFFEEEE - ECFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF2C2525F1B54600FFFFBB - 88FFFF7A17FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFAB9792FFFFFA - F1FFFFE5D7FFFFE6D8FFFFE6D8FFFFE3D5FFFFFFFCFF2E2A28E6B54600FFFFC9 - 9FFFFFB276FFFF7A17FFFF7A17FFFF7A17FFFF7A17FFFF7A17FFA98B7FFFFFEB - D5FFFFD5C1FFFFD7C3FFFFD7C3FFFFD2BEFFFFFAE8FF2E2B27DFB54600FFFFD5 - B5FFFFD5B5FFFFD5B4FFFFD6B5FFFFD5B3FFFFD5B3FFFFFFFFFFA78E81FFFFD8 - BDFFFFC1A8FFFFC4AAFFFFC4AAFFFFBFA5FFFFE8CFFF2F2C28DBB54600FFFFE0 - C7FFFFE0C7FFFFE0C7FFFFE0C7FFFFE0C7FFFFFFFFFFB54600FFA48270FFFFCD - AFFFFFC2A5FFFFC4A8FFFFC4A8FFFFBCA1FFFFE1C0FF2F2C27DBB54600FFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFB54600FF6A290083A2938CF5FFF3 - DFFFFFDECFFFFFE0D1FFFFE0D1FFFFDECAFFFFFAECFF2F302EDAB144004FB546 - 00FFB54600FFB54600FFB54600FFB54600FF8634006800000013A8A6A5FEFFFF - FFFFFFFCF4FFFFFCF6FFFFFCF6FFFFFCF4FFFFFFFFFF2F3333E1FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00393D3ECD7F7F - 80E1767675DD767675DD767675DD767675DD848383E3393D3E5C - } end object MenuItem14: TMenuItem Action = AcSave - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A432 - 24C2DA8959FBCD7A58FAB48485FAB98F91FAB78A8BFAB78888FAB78989FAB68A - 8BFAB78480FAD68A6EFAD97E4EFADA7C45FBAC3926D0FFFFFF00FFFFFF00D27B - 54FFFFC467FFEF9A5EFFD0C4C7FFD2CBCBFFD3CACBFFD7CECEFFD6CECEFFD5D0 - D3FFD4C2BDFFFDB98CFFFF9D46FFFF9727FFDC7F48FFFFFFFF00FFFFFF00D17A - 53FCFFB661FFED945EFFD4C2C4FFDA6045FFD7A096FFDBD7DAFFDCCECDFFDBD3 - D4FFD8BEBAFFF39469FFFE8E3EFFFF8F2AFFDC7A44FDFFFFFF00FFFFFF00D076 - 50FCFFBB67FFEF9B66FFDDD1D2FFE6401DFFE19D91FFE5EDEFFFE5DFDDFFE6E6 - E8FFE0CAC5FFF28254FFFD8D3EFFFF9833FFDB7842FDFFFFFF00FFFFFF00D076 - 4FFCFFBC6AFFF0A06DFFE6E6EAFFE59687FFE7CBC7FFEDFAFEFFEDF1F5FFEEFA - FEFFE6D8D4FFF06D3EFFFD8A3CFFFF9C3BFFDB7741FDFFFFFF00FFFFFF00D073 - 4DFCFFC071FFF39C68FFE8D2D0FFEAE9E7FFEBDFDCFFEBD9D5FFEBD9D6FFECE1 - DAFFE7C1B5FFEF5321FFFC8637FFFFA040FFDB763FFDFFFFFF00FFFFFF00D072 - 4AFCFFC57BFFFDA35FFFF7995BFFF89A5BFFF89757FFF89753FFF89450FFF894 - 4FFFF98F47FFFC8135FFFF913DFFFFA044FFDB743DFDFFFFFF00FFFFFF00D16E - 43FCFFCE93FFF8D8BEFFF8D7BAFFF7D4B5FFF5D2B3FFF2CFB0FFF1CDAEFFF1C9 - ABFFEFC9A9FFECCCADFFE8C4A9FFFBAF66FFDC7035FDFFFFFF00FFFFFF00D16C - 3EFCFED39EFFF5F8F8FFFCFFFFFFFCFFFFFFFCFFFFFFFAFDFFFFFAFBFDFFFAF7 - F9FFF9F4F4FFF9F2F3FFE9E6EAFFF2B374FFDD6F31FDFFFFFF00FFFFFF00D16C - 3EFCFDD29CFFF6F5F2FFFFFFFFFFFFFFFFFFFFFCFCFFFFF9F6FFFFF7F2FFFFF3 - EEFFFFF0E9FFFFF1EBFFF0E5E4FFF2B372FFDD6F2FFDFFFFFF00FFFFFF00D16B - 3CFCFCD29DFFF4F3F1FFFFFFFFFFFFFCFBFFFFF7F6FFFFF4F1FFFFF2EDFFFFEE - E8FFFFEEE7FFFFF3EFFFECE5E4FFF0B273FFDD6C2EFDFFFFFF00FFFFFF00D16B - 3CFCFBD29DFFF3F1F0FFFFFEFEFFFFF9F5FFFFF5F1FFFFF1EDFFFFEEE7FFFFED - E6FFFFEFE9FFFFF6F3FFEBE5E5FFF1B375FFDE6D2FFDFFFFFF00FFFFFF00D46D - 3DFDFAD4A0FFF2EFF0FFFFFEFFFFFFF8F6FFFFF5F1FFFFF1ECFFFFEFEBFFFFF3 - EEFFFFF5F3FFFFFCFBFFECEAEAFFE0A568FFD66525FDFFFFFF00FFFFFF00D067 - 38FFFFE1A7FFF7FAF3FFFFFFFFFFFFFFFAFFFFFFF5FFFFFCF2FFFFFEF6FFFFFF - FAFFFFFFFDFFFFFFFFFFF1F5EEFFE7B372FFD36122FFFFFFFF00FFFFFF009E19 - 0BABC75A35FBC3644EF5C36450F5C2634EF5C2624CF5C1624BF5C1614CF5C161 - 4CF5C0614CF5C0614CF5BC5E49F7C7562BFBA51E0ABBFFFFFF00 - } end object MenuItem13: TMenuItem Caption = '-' end object MenuItem12: TMenuItem Action = AcQuit - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000 - 8F000000850000007B0000007234070775A90E0F87F00C0F8EFC090C8BFC0809 - 7BF2030465B10000563C000058000000590000005E00FFFFFF00FFFFFF000000 - 8F000000840400007A781F229CFE252EC2FF1118D0FF0F15D4FF0C11D2FF0306 - C5FF080BB0FF0A0C88FF000058870000570A00005E00FFFFFF00FFFFFF000000 - 8E00000082733034B2FF2D3CDEFF1F25DAFF8989E9FFC6C5EFFFC8C7F0FF9192 - E8FF2223CCFF080AC1FF0D0F99FF0000588300005D01FFFFFF00FFFFFF000000 - 8A2E272BAAFB3C4EE5FF2228D9FFD8D6F2FFE2E3EFFF9592E4FF928FE3FFDEDD - F1FFE4E3F6FF2E2DC6FF090DBFFF0B0D88FD0000593AFFFFFF00FFFFFF000808 - 949F4958D8FF121FDEFFBAB7EAFFD2D0EDFF1B1BCDFF0000BDFF0000B7FF1413 - C1FFC8C7EAFFCBCCEEFF0709B6FF0E13B3FF030365B3FFFFFF00FFFFFF002023 - A9E93D56ECFF2832DAFFF4F3F0FF4A4BD6FF0004C8FF0B19C5FF0B14C1FF0001 - B6FF3D3CC8FFF5F4F5FF3938C0FF070ABDFF0A0B7FF2FFFFFF00FFFFFF003035 - B9FA334DF3FF3540D7FFE4E2EDFF5C5FDAFF5A5EE6FF9D9BE1FF9C9BE1FF2427 - DAFF2E2FD0FFE7E8F1FF504FC1FF0509BEFF0F118FFCFFFFFF00FFFFFF003137 - BBFA3C59FAFF2F38D6FFEAE8EEFF9494DDFF7372E4FFC4C4E8FFC7C7E8FF3231 - DBFF6667D8FFF1F1F4FF302FBBFF0E14C5FF121492FCFFFFFF00FFFFFF00181D - B1E790A3FCFFB8BEEEFFAFAED9FFE1E1F1FF5E5FC9FFBCBCE4FFBCBCE5FF3D3D - C2FFDEDEEFFFB5B4DDFF1E1FD5FF2A31DDFF0E0F85F0FFFFFF00FFFFFF000101 - A496A5A9E5FFFFFFFFFFACACDBFF9D9DCDFF7A7AC9FFC1C1E4FFBFBFE4FF5959 - C3FFA2A2CFFF4F4FCCFF4C4BF7FF3233D9FF020375ABFFFFFF00FFFFFF000000 - A32A3537BCF7E8EAFBFFFFFFFFFFD0D0EDFFB0B0E4FFC5C5E3FFC5C5E2FF7474 - D8FF7373E3FF7271F0FF6062FAFF17199FFC00007132FFFFFF00FFFFFF000000 - A7000000A3675054C9FFE9EBFBFFFFFFFFFFE1E1F1FFA1A0C6FF9A9AC3FF9F9F - E9FFADAEFFFF8486F9FF2E31B6FF0000787600007800FFFFFF00FFFFFF000000 - A8000000A7000000A1673336BCF5A1A4E3FFE4E6FBFFCCCEE7FFB8B8E5FFB4B7 - FAFF7377DFFF2326A9FB00007F7600007B0400007800FFFFFF00FFFFFF000000 - A8000000A7000000A4000000A0280203A4972123B1E64042BDFA3C3EBBFA1D1F - A9E80405919E0000862D0000830000007B0000007800FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } end end object MenuItem2: TMenuItem Caption = 'Edit' object MenuItem5: TMenuItem Action = AcEditCut - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 20000000000000040000640000006400000000000000000000001C1C19000000 - 0000000000002C2C25002020457134349FDA27279FDD0606296D000000000000 - 000000000000000000000000000000000000000000000000000036362C000000 - 0000000000002D2D3D406C6CE4FF5B5BEBFD3535B6E22F2FCFFF0606296A0000 - 000000000000000000000000000000000000000000000000000034342A000000 - 000000000000323251678A8AFFFF1A1A59AB050500073D3DA8D02424B0F00000 - 000D00000000000000000000000000000000000000000000000035352A000000 - 000000000000272728126161BDE76767D7F6303086C85252EDFC252595CF0000 - 00070000000000000000000000000000000000000000000000002F2F25061313 - 3B6E1F1F619D080819491414172C6666C6E88787FFFF292991DA1D1D1F1E0000 - 0000000000000000000000000000000000000000000000000000363674A77777 - F8FF6767E0FF4545D7FF0B0B45890D0D0E3E5555BCDF4141BDED04041A530000 - 00000000000000000000000000000000000000000000000000006666D6FF5B5B - C0EC0808082A3D3DA7C94747FFFF121281C87A7A8AD3CCCCE7FF70707BDF1C1C - 1C5606060624000000000000000000000000000000000000000047478CBC5353 - C2FC020208332E2E9EC14040D1F82E2EAFF29393D5FFB3B3A4FF999997FF9797 - 97FF969696F56A6A6AC42F2F2F71000000180000000000000000282828173F3F - 83B74949BCFF5353E4FF2424507E111113204E4E75AED3D3D0FFCACACAFF9999 - 99FFC0C0C0FFC8C8C8FFBFBFBFFF8D8D8DE625252562000000002A2A25003030 - 2800333347463131444C33332E00141410002E2E2A00B3B3B4DAE7E7E7FFA1A1 - A1F7464646867D7D7DA89F9F9FDBC0C0C0FFBABABAFF2F2F2F752A2A26003636 - 31003333300033332F0035353300141412002C2C2C006B6B6B74EDEDEDFFCDCD - CDFF252525600B0B0B002E2E2E073A3A3A2A5E5E5E61505050732D2D28003636 - 3100333333003333330035353300121210002D2D2D0032323211C6C6C6E6EDED - EDFF7B7B7BCE000000042D2D2D002B2B2B002C2C2C0030303000161614003535 - 3100363636003636360036363400272726002D2D2D002A2A2A005F5F5F60F7F7 - F7FFC6C6C6FF13131341040404002E2E2E003333330033333300000000000909 - 080014141400141414000C0C0B0022222200323232002B2B2B00282828008888 - 8898FEFEFEFF686868A8000000002D2D2D003333330033333300000000000000 - 0000000000000000000000000000010101001E1E1E002B2B2B002B2B2B002626 - 26028181818D989898DE1E1E1E142A2A2A003333330033333300FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } end object MenuItem16: TMenuItem Action = AcEditCopy - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 200000000000000400006400000064000000000000000000000086552300B78C - 61FBB4885CF9B38659F9B38556F9B38555F9B38454F9B58656F9A87744F99962 - 2BF9BF8D55F9C28C53F9C28B52F9C28C51F9C38F52FB91581ED2B5906BF4FFFF - FFFFFFFFF5FFFFFEEEFFFFFCE9FFFFF8E5FFFFF5DFFFFFFAE2FFF3DEBAFFC39E - 73FFFBF5E0FFFFF7E1FFFFF3DAFFFFF1D7FFFFFADFFFCF9D63F4B28C66F1FFFF - FFFFFFF5EDFFFFF2E6FFFFF0E1FFFFEEDDFFFFEBD7FFFFEFDAFFEDD5B5FFBD98 - 70FFF5EAD8FFFFECD9FFFFE8D2FFFFE5D0FFFFF0D7FFCC9962F1B4916EF1FFFF - FFFFFFF7EFFFFFF4E7FFFFF2E3FFFFEFE0FFFFEDD9FFFFF1DDFFEDD6B8FFBD98 - 70FFF5EBD9FFFFEEDAFFFFEAD3FFFFE8D1FFFFF1D9FFCB9963F1B89B7EF1FFFF - FFFFFFF9F2FFFFF6EDFFFFF4E8FFFFF1E4FFFFEFDEFFFFF3E2FFEDD8BCFFBD99 - 72FFF5ECDCFFFFF0DDFFFFEBD7FFFFE9D4FFFFF2DCFFCB9A64F1B89A7DF1FFFF - FFFFFFFBF8FFFFF8F1FFFFF6ECFFFFF4E8FFFFF1E2FFFFF5E7FFEDDAC0FFBD9A - 74FFF5EEDFFFFFF2E1FFFFEDDAFFFFEBD7FFFFF4E0FFCB9A65F1B89A7DF1FFFF - FFFFFFFDFBFFFFFAF6FFFFF8F1FFFFF6EDFFFFF4E7FFFFF7ECFFEDDCC4FFBD9B - 76FFF5F0E3FFFFF3E4FFFFEFDDFFFFEDDAFFFFF6E3FFCB9B66F1B89A7DF1FFFF - FFFFFFFFFFFFFFFEFBFFFFFBF5FFFFF8F1FFFFF6ECFFFFFAF0FFEDDEC8FFBD9C - 77FFF5F0E6FFFFF5E8FFFFF0E1FFFFEFDEFFFFF8E7FFCB9C68F1B89A7DF1FFFF - FFFFFFFFFFFFFFFFFFFFFFFDFBFFFFFAF5FFFFF7F0FFFFFCF3FFEEE3D0FFBEA2 - 83FFF5F1E8FFFFF6EAFFFFF1E3FFFFF0E0FFFFF9E9FFCB9C69F1BB9F83F2FFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF3ECE1FFC0A6 - 89FFF4EFE9FFFFF8EDFFFFF3E7FFFFF1E4FFFFFAEDFFCB9C6BF1AE8B6AF8F5ED - E3FFF2EADFFFE7DCD0FFE4D7C8FFE5D9CBFFE5D9CBFFE7DBCDFFD3BFAAFFBA9E - 80FFF8F4F0FFFFF9F0FFFFF4EAFFFFF3E7FFFFFCF0FFCB9C69F16D3B0C7E7A48 - 20B77C4923D3B5916DFFC4AD95FFC1A88FFFC1A88FFFC1A78DFFBEA289FFE2D6 - C9FFFFFEFBFFFFF8F0FFFFF7EDFFFFF4EAFFFFFEF3FFCEA77DF164300000632B - 000162290468DDC5ADFFFEFDFDFFFEFDFDFFFEFDFDFFFEFDFDFFFEFEFDFFFFFF - FDFFFFFBF6FFFFFAF3FFFFF8F0FFFFF5ECFFFFFFF6FFCFB18DF1653101005D26 - 000067300670E0C8B2FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE - FDFFFFFCFBFFFFFBF7FFFFFAF5FFFFF7F1FFFFFFFBFFD0B38FF15D2800005720 - 0000652E0671E3CDB6FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFD1B592F45F2B00005E2A - 0000602C002F9A6E40E5BD9871FBBA946CF9BA946CF9BA946CF9BA946CF9BA94 - 6CF9BA946CF9BA946BF9BA936BF9BA946BF9BD966EFB8F6032CA - } end object MenuItem15: TMenuItem Action = AcEditPaste - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF000E4C - CBDD2C9EE0EF2A96E0ED2796E2ED2795DFED2794DCED2691DBED268FD9ED268D - D7ED258BD5ED2489D3ED2684CDED2885CCEF0C359CE1FFFFFF00FFFFFF002879 - DDFF89FFFFFF83E4EDFF82D2D3FF81D3D5FF82D3D5FF81D1D5FF81D1D6FF80CF - D6FF80CFD7FF7FCCD5FF81DEEDFF89FEFFFF2968BAFFFFFFFF00FFFFFF002474 - E2FA6FD6EFFFAA9596FFD4ACA0FFD0ADA1FFCFAA9DFFCEA799FFCEA596FFCCA1 - 92FFCC9D8EFFCF9B88FFA78184FF6FD0EFFF2665C1FBFFFFFF00FFFFFF002075 - E7FA6AC6D5FFD6AC98FFFFF8EFFFFFF6E7FFFFF5E2FFFFF1DCFFFFEFD7FFFFEC - D2FFFFE9CBFFFFECC9FFD4917AFF69B9D2FF2164C6FBFFFFFF00FFFFFF001F72 - EAFA6DC7D7FFD3B3A0FFFFFBF3FFFFF5E9FFFFF4E6FFFFF0E2FFFFEFDCFFFFED - D7FFFFEAD2FFFFECD0FFD29883FF6BBCD4FF2161C9FBFFFFFF00FFFFFF001F6F - EDFA6AC5D7FFD4B3A3FFFFFCF8FFFFF7F0FFFFF5EAFFFFF1E4FFFFF0DFFFFFEE - DAFFFFEBD5FFFFEED3FFD19882FF6CBCD3FF205ECBFBFFFFFF00FFFFFF001E6E - F0FA60BDD7FFD0B3A5FFFFFCF9FFFFFBF9FFFFFAF5FFFFF6ECFFFFF2E5FFFFEF - E0FFFFECDAFFFFF0D9FFD39A83FF6BBAD2FF205DCEFBFFFFFF00FFFFFF001D6B - F3FA5EBBD7FFD0B3A4FFFFFDF9FFFFFDFCFFFFFCF9FFFFFBF6FFFFF7EFFFFFF1 - E6FFFFEFDFFFFFF2DEFFD39B84FF6AB9D2FF1F5AD2FBFFFFFF00FFFFFF001C69 - F5FA60BBD6FFD2B5A2FFFFFDF9FFFFFFFEFFFFFEFBFFFFFBF8FFFFFBF6FFFFF7 - F0FFFFF2E5FFFFF4E2FFD49D83FF6BB9D0FF1E5AD3FBFFFFFF00FFFFFF001B67 - F8FA50B7D5FFCDB5A1FFFFFDF9FFFFFFFFFFFFFFFFFFFFFDFCFFFFFCF9FFFFFB - F5FFFFF8F0FFFFFAEFFFD6A48CFF6FBAD0FF1E57D7FBFFFFFF00FFFFFF001B64 - FBFA37ADD4FFC6B5A2FFFFFEFAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFDFAFFD0AA9BFF54AFD0FF1E58DAFBFFFFFF00FFFFFF001A62 - FFFA31A7D5FFCDAF92FFFBF2DEFFD4E2D7FFDAE1D9FFDDDDD9FFDFDCD9FFE1D9 - D9FFDFDAD8FFFCEBDBFFCD9D88FF33A0D0FF1E5ADBFBFFFFFF00FFFFFF002062 - FDFC2EB2F6FF5E8DAFFF689363FF2E9522FF25891EFF2B821EFF2E7F1EFF317F - 1FFF32781BFF5D6E4FFF5C81AAFF2FB6F8FF255CDAFCFFFFFF00FFFFFF001E5B - FDFF37ABFFFF0991FFFF197FB7FF47AC39FF3DD133FF38C832FF39C935FF3ED4 - 37FF299415FF106B9FFF0894FDFF39AFFEFF2353D7FFFFFFFF00FFFFFF000638 - FF8C1448FCB51348F9B00E3CF4AB507675E0B2F6A0FFB7FFBEFFBCFFBFFFA3F1 - 96FF285F48E50D32D8AB133AD6B01637CEB40623C692FFFFFF00FFFFFF00002D - FF03001DFB0E001CF30C0017F603404F615398A266F18FB383EF77AF6FEF4D96 - 38F50B3C3A5A000BD3030009C30C0005BE0E0013BF03FFFFFF00 - } end end object MenuItem3: TMenuItem @@ -1756,43 +1595,30 @@ object Form1: TForm1 object MenuItem11: TMenuItem Action = AcSaveNow Caption = 'Save settings now' - Bitmap.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00A432 - 24C2DA8959FBCD7A58FAB48485FAB98F91FAB78A8BFAB78888FAB78989FAB68A - 8BFAB78480FAD68A6EFAD97E4EFADA7C45FBAC3926D0FFFFFF00FFFFFF00D27B - 54FFFFC467FFEF9A5EFFD0C4C7FFD2CBCBFFD3CACBFFD7CECEFFD6CECEFFD5D0 - D3FFD4C2BDFFFDB98CFFFF9D46FFFF9727FFDC7F48FFFFFFFF00FFFFFF00D17A - 53FCFFB661FFED945EFFD4C2C4FFDA6045FFD7A096FFDBD7DAFFDCCECDFFDBD3 - D4FFD8BEBAFFF39469FFFE8E3EFFFF8F2AFFDC7A44FDFFFFFF00FFFFFF00D076 - 50FCFFBB67FFEF9B66FFDDD1D2FFE6401DFFE19D91FFE5EDEFFFE5DFDDFFE6E6 - E8FFE0CAC5FFF28254FFFD8D3EFFFF9833FFDB7842FDFFFFFF00FFFFFF00D076 - 4FFCFFBC6AFFF0A06DFFE6E6EAFFE59687FFE7CBC7FFEDFAFEFFEDF1F5FFEEFA - FEFFE6D8D4FFF06D3EFFFD8A3CFFFF9C3BFFDB7741FDFFFFFF00FFFFFF00D073 - 4DFCFFC071FFF39C68FFE8D2D0FFEAE9E7FFEBDFDCFFEBD9D5FFEBD9D6FFECE1 - DAFFE7C1B5FFEF5321FFFC8637FFFFA040FFDB763FFDFFFFFF00FFFFFF00D072 - 4AFCFFC57BFFFDA35FFFF7995BFFF89A5BFFF89757FFF89753FFF89450FFF894 - 4FFFF98F47FFFC8135FFFF913DFFFFA044FFDB743DFDFFFFFF00FFFFFF00D16E - 43FCFFCE93FFF8D8BEFFF8D7BAFFF7D4B5FFF5D2B3FFF2CFB0FFF1CDAEFFF1C9 - ABFFEFC9A9FFECCCADFFE8C4A9FFFBAF66FFDC7035FDFFFFFF00FFFFFF00D16C - 3EFCFED39EFFF5F8F8FFFCFFFFFFFCFFFFFFFCFFFFFFFAFDFFFFFAFBFDFFFAF7 - F9FFF9F4F4FFF9F2F3FFE9E6EAFFF2B374FFDD6F31FDFFFFFF00FFFFFF00D16C - 3EFCFDD29CFFF6F5F2FFFFFFFFFFFFFFFFFFFFFCFCFFFFF9F6FFFFF7F2FFFFF3 - EEFFFFF0E9FFFFF1EBFFF0E5E4FFF2B372FFDD6F2FFDFFFFFF00FFFFFF00D16B - 3CFCFCD29DFFF4F3F1FFFFFFFFFFFFFCFBFFFFF7F6FFFFF4F1FFFFF2EDFFFFEE - E8FFFFEEE7FFFFF3EFFFECE5E4FFF0B273FFDD6C2EFDFFFFFF00FFFFFF00D16B - 3CFCFBD29DFFF3F1F0FFFFFEFEFFFFF9F5FFFFF5F1FFFFF1EDFFFFEEE7FFFFED - E6FFFFEFE9FFFFF6F3FFEBE5E5FFF1B375FFDE6D2FFDFFFFFF00FFFFFF00D46D - 3DFDFAD4A0FFF2EFF0FFFFFEFFFFFFF8F6FFFFF5F1FFFFF1ECFFFFEFEBFFFFF3 - EEFFFFF5F3FFFFFCFBFFECEAEAFFE0A568FFD66525FDFFFFFF00FFFFFF00D067 - 38FFFFE1A7FFF7FAF3FFFFFFFFFFFFFFFAFFFFFFF5FFFFFCF2FFFFFEF6FFFFFF - FAFFFFFFFDFFFFFFFFFFF1F5EEFFE7B372FFD36122FFFFFFFF00FFFFFF009E19 - 0BABC75A35FBC3644EF5C36450F5C2634EF5C2624CF5C1624BF5C1614CF5C161 - 4CF5C0614CF5C0614CF5BC5E49F7C7562BFBA51E0ABBFFFFFF00 - } end end end + object StyleMenu: TPopupMenu + left = 352 + top = 216 + object MenuItem17: TMenuItem + Caption = 'Office2007 blue' + OnClick = StyleMenuClick + end + object MenuItem18: TMenuItem + Tag = 1 + Caption = 'Office2007 silver' + OnClick = StyleMenuClick + end + object MenuItem19: TMenuItem + Tag = 2 + Caption = 'Metro light' + OnClick = StyleMenuClick + end + object MenuItem20: TMenuItem + Tag = 3 + Caption = 'Metro dark' + OnClick = StyleMenuClick + end + end end diff --git a/components/spktoolbar/demos/actions/unit1.pas b/components/spktoolbar/demos/actions/unit1.pas index 024fa781f..add693f5d 100644 --- a/components/spktoolbar/demos/actions/unit1.pas +++ b/components/spktoolbar/demos/actions/unit1.pas @@ -37,7 +37,11 @@ type MenuItem14: TMenuItem; MenuItem15: TMenuItem; MenuItem16: TMenuItem; + MenuItem17: TMenuItem; + MenuItem18: TMenuItem; + MenuItem19: TMenuItem; MenuItem2: TMenuItem; + MenuItem20: TMenuItem; MenuItem3: TMenuItem; MenuItem4: TMenuItem; MenuItem5: TMenuItem; @@ -46,18 +50,21 @@ type MenuItem8: TMenuItem; MenuItem9: TMenuItem; Panel1: TPanel; + StyleMenu: TPopupMenu; SpkCheckbox1: TSpkCheckbox; SpkLargeButton1: TSpkLargeButton; SpkLargeButton2: TSpkLargeButton; SpkLargeButton3: TSpkLargeButton; SpkPane1: TSpkPane; SpkPane2: TSpkPane; + SpkPane3: TSpkPane; SpkPane5: TSpkPane; SpkPane6: TSpkPane; SpkRadioButton1: TSpkRadioButton; SpkRadioButton2: TSpkRadioButton; SpkSmallButton1: TSpkSmallButton; SpkSmallButton2: TSpkSmallButton; + SpkSmallButton3: TSpkSmallButton; SpkSmallButton5: TSpkSmallButton; SpkSmallButton7: TSpkSmallButton; SpkTab1: TSpkTab; @@ -85,6 +92,7 @@ type procedure AcSaveNowExecute(Sender: TObject); procedure FormCloseQuery(Sender: TObject; var CanClose: boolean); procedure FormCreate(Sender: TObject); + procedure StyleMenuClick(Sender: TObject); private { private declarations } procedure LoadFromIni; @@ -183,11 +191,17 @@ begin ini := TMemIniFile.Create(ChangeFileExt(ParamStr(0), '.ini')); try SetUserInterface(ini.ReadBool('MainForm', 'RibbonInterface', AcRibbonGUI.Checked)); + SpkToolbar1.Style := TSpkStyle(ini.ReadInteger('MainForm', 'RibbonStyle', 0)); finally ini.Free; end; end; +procedure TForm1.StyleMenuClick(Sender: TObject); +begin + SpkToolbar1.Style := TSpkStyle((Sender as TMenuItem).Tag); +end; + procedure TForm1.SaveToIni; var ini: TCustomIniFile; @@ -195,6 +209,7 @@ begin ini := TMemIniFile.Create(ChangeFileExt(ParamStr(0), '.ini')); try ini.WriteBool('MainForm', 'RibbonInterface', AcRibbonGUI.Checked); + ini.WriteInteger('MainForm', 'RibbonStyle', ord(SpkToolbar1.Style)); finally ini.Free; end; diff --git a/components/spktoolbar/demos/basic/Project1.res b/components/spktoolbar/demos/basic/Project1.res index 7c6cf3e4be6fa881cb2f2caa9bda693328155c28..4ff746d8ad795966bb1af52e6626a7a90a04cb91 100644 GIT binary patch delta 806 zcmaKqzi-n(6vqvgPz96?spB=B7+!qmyR*-cW5I&d0Wm}(^VxStE!nY^GYt_!7U}?F zEB+FuvhX+YCltp{Q7CQ4_v`b%dhdIFx%cze-Z^@bJaQc5IL_78!S~g^02tLf;I_Aw!hhd?+BfYFSD-9PsY-gr*yK@iawUb!cO}9#ka$jUb~}jTn%oR>88mS z@9oe$9i22yJ@Gu7o#;~9ahYe!%2uWscN@Lgn`6(%n0s3*T@Mdn6stOawUSGnyq1O4 svG+ILxN;hMgTxz~d-2=Sj`}XW8L+xci*@3h&E2na_rc}deHb150U)dGcmMzZ delta 40 wcmdn7mt(?qjtL4(;>;VBw3xYV^b?DVQ*)DYD(#x<+1l&b7`NB6F 0 then