Skip to content

Commit 99762a4

Browse files
authored
Merge pull request #3 from Embarcadero/enhancements
Many enhancements about UI/UX
2 parents c7db042 + 851f5c1 commit 99762a4

27 files changed

+939
-570
lines changed

Packages/Delphi10Berlin/dclDelphi4PythonExperts.dpk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ requires
3838
vcl,
3939
dbrtl,
4040
vcldb,
41-
dsnap;
41+
dsnap,
42+
vclwinx;
4243

4344
contains
4445
PythonTools.Registration in '..\..\Source\PythonTools.Registration.pas',
@@ -64,6 +65,8 @@ contains
6465
PythonTools.Model.Producer.FormFile in '..\..\Source\Model\Producer\PythonTools.Model.Producer.FormFile.pas',
6566
PythonTools.Model.Producer.Form in '..\..\Source\Model\Producer\PythonTools.Model.Producer.Form.pas',
6667
PythonTools.Model.Design.Forms in '..\..\Source\Model\Design\PythonTools.Model.Design.Forms.pas',
67-
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas';
68+
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas',
69+
PythonTools.Registry in '..\..\Source\PythonTools.Registry.pas',
70+
PythonTools.Design in '..\..\Source\Design\PythonTools.Design.pas' {DesignForm};
6871

6972
end.

