Skip to content

Commit 8c445e0

Browse files
carloBarazzettacarloBarazzetta
committed
Added support for LinesPerRow and RowMargin to TLabeledDbGrid
Added some controls to Demo to show all TLabeledDbGrid features
1 parent f422325 commit 8c445e0

28 files changed

+1260
-223
lines changed

‎Demo/DBAwareLabeledComponentsDemo.dpr‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ uses
2424

2525
begin
2626
Application.Initialize;
27-
Application.Title := 'Normal and DataAware Labeled Components Editors Demo - Copyright (c) 2021 Ethea S.r.l.';
27+
Application.Title := 'Normal and DataAware Labeled Components Editors Demo - Copyright (c) 2021-2022 Ethea S.r.l.';
2828
Application.MainFormOnTaskbar := True;
2929
Application.CreateForm(TMainForm, MainForm);
3030
Application.Run;

‎Demo/DBAwareLabeledComponentsDemo.dproj‎

Lines changed: 53 additions & 12 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>{356F8995-048E-4B76-A115-41D00DD211C4}</ProjectGuid>
4-
<ProjectVersion>19.3</ProjectVersion>
4+
<ProjectVersion>19.4</ProjectVersion>
55
<FrameworkType>VCL</FrameworkType>
66
<Base>True</Base>
77
<Config Condition="'$(Config)'==''">Debug</Config>
@@ -61,6 +61,7 @@
6161
<DCC_UnitSearchPath>..\Source;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6262
<VerInfo_Locale>1040</VerInfo_Locale>
6363
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
64+
<Custom_Styles>&quot;Aqua Light Slate|VCLSTYLE|$(BDSCOMMONDIR)\Styles\AquaLightSlate.vsf&quot;;CopperDark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\CopperDark.vsf;Diamond|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Diamond.vsf;Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;</Custom_Styles>
6465
</PropertyGroup>
6566
<PropertyGroup Condition="'$(Base_Win32)'!=''">
6667
<DCC_UsePackage>DBXSqliteDriver;RESTComponents;IOCore;DBXDb2Driver;DBXInterBaseDriver;rbTCUI2027;FlexCel_Pdf;vclactnband;FMX_FlexCel_Core;vclFireDAC;dclRBDBE2027;CanonPackage;DataSnapServerMidas;bindcompvclsmp;emsclientfiredac;tethering;svnui;DataSnapFireDAC;FireDACADSDriver;DBXMSSQLDriver;dclExcelExportPackD104;DatasnapConnectorsFreePascal;FireDACMSSQLDriver;IconFontsImageList;vcltouch;rbIDE2027;vcldb;bindcompfmx;svn;SynEdit_R10_4;DBXOracleDriver;ISOpenOffice7;rbRCL2027;inetdb;dclRBFireDAC2027;SKIA_FlexCel_Core;FlexCel_Report;FmxTeeUI;emsedge;rbBDE2027;fmx;FireDACIBDriver;fmxdae;rbUSER2027;VCL_FlexCel_Components;vcledge;vclib;rbDAD2027;FireDACDBXDriver;dbexpress;IndyCore;rbUSERDesign2027;vclx;rbDIDE2027;dsnap;emsclient;DataSnapCommon;SVGIconImageListFMX;FireDACCommon;RESTBackendComponents;DataSnapConnectors;IOFireDAC;VCLRESTComponents;soapserver;JclDeveloperTools;ISVcl7;rbTC2027;vclie;bindengine;DBXMySQLDriver;CloudService;FireDACOracleDriver;FireDACMySQLDriver;DBXFirebirdDriver;SVGIconPackage;FireDACCommonODBC;FireDACCommonDriver;DataSnapClient;rbDBE2027;inet;IndyIPCommon;bindcompdbx;vcl;IndyIPServer;DBXSybaseASEDriver;dclRBADO2027;IconFontsImageListFMX;IndySystem;dclRBE2027;FireDACDb2Driver;rbFireDAC2027;bindcompvclwinx;dsnapcon;rbADO2027;FireDACMSAccDriver;fmxFireDAC;FireDACInfxDriver;vclimg;IOXML;TeeDB;FireDAC;FlexCel_XlsAdapter;Jcl;emshosting;rbDB2027;FireDACSqliteDriver;FireDACPgDriver;ibmonitor;FireDACASADriver;ChromeTabs_R;DBXOdbcDriver;FireDACTDataDriver;FMXTee;vclshlctrls;soaprtl;DbxCommonDriver;FlexCel_Core;ibxpress;Tee;DataSnapServer;xmlrtl;soapmidas;DataSnapNativeClient;fmxobj;vclwinx;FireDACDSDriver;rtl;emsserverresource;DbxClientDriver;ibxbindings;DBXSybaseASADriver;rbRAP2027;CustomIPTransport;vcldsnap;ISRtl7;rbRTL2027;rbRest2027;ExcelExportPackD104;bindcomp;appanalytics;dclRBIBE2027;DBXInformixDriver;rbRIDE2027;ipstudiowin;IndyIPClient;officeXPrt;bindcompvcl;rbIBE2027;SVGIconImageList;TeeUI;FrameViewer10_4;dbxcds;VclSmp;VCL_FlexCel_Core;adortl;FireDACODBCDriver;FlexCel_Render;JclVcl;DataSnapIndy10ServerTransport;ISFLib7;dsnapxml;DataSnapProviderClient;dbrtl;IndyProtocols;inetdbxpress;FireDACMongoDBDriver;JclContainers;rbCIDE2027;fmxase;$(DCC_UsePackage)</DCC_UsePackage>
@@ -124,17 +125,17 @@
124125
<DCCReference Include="..\Source\Vcl.DbAwareLabeledUtils.pas"/>
125126
<DCCReference Include="..\Source\Vcl.DbAwareLabeledConsts.pas"/>
126127
<DCCReference Include="..\Source\Vcl.BoundLabel.pas"/>
127-
<BuildConfiguration Include="Release">
128-
<Key>Cfg_2</Key>
129-
<CfgParent>Base</CfgParent>
130-
</BuildConfiguration>
131128
<BuildConfiguration Include="Base">
132129
<Key>Base</Key>
133130
</BuildConfiguration>
134131
<BuildConfiguration Include="Debug">
135132
<Key>Cfg_1</Key>
136133
<CfgParent>Base</CfgParent>
137134
</BuildConfiguration>
135+
<BuildConfiguration Include="Release">
136+
<Key>Cfg_2</Key>
137+
<CfgParent>Base</CfgParent>
138+
</BuildConfiguration>
138139
</ItemGroup>
139140
<ProjectExtensions>
140141
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -145,6 +146,7 @@
145146
<Source Name="MainSource">DBAwareLabeledComponentsDemo.dpr</Source>
146147
</Source>
147148
<Excluded_Packages>
149+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp270.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
148150
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k270.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
149151
</Excluded_Packages>
150152
</Delphi.Personality>
@@ -478,6 +480,11 @@
478480
<Operation>1</Operation>
479481
<Extensions>.framework</Extensions>
480482
</Platform>
483+
<Platform Name="OSXARM64">
484+
<RemoteDir>Contents\MacOS</RemoteDir>
485+
<Operation>1</Operation>
486+
<Extensions>.framework</Extensions>
487+
</Platform>
481488
<Platform Name="Win32">
482489
<Operation>0</Operation>
483490
</Platform>
@@ -505,6 +512,11 @@
505512
<Operation>1</Operation>
506513
<Extensions>.dylib</Extensions>
507514
</Platform>
515+
<Platform Name="OSXARM64">
516+
<RemoteDir>Contents\MacOS</RemoteDir>
517+
<Operation>1</Operation>
518+
<Extensions>.dylib</Extensions>
519+
</Platform>
508520
<Platform Name="Win32">
509521
<Operation>0</Operation>
510522
<Extensions>.dll;.bpl</Extensions>
@@ -533,6 +545,11 @@
533545
<Operation>1</Operation>
534546
<Extensions>.dylib</Extensions>
535547
</Platform>
548+
<Platform Name="OSXARM64">
549+
<RemoteDir>Contents\MacOS</RemoteDir>
550+
<Operation>1</Operation>
551+
<Extensions>.dylib</Extensions>
552+
</Platform>
536553
<Platform Name="Win32">
537554
<Operation>0</Operation>
538555
<Extensions>.bpl</Extensions>
@@ -562,6 +579,10 @@
562579
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
563580
<Operation>0</Operation>
564581
</Platform>
582+
<Platform Name="OSXARM64">
583+
<RemoteDir>Contents\Resources\StartUp\</RemoteDir>
584+
<Operation>0</Operation>
585+
</Platform>
565586
<Platform Name="Win32">
566587
<Operation>0</Operation>
567588
</Platform>
@@ -1099,6 +1120,10 @@
10991120
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
11001121
<Operation>1</Operation>
11011122
</Platform>
1123+
<Platform Name="OSXARM64">
1124+
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
1125+
<Operation>1</Operation>
1126+
</Platform>
11021127
</DeployClass>
11031128
<DeployClass Name="ProjectOSXEntitlements">
11041129
<Platform Name="OSX32">
@@ -1109,6 +1134,10 @@
11091134
<RemoteDir>..\</RemoteDir>
11101135
<Operation>1</Operation>
11111136
</Platform>
1137+
<Platform Name="OSXARM64">
1138+
<RemoteDir>..\</RemoteDir>
1139+
<Operation>1</Operation>
1140+
</Platform>
11121141
</DeployClass>
11131142
<DeployClass Name="ProjectOSXInfoPList">
11141143
<Platform Name="OSX32">
@@ -1119,6 +1148,10 @@
11191148
<RemoteDir>Contents</RemoteDir>
11201149
<Operation>1</Operation>
11211150
</Platform>
1151+
<Platform Name="OSXARM64">
1152+
<RemoteDir>Contents</RemoteDir>
1153+
<Operation>1</Operation>
1154+
</Platform>
11221155
</DeployClass>
11231156
<DeployClass Name="ProjectOSXResource">
11241157
<Platform Name="OSX32">
@@ -1129,6 +1162,10 @@
11291162
<RemoteDir>Contents\Resources</RemoteDir>
11301163
<Operation>1</Operation>
11311164
</Platform>
1165+
<Platform Name="OSXARM64">
1166+
<RemoteDir>Contents\Resources</RemoteDir>
1167+
<Operation>1</Operation>
1168+
</Platform>
11321169
</DeployClass>
11331170
<DeployClass Required="true" Name="ProjectOutput">
11341171
<Platform Name="Android">
@@ -1159,6 +1196,10 @@
11591196
<RemoteDir>Contents\MacOS</RemoteDir>
11601197
<Operation>1</Operation>
11611198
</Platform>
1199+
<Platform Name="OSXARM64">
1200+
<RemoteDir>Contents\MacOS</RemoteDir>
1201+
<Operation>1</Operation>
1202+
</Platform>
11621203
<Platform Name="Win32">
11631204
<Operation>0</Operation>
11641205
</Platform>
@@ -1197,17 +1238,17 @@
11971238
<Operation>1</Operation>
11981239
</Platform>
11991240
</DeployClass>
1200-
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1201-
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1241+
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1242+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
12021243
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
1203-
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1204-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1244+
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1245+
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
12051246
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
12061247
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
12071248
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
1208-
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1209-
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
1210-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
1249+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
1250+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1251+
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
12111252
</Deployment>
12121253
<Platforms>
12131254
<Platform value="Win32">True</Platform>

‎Demo/DBAwareLabeledComponentsDemo.res‎

1.06 MB
Binary file not shown.

0 commit comments

Comments
 (0)