Skip to content

Commit 9ff3b72

Browse files
carloBarazzettacarloBarazzetta
committed
Renamed D11_0 folder to D11
Fixed menu size based on icon size Built with Delphi 11.1
1 parent b1f111f commit 9ff3b72

10 files changed

+105
-108
lines changed

‎Demo/Projects/D11_0/ModernAppDemo.dpr renamed to ‎Demo/Projects/D11/ModernAppDemo.dpr

File renamed without changes.

‎Demo/Projects/D11_0/ModernAppDemo.dproj renamed to ‎Demo/Projects/D11/ModernAppDemo.dproj

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{3A641B72-3BED-4F5E-9822-B594FF4EBCDC}</ProjectGuid>
4-
<ProjectVersion>19.3</ProjectVersion>
4+
<ProjectVersion>19.4</ProjectVersion>
55
<FrameworkType>VCL</FrameworkType>
66
<MainSource>ModernAppDemo.dpr</MainSource>
77
<Base>True</Base>
88
<Config Condition="'$(Config)'==''">Release</Config>
9-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
1010
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Application</AppType>
1212
</PropertyGroup>
@@ -65,14 +65,13 @@
6565
<DCC_ExeOutput>..\..\Bin</DCC_ExeOutput>
6666
<VerInfo_Locale>1033</VerInfo_Locale>
6767
<DCC_UnitSearchPath>..\..\..\Source;..\..\..\Ext\VCLStyleUtils\Common;..\..\..\Ext\VCLStyleUtils\DDetours\Source;..\..\..\..\SVGIconImageList\Source;..\..\..\..\SVGIconImageList\SVG;..\..\..\..\SVGIconImageList\Image32\Source;..\..\..\..\IconFontsImageList\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
68-
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileVersion=3.0.0.0;InternalName=;LegalCopyright=Copyright (c) 2020-2022 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductVersion=3.0;Comments=;ProgramID=;FileDescription=;ProductName=</VerInfo_Keys>
68+
<VerInfo_Keys>CompanyName=Ethea S.r.l.;FileVersion=3.0.1.0;InternalName=;LegalCopyright=Copyright (c) 2020-2022 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductVersion=3.0;Comments=;ProgramID=;FileDescription=;ProductName=</VerInfo_Keys>
6969
<DCC_Define>NO_VCLSTYLEUTILS;$(DCC_Define)</DCC_Define>
7070
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7171
<VerInfo_MajorVer>3</VerInfo_MajorVer>
72+
<VerInfo_Release>1</VerInfo_Release>
7273
</PropertyGroup>
7374
<PropertyGroup Condition="'$(Base_Win32)'!=''">
74-
<VerInfo_Locale>1033</VerInfo_Locale>
75-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7675
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
7776
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
7877
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
@@ -83,6 +82,8 @@
8382
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
8483
<BT_BuildType>Debug</BT_BuildType>
8584
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
85+
<Icon_MainIcon>..\Ethea_vela_multires.ico</Icon_MainIcon>
86+
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
8687
</PropertyGroup>
8788
<PropertyGroup Condition="'$(Cfg_1)'!=''">
8889
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -91,16 +92,21 @@
9192
<DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
9293
<DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
9394
<DCC_RemoteDebug>true</DCC_RemoteDebug>
95+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
96+
<DCC_RangeChecking>true</DCC_RangeChecking>
9497
</PropertyGroup>
9598
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
9699
<BT_BuildType>Debug</BT_BuildType>
97-
<VerInfo_Locale>1033</VerInfo_Locale>
98100
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
101+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
99102
<DCC_RemoteDebug>false</DCC_RemoteDebug>
103+
<DCC_RangeChecking>true</DCC_RangeChecking>
100104
</PropertyGroup>
101105
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
102106
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
103107
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
108+
<DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
109+
<DCC_RangeChecking>true</DCC_RangeChecking>
104110
</PropertyGroup>
105111
<PropertyGroup Condition="'$(Cfg_2)'!=''">
106112
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -155,23 +161,6 @@
155161
<BorlandProject>
156162
<Delphi.Personality>
157163
<Excluded_Packages>
158-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\DclIOADO_D28.bpl">InstantObjects ADO Design-Time Support (Delphi 11.0)</Excluded_Packages>
159-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\DclIODBX_D28.bpl">InstantObjects dbExpress Design-Time Support (Delphi 11.0)</Excluded_Packages>
160-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\DclIOIBX_D28.bpl">InstantObjects IBX Design-Time Support (Delphi 11.0)</Excluded_Packages>
161-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\dclISRtl7_D11_0.bpl">Ethea InstantSolutions 7 Rtl Library</Excluded_Packages>
162-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\dclISVcl7_D11_0.bpl">Ethea InstantSolutions 7 Vcl Library</Excluded_Packages>
163-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\dclISOpenOffice7_D11_0.bpl">Ethea InstantSolutions 7 LibreOffice/OpenOffice Components</Excluded_Packages>
164-
<Excluded_Packages Name="C:\Users\Public\Documents\Embarcadero\Studio\22.0\Bpl\dclISFLib7_D11_0.bpl">Ethea InstantSolutions 7 Framework Library</Excluded_Packages>
165-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
166-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
167-
<Excluded_Packages Name="$(BDSBIN)\HelpCtxD11.bpl">File c:\bds\studio\22.0\bin\HelpCtxD11.bpl not found</Excluded_Packages>
168-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\acQueryBuilderDsgnD28.bpl">(untitled)</Excluded_Packages>
169-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\acCriteriaBuilderDsgnD28.bpl">(untitled)</Excluded_Packages>
170-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\acSqlTextEditorDsgnD28.bpl">(untitled)</Excluded_Packages>
171-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\AcQueryBuilderDsgnADOD28.bpl">(untitled)</Excluded_Packages>
172-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\AcQueryBuilderDsgnIBExD28.bpl">(untitled)</Excluded_Packages>
173-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\AcQueryBuilderDsgnDbExD28.bpl">(untitled)</Excluded_Packages>
174-
<Excluded_Packages Name="D:\ETHEA\ActiveQueryBuilder\\RadStudio11\AcQueryBuilderDsgnFireDACD28.bpl">(untitled)</Excluded_Packages>
175164
</Excluded_Packages>
176165
<Source>
177166
<Source Name="MainSource">ModernAppDemo.dpr</Source>
@@ -1316,17 +1305,17 @@
13161305
<Operation>1</Operation>
13171306
</Platform>
13181307
</DeployClass>
1319-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1320-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1321-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1322-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
13231308
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1324-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1325-
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1309+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
13261310
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
13271311
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1328-
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
13291312
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
1313+
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
1314+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1315+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1316+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1317+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1318+
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
13301319
</Deployment>
13311320
<Platforms>
13321321
<Platform value="Win32">True</Platform>