Packages/Delphi10Berlin/dclDelphi4PythonExperts.dproj

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<DCCReference Include="dbrtl.dcp"/>
100100
<DCCReference Include="vcldb.dcp"/>
101101
<DCCReference Include="dsnap.dcp"/>
102+
<DCCReference Include="vclwinx.dcp"/>
102103
<DCCReference Include="..\..\Source\PythonTools.Registration.pas"/>
103104
<DCCReference Include="..\..\Source\PythonTools.SplashScreen.pas"/>
104105
<DCCReference Include="..\..\Source\PythonTools.IOTAUtils.pas"/>
@@ -176,14 +177,14 @@
176177
<Overwrite>true</Overwrite>
177178
</Platform>
178179
</DeployFile>
179-
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\18.0\Bpl\dclDelphi4PythonExperts240.bpl" Configuration="Debug" Class="ProjectOutput">
180-
<Platform Name="Win32">
181-
<RemoteName>dclDelphi4PythonExperts.bpl</RemoteName>
180+
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
181+
<Platform Name="iOSSimulator">
182182
<Overwrite>true</Overwrite>
183183
</Platform>
184184
</DeployFile>
185-
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
186-
<Platform Name="iOSSimulator">
185+
<DeployFile LocalName="..\..\..\..\..\..\..\..\..\Public\Documents\Embarcadero\Studio\18.0\Bpl\dclDelphi4PythonExperts240.bpl" Configuration="Debug" Class="ProjectOutput">
186+
<Platform Name="Win32">
187+
<RemoteName>dclDelphi4PythonExperts.bpl</RemoteName>
187188
<Overwrite>true</Overwrite>
188189
</Platform>
189190
</DeployFile>
@@ -192,9 +193,13 @@
192193
<Overwrite>true</Overwrite>
193194
</Platform>
194195
</DeployFile>
195-
<DeployClass Name="Android_LauncherIcon36">
196-
<Platform Name="Android">
197-
<RemoteDir>res\drawable-ldpi</RemoteDir>
196+
<DeployClass Name="iPhone_LaunchDark3x">
197+
<Platform Name="iOSDevice64">
198+
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
199+
<Operation>1</Operation>
200+
</Platform>
201+
<Platform Name="iOSSimulator">
202+
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
198203
<Operation>1</Operation>
199204
</Platform>
200205
</DeployClass>
@@ -236,14 +241,14 @@
236241
<Operation>1</Operation>
237242
</Platform>
238243
</DeployClass>
239-
<DeployClass Name="iPad_Notification40">
240-
<Platform Name="iOSDevice64">
241-
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
242-
<Operation>1</Operation>
244+
<DeployClass Name="DependencyModule">
245+
<Platform Name="Win32">
246+
<Operation>0</Operation>
247+
<Extensions>.dll;.bpl</Extensions>
243248
</Platform>
244-
<Platform Name="iOSSimulator">
245-
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
249+
<Platform Name="OSX32">
246250
<Operation>1</Operation>
251+
<Extensions>.dylib</Extensions>
247252
</Platform>
248253
</DeployClass>
249254
<DeployClass Name="iPhone_AppIcon180">
@@ -310,11 +315,11 @@
310315
</Platform>
311316
</DeployClass>
312317
<DeployClass Name="AndroidSplashStylesV21">
313-
<Platform Name="Android">
318+
<Platform Name="Android64">
314319
<RemoteDir>res\values-v21</RemoteDir>
315320
<Operation>1</Operation>
316321
</Platform>
317-
<Platform Name="Android64">
322+
<Platform Name="Android">
318323
<RemoteDir>res\values-v21</RemoteDir>
319324
<Operation>1</Operation>
320325
</Platform>
@@ -336,11 +341,11 @@
336341
</Platform>
337342
</DeployClass>
338343
<DeployClass Name="Android_NotificationIcon48">
339-
<Platform Name="Android">
344+
<Platform Name="Android64">
340345
<RemoteDir>res\drawable-xhdpi</RemoteDir>
341346
<Operation>1</Operation>
342347
</Platform>
343-
<Platform Name="Android64">
348+
<Platform Name="Android">
344349
<RemoteDir>res\drawable-xhdpi</RemoteDir>
345350
<Operation>1</Operation>
346351
</Platform>
@@ -408,11 +413,11 @@
408413
</Platform>
409414
</DeployClass>
410415
<DeployClass Name="Android_Colors">
411-
<Platform Name="Android">
416+
<Platform Name="Android64">
412417
<RemoteDir>res\values</RemoteDir>
413418
<Operation>1</Operation>
414419
</Platform>
415-
<Platform Name="Android64">
420+
<Platform Name="Android">
416421
<RemoteDir>res\values</RemoteDir>
417422
<Operation>1</Operation>
418423
</Platform>
@@ -440,11 +445,11 @@
440445
</Platform>
441446
</DeployClass>
442447
<DeployClass Name="Android_LauncherIcon192">
443-
<Platform Name="Android">
448+
<Platform Name="Android64">
444449
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
445450
<Operation>1</Operation>
446451
</Platform>
447-
<Platform Name="Android64">
452+
<Platform Name="Android">
448453
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
449454
<Operation>1</Operation>
450455
</Platform>
@@ -457,11 +462,11 @@
457462
</Platform>
458463
</DeployClass>
459464
<DeployClass Name="Android_NotificationIcon96">
460-
<Platform Name="Android">
465+
<Platform Name="Android64">
461466
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
462467
<Operation>1</Operation>
463468
</Platform>
464-
<Platform Name="Android64">
469+
<Platform Name="Android">
465470
<RemoteDir>res\drawable-xxxhdpi</RemoteDir>
466471
<Operation>1</Operation>
467472
</Platform>
@@ -582,11 +587,11 @@
582587
</Platform>
583588
</DeployClass>
584589
<DeployClass Name="AndroidFileProvider">
585-
<Platform Name="Android">
590+
<Platform Name="Android64">
586591
<RemoteDir>res\xml</RemoteDir>
587592
<Operation>1</Operation>
588593
</Platform>
589-
<Platform Name="Android64">
594+
<Platform Name="Android">
590595
<RemoteDir>res\xml</RemoteDir>
591596
<Operation>1</Operation>
592597
</Platform>
@@ -693,11 +698,11 @@
693698
</Platform>
694699
</DeployClass>
695700
<DeployClass Name="Android_Strings">
696-
<Platform Name="Android">
701+
<Platform Name="Android64">
697702
<RemoteDir>res\values</RemoteDir>
698703
<Operation>1</Operation>
699704
</Platform>
700-
<Platform Name="Android64">
705+
<Platform Name="Android">
701706
<RemoteDir>res\values</RemoteDir>
702707
<Operation>1</Operation>
703708
</Platform>
@@ -715,11 +720,11 @@
715720
</Platform>
716721
</DeployClass>
717722
<DeployClass Name="Android_NotificationIcon24">
718-
<Platform Name="Android">
723+
<Platform Name="Android64">
719724
<RemoteDir>res\drawable-mdpi</RemoteDir>
720725
<Operation>1</Operation>
721726
</Platform>
722-
<Platform Name="Android64">
727+
<Platform Name="Android">
723728
<RemoteDir>res\drawable-mdpi</RemoteDir>
724729
<Operation>1</Operation>
725730
</Platform>
@@ -735,11 +740,11 @@
735740
</Platform>
736741
</DeployClass>
737742
<DeployClass Name="Android_NotificationIcon72">
738-
<Platform Name="Android">
743+
<Platform Name="Android64">
739744
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
740745
<Operation>1</Operation>
741746
</Platform>
742-
<Platform Name="Android64">
747+
<Platform Name="Android">
743748
<RemoteDir>res\drawable-xxhdpi</RemoteDir>
744749
<Operation>1</Operation>
745750
</Platform>
@@ -827,34 +832,30 @@
827832
<Operation>1</Operation>
828833
</Platform>
829834
</DeployClass>
830-
<DeployClass Name="Android_NotificationIcon36">
831-
<Platform Name="Android">
832-
<RemoteDir>res\drawable-hdpi</RemoteDir>
835+
<DeployClass Name="iPad_Notification40">
836+
<Platform Name="iOSDevice64">
837+
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
833838
<Operation>1</Operation>
834839
</Platform>
835-
<Platform Name="Android64">
836-
<RemoteDir>res\drawable-hdpi</RemoteDir>
840+
<Platform Name="iOSSimulator">
841+
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\AppIcon.appiconset</RemoteDir>
837842
<Operation>1</Operation>
838843
</Platform>
839844
</DeployClass>
840-
<DeployClass Name="iPhone_LaunchDark3x">
841-
<Platform Name="iOSDevice64">
842-
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
843-
<Operation>1</Operation>
844-
</Platform>
845-
<Platform Name="iOSSimulator">
846-
<RemoteDir>..\$(PROJECTNAME).launchscreen\Assets\LaunchScreenImage.imageset</RemoteDir>
845+
<DeployClass Name="Android_LauncherIcon36">
846+
<Platform Name="Android">
847+
<RemoteDir>res\drawable-ldpi</RemoteDir>
847848
<Operation>1</Operation>
848849
</Platform>
849850
</DeployClass>
850-
<DeployClass Name="DependencyModule">
851-
<Platform Name="Win32">
852-
<Operation>0</Operation>
853-
<Extensions>.dll;.bpl</Extensions>
851+
<DeployClass Name="Android_NotificationIcon36">
852+
<Platform Name="Android64">
853+
<RemoteDir>res\drawable-hdpi</RemoteDir>
854+
<Operation>1</Operation>
854855
</Platform>
855-
<Platform Name="OSX32">
856+
<Platform Name="Android">
857+
<RemoteDir>res\drawable-hdpi</RemoteDir>
856858
<Operation>1</Operation>
857-
<Extensions>.dylib</Extensions>
858859
</Platform>
859860
</DeployClass>
860861
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>

