From 271196a1f6259e1e34991802899a4b5680f28a81 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Sat, 8 Jul 2017 20:35:49 +0000 Subject: [PATCH] spktoolbar: Use LCL scaling (for Laz >= 1.8) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5983 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../spktoolbar/SpkToolbar/SpkToolbar.pas | 96 ++++++++- .../spktoolbar/SpkToolbar/spkt_Appearance.pas | 2 +- .../spktoolbar/SpkToolbar/spkt_Buttons.pas | 5 + .../spktoolbar/SpkToolbar/spkt_Checkboxes.pas | 2 + .../spktoolbar/SpkToolbar/spkt_Const.pas | 6 +- .../spktoolbar/SpkToolbar/spkt_Pane.pas | 4 +- .../spktoolbar/demos/styles/project1.lpi | 1 + .../spktoolbar/demos/styles/project1.lpr | 5 +- components/spktoolbar/demos/styles/unit1.lfm | 202 ++++++------------ 9 files changed, 184 insertions(+), 139 deletions(-) diff --git a/components/spktoolbar/SpkToolbar/SpkToolbar.pas b/components/spktoolbar/SpkToolbar/SpkToolbar.pas index d46a30112..d7fd6c407 100644 --- a/components/spktoolbar/SpkToolbar/SpkToolbar.pas +++ b/components/spktoolbar/SpkToolbar/SpkToolbar.pas @@ -23,10 +23,10 @@ unit SpkToolbar; interface uses - LCLType, LMessages, Graphics, SysUtils, Controls, Classes, Math, Dialogs, - Forms, Types, SpkGraphTools, SpkGUITools, SpkMath, ExtCtrls, - spkt_Appearance, spkt_BaseItem, spkt_Const, spkt_Dispatch, spkt_Tab, - spkt_Pane, spkt_Types; + LCLType, LMessages, LCLVersion, Graphics, SysUtils, Controls, Classes, Math, + Dialogs, Forms, Types, ExtCtrls, + SpkGraphTools, SpkGUITools, SpkMath, spkt_Appearance, spkt_BaseItem, + spkt_Const, spkt_Dispatch, spkt_Tab, spkt_Pane, spkt_Types; type { Type describes regions of the toolbar which are used during handling @@ -315,6 +315,11 @@ type { Setter for toolbar style, i.e. quick selection of new appearance theme } procedure SetStyle(const Value: TSpkStyle); + {$IF lcl_fullversion >= 1080000} + procedure DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; + const AXProportion, AYProportion: Double); override; + {$ENDIF} + public // ************************* @@ -1783,4 +1788,87 @@ begin FMetricsValid := True; end; +{$IF lcl_fullversion >= 1080000} +procedure TSpkToolbar.DoAutoAdjustLayout(const AMode: TLayoutAdjustmentPolicy; + const AXProportion, AYProportion: Double); +begin + inherited; + + LargeButtonDropdownFieldSize := round(LARGEBUTTON_DROPDOWN_FIELD_SIZE * AXProportion); + LargeButtonGlyphMargin := round(LARGEBUTTON_GLYPH_MARGIN * AXProportion); + LargeButtonCaptionHMargin := round(LARGEBUTTON_CAPTION_HMARGIN * AXProportion); + LargeButtonMinWidth := round(LARGEBUTTON_MIN_WIDTH * AXProportion); + LargeButtonRadius := LARGEBUTTON_RADIUS; + LargeButtonBorderSize := round(LARGEBUTTON_BORDER_SIZE * AXProportion); + LargeButtonChevronHMargin := round(LARGEBUTTON_CHEVRON_HMARGIN * AXProportion); + LargeButtonCaptionTopRail := round(LARGEBUTTON_CAPTION_TOP_RAIL * AYProportion); + LargeButtonCaptionButtomRail := round(LARGEBUTTON_CAPTION_BOTTOM_RAIL * AYProportion); + + SmallButtonGlyphWidth := round(SMALLBUTTON_GLYPH_WIDTH * AXProportion); + SmallButtonBorderWidth := round(SMALLBUTTON_BORDER_WIDTH * AXProportion); + SmallButtonHalfBorderWidth := round(SMALLBUTTON_HALF_BORDER_WIDTH * AXProportion); + SmallButtonPadding := round(SMALLBUTTON_PADDING * AXProportion); + SmallButtonDropdownWidth := round(SMALLBUTTON_DROPDOWN_WIDTH * AXProportion); + SmallButtonRadius := SMALLBUTTON_RADIUS; + SmallButtonMinWidth := 2 * SmallButtonPadding + SmallButtonGlyphWidth; + + MaxElementHeight := round(MAX_ELEMENT_HEIGHT * AYProportion); + PaneRowHeight := round(PANE_ROW_HEIGHT * AYProportion); + PaneFullRowHeight := 3 * PaneRowHeight; + PaneOneRowTopPadding := round(PANE_ONE_ROW_TOPPADDING * AYProportion); + PaneOneRowBottomPadding := round(PANE_ONE_ROW_BOTTOMPADDING * AYProportion); + PaneTwoRowsVSpacer := round(PANE_TWO_ROWS_VSPACER * AYProportion); + PaneTwoRowsTopPadding := round(PANE_TWO_ROWS_TOPPADDING * AYProportion); + PaneTwoRowsBottomPadding := round(PANE_TWO_ROWS_BOTTOMPADDING * AYProportion); + PaneThreeRowsVSpacer := round(PANE_THREE_ROWS_VSPACER * AYProportion); + PaneThreeRowsTopPadding := round(PANE_THREE_ROWS_TOPPADDING * AYProportion); + PaneThreeRowsBottomPadding := round(PANE_THREE_ROWS_BOTTOMPADDING * AYProportion); + PaneFullRowTopPadding := PaneThreeRowsTopPadding; + PaneFullRowBottomPadding := PaneThreeRowsBottomPadding; + PaneLeftPadding := round(PANE_LEFT_PADDING * AXProportion); + PaneRightPadding := round(PANE_RIGHT_PADDING * AXProportion); + PaneColumnSpacer := round(PANE_COLUMN_SPACER * AXProportion); + PaneGroupSpacer := round(PANE_GROUP_SPACER * AXProportion); + + PaneCaptionHeight := round(PANE_CAPTION_HEIGHT * AYProportion); + PaneCornerRadius := PANE_CORNER_RADIUS; + PaneBorderSize := round(PANE_BORDER_SIZE * AXProportion); + PaneBorderHalfSize := round(PANE_BORDER_HALF_SIZE * AXProportion); + PaneHeight := MaxElementHeight + PaneCaptionHeight + 2 * PaneBorderSize; + PaneCaptionHMargin := round(PANE_CAPTION_HMARGIN * AXProportion); + + TabCornerRadius := TAB_CORNER_RADIUS; + TabPaneLeftPadding := round(TAB_PANE_LEFTPADDING * AXProportion); + TabPaneRightPadding := round(TAB_PANE_RIGHTPADDING * AXProportion); + TabPaneTopPadding := round(TAB_PANE_TOPPADDING * AYProportion); + TabPaneBottomPadding := round(TAB_PANE_BOTTOMPADDING * AYProportion); + TabPaneHSpacing := round(TAB_PANE_HSPACING * AXProportion); + TabBorderSize := round(TAB_BORDER_SIZE * AXProportion); + TabHeight := PaneHeight + TabPaneTopPadding + TabPaneBottomPadding + TabBorderSize; + + ToolbarBorderWidth := round(TOOLBAR_BORDER_WIDTH * AXProportion); + ToolbarCornerRadius := TOOLBAR_CORNER_RADIUS; + ToolbarTabCaptionsHeight := round(TOOLBAR_TAB_CAPTIONS_HEIGHT * AYProportion); + ToolbarTabCaptionsTextHPadding := round(TOOLBAR_TAB_CAPTIONS_TEXT_HPADDING * AXProportion); + ToolbarMinTabCaptionWidth := round(TOOLBAR_MIN_TAB_CAPTION_WIDTH * AXProportion); + ToolbarHeight := ToolbarTabCaptionsHeight + TabHeight; + + // scaling radius if not square + if LargeButtonRadius > 1 then + LargeButtonRadius := round(LargeButtonRadius * AXProportion); + + if SmallButtonRadius > 1 then + SmallButtonRadius := round(SmallButtonRadius * AXProportion); + + if PaneCornerRadius > 1 then + PaneCornerRadius := round(PaneCornerRadius * AXProportion); + + if TabCornerRadius > 1 then + TabCornerRadius := round(TabCornerRadius * AXProportion); + + if ToolbarCornerRadius > 1 then + ToolbarCornerRadius := round(ToolbarCornerRadius * AXProportion); +end; +{$ENDIF} + end. diff --git a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas index d6dbea9e1..0ba1682b5 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Appearance.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Appearance.pas @@ -1605,7 +1605,7 @@ end; procedure SetDefaultFont(AFont: TFont); begin - AFont.Assign(Screen.MenuFont); +// AFont.Assign(Screen.MenuFont); end; end. diff --git a/components/spktoolbar/SpkToolbar/spkt_Buttons.pas b/components/spktoolbar/SpkToolbar/spkt_Buttons.pas index 3832506a4..d8d65b7c1 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Buttons.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Buttons.pas @@ -1082,6 +1082,7 @@ begin // Text ABuffer.Canvas.Font.Assign(FAppearance.Element.CaptionFont); ABuffer.Canvas.Font.Color := fontColor; + SpkScaleFont(ABuffer.Canvas.Font); if FButtonKind in [bkButton, bkToggle] then FindBreakPlace(FCaption, breakPos, breakWidth) @@ -1147,6 +1148,7 @@ begin exit; Bitmap.Canvas.Font.Assign(FAppearance.Element.CaptionFont); + SpkScaleFont(Bitmap.Canvas.Font); Width := Bitmap.Canvas.TextWidth(FCaption); @@ -1239,6 +1241,7 @@ begin begin // Nie ³amiemy etykiety Bitmap.Canvas.Font.Assign(FAppearance.Element.CaptionFont); + SpkScaleFont(Bitmap.Canvas.Font); TextWidth := 2 * LargeButtonCaptionHMargin + Bitmap.Canvas.TextWidth(FCaption); end; @@ -1319,6 +1322,7 @@ begin if FShowCaption then begin Bitmap.Canvas.Font.Assign(FAppearance.Element.CaptionFont); + SpkScaleFont(Bitmap.Canvas.Font); TextWidth := Bitmap.Canvas.TextWidth(FCaption); BtnWidth := BtnWidth + SmallButtonPadding + TextWidth; @@ -1538,6 +1542,7 @@ begin begin ABuffer.Canvas.Font.Assign(FAppearance.Element.CaptionFont); ABuffer.Canvas.Font.Color := fontColor; + SpkScaleFont(ABuffer.Canvas.Font); if (FGroupBehaviour in [gbContinuesGroup, gbEndsGroup]) then x := FButtonRect.Left + SmallButtonHalfBorderWidth diff --git a/components/spktoolbar/SpkToolbar/spkt_Checkboxes.pas b/components/spktoolbar/SpkToolbar/spkt_Checkboxes.pas index d604af1a5..b04a9c786 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Checkboxes.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Checkboxes.pas @@ -200,6 +200,7 @@ begin exit; Bitmap.Canvas.Font.Assign(FAppearance.Element.CaptionFont); + SpkScaleFont(Bitmap.Canvas.Font); TextWidth := Bitmap.Canvas.TextWidth(FCaption); BtnWidth := SmallButtonPadding + SmallButtonGlyphWidth + @@ -333,6 +334,7 @@ begin // Text ABuffer.Canvas.Font.Assign(FAppearance.Element.CaptionFont); + SpkScaleFont(ABuffer.Canvas.Font); case FButtonState of bsIdle : fontColor := FAppearance.Element.IdleCaptionColor; diff --git a/components/spktoolbar/SpkToolbar/spkt_Const.pas b/components/spktoolbar/SpkToolbar/spkt_Const.pas index 71573ebb8..040bdd970 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Const.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Const.pas @@ -15,7 +15,7 @@ unit spkt_Const; interface uses - Graphics; + Graphics, LCLVersion; procedure SpkInitLayoutConsts(FromDPI: Integer; ToDPI: Integer = 0); function SpkScaleX(Size: Integer; FromDPI: Integer; ToDPI: Integer = 0): integer; @@ -260,7 +260,11 @@ var const + {$IF lcl_fullversion < 1080000} DPI_AWARE = true; + {$ELSE} + DPI_AWARE = false; // use lcl scaling instead + {$ENDIF} implementation diff --git a/components/spktoolbar/SpkToolbar/spkt_Pane.pas b/components/spktoolbar/SpkToolbar/spkt_Pane.pas index 270cea031..f343c3a87 100644 --- a/components/spktoolbar/SpkToolbar/spkt_Pane.pas +++ b/components/spktoolbar/SpkToolbar/spkt_Pane.pas @@ -314,8 +314,9 @@ begin true ); - // Etykieta tafli + // Pane label ABuffer.Canvas.Font.Assign(FAppearance.Pane.CaptionFont); + SpkScaleFont(ABuffer.Canvas.Font); x := FRect.Left + (FRect.Width - ABuffer.Canvas.TextWidth(FCaption)) div 2; y := FRect.Bottom - PaneBorderSize - PaneCaptionHeight + 1 + (PaneCaptionHeight - ABuffer.Canvas.TextHeight('Wy')) div 2; @@ -701,6 +702,7 @@ begin if tmpBitmap = nil then exit; tmpBitmap.Canvas.Font.Assign(FAppearance.Pane.CaptionFont); + SpkScaleFont(tmpBitmap.Canvas.Font); // *** Minimalna szerokoœæ tafli (tekstu) *** TextW := tmpBitmap.Canvas.TextWidth(FCaption); diff --git a/components/spktoolbar/demos/styles/project1.lpi b/components/spktoolbar/demos/styles/project1.lpi index 2ce524fde..e50016c04 100644 --- a/components/spktoolbar/demos/styles/project1.lpi +++ b/components/spktoolbar/demos/styles/project1.lpi @@ -7,6 +7,7 @@ + <Scaled Value="True"/> <ResourceType Value="res"/> <UseXPManifest Value="True"/> </General> diff --git a/components/spktoolbar/demos/styles/project1.lpr b/components/spktoolbar/demos/styles/project1.lpr index ced6d8255..ba4a8442b 100644 --- a/components/spktoolbar/demos/styles/project1.lpr +++ b/components/spktoolbar/demos/styles/project1.lpr @@ -7,12 +7,15 @@ uses cthreads, {$ENDIF}{$ENDIF} Interfaces, // this includes the LCL widgetset - Forms, Unit1 + LCLVersion, Forms, Unit1 { you can add units after this }; {$R *.res} begin + {$IF lcl_fullversion >= 1080000} + Application.Scaled := True; + {$ENDIF} RequireDerivedFormResource := True; Application.Initialize; Application.CreateForm(TForm1, Form1); diff --git a/components/spktoolbar/demos/styles/unit1.lfm b/components/spktoolbar/demos/styles/unit1.lfm index 6783f6f61..9fe6abe0e 100644 --- a/components/spktoolbar/demos/styles/unit1.lfm +++ b/components/spktoolbar/demos/styles/unit1.lfm @@ -7,15 +7,13 @@ object Form1: TForm1 ClientHeight = 660 ClientWidth = 506 Color = clMedGray - LCLVersion = '1.7' + LCLVersion = '1.9.0.0' object SpkToolbar1: TSpkToolbar Left = 0 Top = 0 Width = 506 Color = clMedGray Appearance.Tab.TabHeaderFont.Color = 9126421 - Appearance.Tab.TabHeaderFont.Height = -12 - Appearance.Tab.TabHeaderFont.Name = 'Segoe UI' Appearance.Tab.BorderColor = 14922381 Appearance.Tab.GradientFromColor = 16115934 Appearance.Tab.GradientToColor = 15587527 @@ -25,14 +23,10 @@ object Form1: TForm1 Appearance.Pane.BorderLightColor = 16315117 Appearance.Pane.CaptionBgColor = 15849922 Appearance.Pane.CaptionFont.Color = 9126421 - Appearance.Pane.CaptionFont.Height = -12 - Appearance.Pane.CaptionFont.Name = 'Segoe UI' Appearance.Pane.GradientFromColor = 16115934 Appearance.Pane.GradientToColor = 15587527 Appearance.Pane.GradientType = bkConcave Appearance.Element.CaptionFont.Color = clMenuText - Appearance.Element.CaptionFont.Height = -12 - Appearance.Element.CaptionFont.Name = 'Segoe UI' Appearance.Element.IdleFrameColor = 14727067 Appearance.Element.IdleGradientFromColor = 15653832 Appearance.Element.IdleGradientToColor = 15323324 @@ -64,8 +58,6 @@ object Form1: TForm1 ) object SpkTab1: TSpkTab CustomAppearance.Tab.TabHeaderFont.Color = 9126421 - CustomAppearance.Tab.TabHeaderFont.Height = -12 - CustomAppearance.Tab.TabHeaderFont.Name = 'Segoe UI' CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 @@ -75,14 +67,10 @@ object Form1: TForm1 CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 9126421 - CustomAppearance.Pane.CaptionFont.Height = -12 - CustomAppearance.Pane.CaptionFont.Name = 'Segoe UI' CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave CustomAppearance.Element.CaptionFont.Color = clMenuText - CustomAppearance.Element.CaptionFont.Height = -12 - CustomAppearance.Element.CaptionFont.Name = 'Segoe UI' CustomAppearance.Element.IdleFrameColor = 14727067 CustomAppearance.Element.IdleGradientFromColor = 15653832 CustomAppearance.Element.IdleGradientToColor = 15323324 @@ -141,22 +129,22 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Save' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 0 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButtonDropdown end object SpkSmallButton30: TSpkSmallButton Visible = True Enabled = True Caption = 'Save as...' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 1 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkLargeButton15: TSpkLargeButton @@ -181,53 +169,53 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Cut' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 2 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButton end object SpkSmallButton32: TSpkSmallButton Visible = True Enabled = True Caption = 'Copy' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 3 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton33: TSpkSmallButton Visible = True Enabled = True Caption = 'Paste' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 4 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton34: TSpkSmallButton Visible = True Enabled = True Caption = 'Select all' - ShowCaption = True - TableBehaviour = tbBeginsColumn GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsColumn ButtonKind = bkButton end object SpkSmallButton35: TSpkSmallButton Visible = True Enabled = True Caption = 'Unselect' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end end @@ -240,8 +228,6 @@ object Form1: TForm1 Color = clMedGray Style = spkOffice2007Silver Appearance.Tab.TabHeaderFont.Color = 8016716 - Appearance.Tab.TabHeaderFont.Height = -12 - Appearance.Tab.TabHeaderFont.Name = 'Segoe UI' Appearance.Tab.BorderColor = 12500670 Appearance.Tab.GradientFromColor = 16052978 Appearance.Tab.GradientToColor = 15722209 @@ -251,14 +237,10 @@ object Form1: TForm1 Appearance.Pane.BorderLightColor = clWhite Appearance.Pane.CaptionBgColor = 15000804 Appearance.Pane.CaptionFont.Color = 3552822 - Appearance.Pane.CaptionFont.Height = -12 - Appearance.Pane.CaptionFont.Name = 'Segoe UI' Appearance.Pane.GradientFromColor = 16316664 Appearance.Pane.GradientToColor = 15329769 Appearance.Pane.GradientType = bkConcave Appearance.Element.CaptionFont.Color = 9126421 - Appearance.Element.CaptionFont.Height = -12 - Appearance.Element.CaptionFont.Name = 'Segoe UI' Appearance.Element.IdleFrameColor = 12104105 Appearance.Element.IdleGradientFromColor = 16053490 Appearance.Element.IdleGradientToColor = 15132131 @@ -290,8 +272,6 @@ object Form1: TForm1 ) object SpkTab2: TSpkTab CustomAppearance.Tab.TabHeaderFont.Color = 9126421 - CustomAppearance.Tab.TabHeaderFont.Height = -12 - CustomAppearance.Tab.TabHeaderFont.Name = 'Segoe UI' CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 @@ -301,14 +281,10 @@ object Form1: TForm1 CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 9126421 - CustomAppearance.Pane.CaptionFont.Height = -12 - CustomAppearance.Pane.CaptionFont.Name = 'Segoe UI' CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave CustomAppearance.Element.CaptionFont.Color = clMenuText - CustomAppearance.Element.CaptionFont.Height = -12 - CustomAppearance.Element.CaptionFont.Name = 'Segoe UI' CustomAppearance.Element.IdleFrameColor = 14727067 CustomAppearance.Element.IdleGradientFromColor = 15653832 CustomAppearance.Element.IdleGradientToColor = 15323324 @@ -367,22 +343,22 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Save' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 0 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButtonDropdown end object SpkSmallButton23: TSpkSmallButton Visible = True Enabled = True Caption = 'Save as...' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 1 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkLargeButton13: TSpkLargeButton @@ -407,53 +383,53 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Cut' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 2 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButton end object SpkSmallButton25: TSpkSmallButton Visible = True Enabled = True Caption = 'Copy' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 3 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton26: TSpkSmallButton Visible = True Enabled = True Caption = 'Paste' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 4 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton27: TSpkSmallButton Visible = True Enabled = True Caption = 'Select all' - ShowCaption = True - TableBehaviour = tbBeginsColumn GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsColumn ButtonKind = bkButton end object SpkSmallButton28: TSpkSmallButton Visible = True Enabled = True Caption = 'Unselect' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end end @@ -466,8 +442,6 @@ object Form1: TForm1 Color = clMedGray Style = spkOffice2007SilverTurquoise Appearance.Tab.TabHeaderFont.Color = 8016716 - Appearance.Tab.TabHeaderFont.Height = -12 - Appearance.Tab.TabHeaderFont.Name = 'Segoe UI' Appearance.Tab.BorderColor = 12500670 Appearance.Tab.GradientFromColor = 16052978 Appearance.Tab.GradientToColor = 15722209 @@ -477,14 +451,10 @@ object Form1: TForm1 Appearance.Pane.BorderLightColor = clWhite Appearance.Pane.CaptionBgColor = 15000804 Appearance.Pane.CaptionFont.Color = 3552822 - Appearance.Pane.CaptionFont.Height = -12 - Appearance.Pane.CaptionFont.Name = 'Segoe UI' Appearance.Pane.GradientFromColor = 16316664 Appearance.Pane.GradientToColor = 15329769 Appearance.Pane.GradientType = bkConcave Appearance.Element.CaptionFont.Color = 9126421 - Appearance.Element.CaptionFont.Height = -12 - Appearance.Element.CaptionFont.Name = 'Segoe UI' Appearance.Element.IdleFrameColor = 12104105 Appearance.Element.IdleGradientFromColor = 16053490 Appearance.Element.IdleGradientToColor = 15132131 @@ -516,8 +486,6 @@ object Form1: TForm1 ) object SpkTab4: TSpkTab CustomAppearance.Tab.TabHeaderFont.Color = 9126421 - CustomAppearance.Tab.TabHeaderFont.Height = -12 - CustomAppearance.Tab.TabHeaderFont.Name = 'Segoe UI' CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 @@ -527,14 +495,10 @@ object Form1: TForm1 CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 9126421 - CustomAppearance.Pane.CaptionFont.Height = -12 - CustomAppearance.Pane.CaptionFont.Name = 'Segoe UI' CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave CustomAppearance.Element.CaptionFont.Color = clMenuText - CustomAppearance.Element.CaptionFont.Height = -12 - CustomAppearance.Element.CaptionFont.Name = 'Segoe UI' CustomAppearance.Element.IdleFrameColor = 14727067 CustomAppearance.Element.IdleGradientFromColor = 15653832 CustomAppearance.Element.IdleGradientToColor = 15323324 @@ -593,22 +557,22 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Save' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 0 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButtonDropdown end object SpkSmallButton16: TSpkSmallButton Visible = True Enabled = True Caption = 'Save as...' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 1 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkLargeButton11: TSpkLargeButton @@ -633,53 +597,53 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Cut' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 2 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButton end object SpkSmallButton18: TSpkSmallButton Visible = True Enabled = True Caption = 'Copy' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 3 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton19: TSpkSmallButton Visible = True Enabled = True Caption = 'Paste' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 4 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton20: TSpkSmallButton Visible = True Enabled = True Caption = 'Select all' - ShowCaption = True - TableBehaviour = tbBeginsColumn GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsColumn ButtonKind = bkButton end object SpkSmallButton21: TSpkSmallButton Visible = True Enabled = True Caption = 'Unselect' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end end @@ -692,8 +656,6 @@ object Form1: TForm1 Color = clMedGray Style = spkMetroLight Appearance.Tab.TabHeaderFont.Color = 9787178 - Appearance.Tab.TabHeaderFont.Height = -12 - Appearance.Tab.TabHeaderFont.Name = 'Segoe UI' Appearance.Tab.BorderColor = 13816015 Appearance.Tab.GradientFromColor = 15856113 Appearance.Tab.GradientToColor = 15856113 @@ -703,16 +665,12 @@ object Form1: TForm1 Appearance.Pane.BorderLightColor = 16315117 Appearance.Pane.CaptionBgColor = 15856113 Appearance.Pane.CaptionFont.Color = 6908265 - Appearance.Pane.CaptionFont.Height = -12 - Appearance.Pane.CaptionFont.Name = 'Segoe UI' Appearance.Pane.GradientFromColor = 15856113 Appearance.Pane.GradientToColor = 15856113 Appearance.Pane.GradientType = bkSolid Appearance.Pane.HotTrackBrightnessChange = 0 Appearance.Pane.Style = psDividerFlat Appearance.Element.CaptionFont.Color = 4144959 - Appearance.Element.CaptionFont.Height = -12 - Appearance.Element.CaptionFont.Name = 'Segoe UI' Appearance.Element.IdleFrameColor = 13487565 Appearance.Element.IdleGradientFromColor = 14671839 Appearance.Element.IdleGradientToColor = 14671839 @@ -743,8 +701,6 @@ object Form1: TForm1 ) object SpkTab5: TSpkTab CustomAppearance.Tab.TabHeaderFont.Color = 9126421 - CustomAppearance.Tab.TabHeaderFont.Height = -12 - CustomAppearance.Tab.TabHeaderFont.Name = 'Segoe UI' CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 @@ -754,14 +710,10 @@ object Form1: TForm1 CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 9126421 - CustomAppearance.Pane.CaptionFont.Height = -12 - CustomAppearance.Pane.CaptionFont.Name = 'Segoe UI' CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave CustomAppearance.Element.CaptionFont.Color = clMenuText - CustomAppearance.Element.CaptionFont.Height = -12 - CustomAppearance.Element.CaptionFont.Name = 'Segoe UI' CustomAppearance.Element.IdleFrameColor = 14727067 CustomAppearance.Element.IdleGradientFromColor = 15653832 CustomAppearance.Element.IdleGradientToColor = 15323324 @@ -820,22 +772,22 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Save' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 0 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButtonDropdown end object SpkSmallButton9: TSpkSmallButton Visible = True Enabled = True Caption = 'Save as...' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 1 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkLargeButton9: TSpkLargeButton @@ -860,53 +812,53 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Cut' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 2 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButton end object SpkSmallButton11: TSpkSmallButton Visible = True Enabled = True Caption = 'Copy' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 3 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton12: TSpkSmallButton Visible = True Enabled = True Caption = 'Paste' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 4 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton13: TSpkSmallButton Visible = True Enabled = True Caption = 'Select all' - ShowCaption = True - TableBehaviour = tbBeginsColumn GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsColumn ButtonKind = bkButton end object SpkSmallButton14: TSpkSmallButton Visible = True Enabled = True Caption = 'Unselect' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end end @@ -919,8 +871,6 @@ object Form1: TForm1 Color = clMedGray Style = spkMetroDark Appearance.Tab.TabHeaderFont.Color = clWhite - Appearance.Tab.TabHeaderFont.Height = -12 - Appearance.Tab.TabHeaderFont.Name = 'Segoe UI' Appearance.Tab.BorderColor = clBlack Appearance.Tab.GradientFromColor = 4605510 Appearance.Tab.GradientToColor = 4605510 @@ -930,16 +880,12 @@ object Form1: TForm1 Appearance.Pane.BorderLightColor = 10657179 Appearance.Pane.CaptionBgColor = 4605510 Appearance.Pane.CaptionFont.Color = clWhite - Appearance.Pane.CaptionFont.Height = -12 - Appearance.Pane.CaptionFont.Name = 'Segoe UI' Appearance.Pane.GradientFromColor = 4605510 Appearance.Pane.GradientToColor = 15856113 Appearance.Pane.GradientType = bkSolid Appearance.Pane.HotTrackBrightnessChange = 0 Appearance.Pane.Style = psDividerFlat Appearance.Element.CaptionFont.Color = 4144959 - Appearance.Element.CaptionFont.Height = -12 - Appearance.Element.CaptionFont.Name = 'Segoe UI' Appearance.Element.IdleFrameColor = 9208962 Appearance.Element.IdleGradientFromColor = 4473924 Appearance.Element.IdleGradientToColor = 4473924 @@ -971,8 +917,6 @@ object Form1: TForm1 ) object SpkTab6: TSpkTab CustomAppearance.Tab.TabHeaderFont.Color = 9126421 - CustomAppearance.Tab.TabHeaderFont.Height = -12 - CustomAppearance.Tab.TabHeaderFont.Name = 'Segoe UI' CustomAppearance.Tab.BorderColor = 14922381 CustomAppearance.Tab.GradientFromColor = 16115934 CustomAppearance.Tab.GradientToColor = 15587527 @@ -982,14 +926,10 @@ object Form1: TForm1 CustomAppearance.Pane.BorderLightColor = 16315117 CustomAppearance.Pane.CaptionBgColor = 15849922 CustomAppearance.Pane.CaptionFont.Color = 9126421 - CustomAppearance.Pane.CaptionFont.Height = -12 - CustomAppearance.Pane.CaptionFont.Name = 'Segoe UI' CustomAppearance.Pane.GradientFromColor = 16115934 CustomAppearance.Pane.GradientToColor = 15587527 CustomAppearance.Pane.GradientType = bkConcave CustomAppearance.Element.CaptionFont.Color = clMenuText - CustomAppearance.Element.CaptionFont.Height = -12 - CustomAppearance.Element.CaptionFont.Name = 'Segoe UI' CustomAppearance.Element.IdleFrameColor = 14727067 CustomAppearance.Element.IdleGradientFromColor = 15653832 CustomAppearance.Element.IdleGradientToColor = 15323324 @@ -1048,22 +988,22 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Save' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 0 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButtonDropdown end object SpkSmallButton1: TSpkSmallButton Visible = True Enabled = True Caption = 'Save as...' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 1 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkLargeButton6: TSpkLargeButton @@ -1088,53 +1028,53 @@ object Form1: TForm1 Visible = True Enabled = True Caption = 'Cut' - ShowCaption = True - TableBehaviour = tbContinuesRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 2 + ShowCaption = True + TableBehaviour = tbContinuesRow ButtonKind = bkButton end object SpkSmallButton4: TSpkSmallButton Visible = True Enabled = True Caption = 'Copy' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 3 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton5: TSpkSmallButton Visible = True Enabled = True Caption = 'Paste' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = True ImageIndex = 4 + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end object SpkSmallButton6: TSpkSmallButton Visible = True Enabled = True Caption = 'Select all' - ShowCaption = True - TableBehaviour = tbBeginsColumn GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsColumn ButtonKind = bkButton end object SpkSmallButton7: TSpkSmallButton Visible = True Enabled = True Caption = 'Unselect' - ShowCaption = True - TableBehaviour = tbBeginsRow GroupBehaviour = gbSingleItem HideFrameWhenIdle = False + ShowCaption = True + TableBehaviour = tbBeginsRow ButtonKind = bkButton end end