‎Demo/Projects/D11_0/ModernAppDemo.res renamed to ‎Demo/Projects/D11/ModernAppDemo.res

2.11 MB
Binary file not shown.

‎Demo/Projects/D11_0/VCLThemeSelectorLauncher.dpr renamed to ‎Demo/Projects/D11/VCLThemeSelectorLauncher.dpr

File renamed without changes.

‎Demo/Projects/D11_0/VCLThemeSelectorLauncher.dproj renamed to ‎Demo/Projects/D11/VCLThemeSelectorLauncher.dproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<ProjectGuid>{3708C5EA-ECCC-47E3-981F-F876FB513815}</ProjectGuid>
4-
<ProjectVersion>19.3</ProjectVersion>
4+
<ProjectVersion>19.4</ProjectVersion>
55
<FrameworkType>VCL</FrameworkType>
66
<MainSource>VCLThemeSelectorLauncher.dpr</MainSource>
77
<Base>True</Base>
@@ -167,18 +167,6 @@
167167
</Source>
168168
</Delphi.Personality>
169169
<Deployment Version="3">
170-
<DeployFile LocalName="..\..\Bin\VCLThemeSelectorLauncher" Configuration="Debug" Class="ProjectOutput">
171-
<Platform Name="All Platforms">
172-
<RemoteName>VCLThemeSelectorLauncher</RemoteName>
173-
<Overwrite>true</Overwrite>
174-
</Platform>
175-
</DeployFile>
176-
<DeployFile LocalName="..\..\Bin\VCLThemeSelectorLauncher" Configuration="Release" Class="ProjectOutput">
177-
<Platform Name="All Platforms">
178-
<RemoteName>VCLThemeSelectorLauncher</RemoteName>
179-
<Overwrite>true</Overwrite>
180-
</Platform>
181-
</DeployFile>
182170
<DeployFile LocalName="..\..\Bin\VCLThemeSelectorLauncher.exe" Configuration="Debug" Class="ProjectOutput">
183171
<Platform Name="Win32">
184172
<RemoteName>VCLThemeSelectorLauncher.exe</RemoteName>
@@ -203,6 +191,18 @@
203191
<Overwrite>true</Overwrite>
204192
</Platform>
205193
</DeployFile>
194+
<DeployFile LocalName="..\..\Bin\VCLThemeSelectorLauncher" Configuration="Debug" Class="ProjectOutput">
195+
<Platform Name="All Platforms">
196+
<RemoteName>VCLThemeSelectorLauncher</RemoteName>
197+
<Overwrite>true</Overwrite>
198+
</Platform>
199+
</DeployFile>
200+
<DeployFile LocalName="..\..\Bin\VCLThemeSelectorLauncher" Configuration="Release" Class="ProjectOutput">
201+
<Platform Name="All Platforms">
202+
<RemoteName>VCLThemeSelectorLauncher</RemoteName>
203+
<Overwrite>true</Overwrite>
204+
</Platform>
205+
</DeployFile>
206206
<DeployClass Name="AdditionalDebugSymbols">
207207
<Platform Name="iOSSimulator">
208208
<Operation>1</Operation>
@@ -1284,17 +1284,17 @@
12841284
<Operation>1</Operation>
12851285
</Platform>
12861286
</DeployClass>
1287-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1288-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1289-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1290-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
12911287
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1292-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1293-
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1288+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
12941289
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
12951290
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1296-
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
12971291
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
1292+
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
1293+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
1294+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1295+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1296+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1297+
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
12981298
</Deployment>
12991299
<Platforms>
13001300
<Platform value="Win32">True</Platform>