Packages/Delphi10Rio/dclDelphi4PythonExperts.dpk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ requires
3838
vcl,
3939
dbrtl,
4040
vcldb,
41-
dsnap;
41+
dsnap,
42+
vclwinx;
4243

4344
contains
4445
PythonTools.Registration in '..\..\Source\PythonTools.Registration.pas',
@@ -64,6 +65,8 @@ contains
6465
PythonTools.Model.Producer.FormFile in '..\..\Source\Model\Producer\PythonTools.Model.Producer.FormFile.pas',
6566
PythonTools.Model.Producer.Form in '..\..\Source\Model\Producer\PythonTools.Model.Producer.Form.pas',
6667
PythonTools.Model.Design.Forms in '..\..\Source\Model\Design\PythonTools.Model.Design.Forms.pas',
67-
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas';
68+
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas',
69+
PythonTools.Registry in '..\..\Source\PythonTools.Registry.pas',
70+
PythonTools.Design in '..\..\Source\Design\PythonTools.Design.pas' {DesignForm};
6871

6972
end.

Packages/Delphi10Rio/dclDelphi4PythonExperts.dproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<DCCReference Include="dbrtl.dcp"/>
100100
<DCCReference Include="vcldb.dcp"/>
101101
<DCCReference Include="dsnap.dcp"/>
102+
<DCCReference Include="vclwinx.dcp"/>
102103
<DCCReference Include="..\..\Source\PythonTools.Registration.pas"/>
103104
<DCCReference Include="..\..\Source\PythonTools.SplashScreen.pas"/>
104105
<DCCReference Include="..\..\Source\PythonTools.IOTAUtils.pas"/>

Packages/Delphi10Seattle/dclDelphi4PythonExperts.dpk

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ requires
3838
vcl,
3939
dbrtl,
4040
vcldb,
41-
dsnap;
41+
dsnap,
42+
vclwinx;
4243

4344
contains
4445
PythonTools.Registration in '..\..\Source\PythonTools.Registration.pas',
@@ -64,6 +65,8 @@ contains
6465
PythonTools.Model.Producer.FormFile in '..\..\Source\Model\Producer\PythonTools.Model.Producer.FormFile.pas',
6566
PythonTools.Model.Producer.Form in '..\..\Source\Model\Producer\PythonTools.Model.Producer.Form.pas',
6667
PythonTools.Model.Design.Forms in '..\..\Source\Model\Design\PythonTools.Model.Design.Forms.pas',
67-
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas';
68+
PythonTools.Model.Design.Project in '..\..\Source\Model\Design\PythonTools.Model.Design.Project.pas',
69+
PythonTools.Registry in '..\..\Source\PythonTools.Registry.pas',
70+
PythonTools.Design in '..\..\Source\Design\PythonTools.Design.pas' {DesignForm};
6871

6972
end.

0 commit comments

Comments
 (0)