‎Demo/Projects/D11_0/VCLThemeSelectorLauncher.res renamed to ‎Demo/Projects/D11/VCLThemeSelectorLauncher.res

File renamed without changes.

‎Demo/Source/uSplitView.dfm

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ object FormMain: TFormMain
1818
OnBeforeMonitorDpiChanged = FormBeforeMonitorDpiChanged
1919
OnCreate = FormCreate
2020
OnShow = FormShow
21-
PixelsPerInch = 96
2221
TextHeight = 13
2322
object splSettings: TSplitter
2423
Left = 1031
@@ -143,7 +142,6 @@ object FormMain: TFormMain
143142
Font.Style = []
144143
ParentFont = False
145144
TabOrder = 4
146-
Zoom = 100
147145
end
148146
object SpinEdit: TSpinEdit
149147
Left = 8
@@ -237,7 +235,6 @@ object FormMain: TFormMain
237235
Font.Name = 'Tahoma'
238236
Font.Style = []
239237
TabOrder = 11
240-
Zoom = 100
241238
end
242239
object DateTimePicker: TDateTimePicker
243240
Left = 343
@@ -588,7 +585,7 @@ object FormMain: TFormMain
588585
ParentColor = False
589586
TabOrder = 0
590587
Transparent = True
591-
object ToolButton1: TToolButton
588+
object MenuToolButton: TToolButton
592589
AlignWithMargins = True
593590
Left = 0
594591
Top = 0
@@ -614,17 +611,17 @@ object FormMain: TFormMain
614611
ParentColor = False
615612
TabOrder = 1
616613
Transparent = True
617-
object ToolButton2: TToolButton
614+
object HomeToolButton: TToolButton
618615
Left = 0
619616
Top = 0
620617
Action = actHome
621618
end
622-
object ToolButton3: TToolButton
619+
object ThemeToolButton: TToolButton
623620
Left = 36
624621
Top = 0
625622
Action = actChangeTheme
626623
end
627-
object ToolButton4: TToolButton
624+
object SettingsToolButton: TToolButton
628625
Left = 72
629626
Top = 0
630627
Action = actSettings
@@ -835,7 +832,7 @@ object FormMain: TFormMain
835832
Width = 300
836833
Height = 311
837834
Margins.Top = 60
838-
ActivePage = tsFont
835+
ActivePage = tsIconFonts
839836
Align = alClient
840837
TabOrder = 0
841838
object tsFont: TTabSheet
@@ -980,10 +977,11 @@ object FormMain: TFormMain
980977
object IconsToggleSwitch: TToggleSwitch
981978
Left = 14
982979
Top = 106
983-
Width = 104
980+
Width = 112
984981
Height = 20
982+
State = tssOn
985983
StateCaptions.CaptionOn = 'SVG Icons'
986-
StateCaptions.CaptionOff = 'SVG Icons'
984+
StateCaptions.CaptionOff = 'Fonts Icons'
987985
TabOrder = 1
988986
OnClick = IconsToggleSwitchClick
989987
end

‎Demo/Source/uSplitView.pas

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ TFormMain = class(TForm)
179179
DBRichEdit: TDBRichEdit;
180180
Label1: TLabel;
181181
MenuButtonToolbar: TToolBar;
182-
ToolButton1: TToolButton;
182+
MenuToolButton: TToolButton;
183183
ToolBar: TToolBar;
184-
ToolButton2: TToolButton;
185-
ToolButton3: TToolButton;
186-
ToolButton4: TToolButton;
184+
HomeToolButton: TToolButton;
185+
ThemeToolButton: TToolButton;
186+
SettingsToolButton: TToolButton;
187187
DateTimePicker: TDateTimePicker;
188188
ClientDataSetSpeciesNo: TFloatField;
189189
ClientDataSetCategory: TStringField;
@@ -441,6 +441,8 @@ procedure TFormMain.IconFontsTrackBarChange(Sender: TObject);
441441
IconFontsImageList.Size := IconFontsTrackBar.Position;
442442
IconFontsImageListColored.Size := IconFontsTrackBar.Position;
443443
SVGIconImageList.Size := IconFontsTrackBar.Position;
444+
SV.CompactWidth := IconFontsTrackBar.Position * 2;
445+
SV.OpenedWidth := IconFontsTrackBar.Position * 8;
444446
IconFontsTrackBarUpdate;
445447
end;
446448

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Related links: https://www.embarcadero.com/ - https://learndelphi.org/
88

99
With **VCLThemeSelector** you can easily add a modern and elegant Theme selector for your Delphi VCL app. The Form shows all the VCL Styles included in your application, then arrange them in defined Rows and Columns. You can specify to include or not 'Windows' not-styled option.
1010

11-
### Preview (with Delphi 10.4/11.0 - PerControlStyles)
11+
### Preview (with Delphi 10.4/11 - PerControlStyles)
1212
![/Demo/Images/PreviewD10_4.jpg](/Demo/Images/PreviewD10_4.jpg)
1313

1414
### Preview (before Delphi 10.3 - Without PerControlStyle)
@@ -63,6 +63,10 @@ License: this Demo is inspired by TSplitView demo (original software is Copyrigh
6363

6464
## Release Notes ##
6565

66+
10 Apr 2022
67+
- Built with Delphi 11.1
68+
- Fixed Size of menu when resize icons
69+
6670
16 Feb 2022
6771
- Added italian translation
6872
- SetEditorStyleAttributes to assign required/readonly attributes to edit controls

0 commit comments

Comments
 (0)