Skip to content

Commit e77b5fb

Browse files
pyscripterpyscripter
authored
Merge pull request #159 from ReinierNL/update_demo06
Made Python 3 compatible. Plus a few small improvements
2 parents 72796ba + ea5e4be commit e77b5fb

File tree

3 files changed

+177
-134
lines changed

3 files changed

+177
-134
lines changed

‎Demos/Demo06/Project1.dproj‎

Lines changed: 177 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,177 @@
1-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<ProjectGuid>{2E88E1AD-C1A3-403E-8AEE-28895B68FBF7}</ProjectGuid>
4-
<MainSource>Project1.dpr</MainSource>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
6-
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7-
<ProjectVersion>13.4</ProjectVersion>
8-
<FrameworkType>VCL</FrameworkType>
9-
<Base>True</Base>
10-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
11-
<TargetedPlatforms>1</TargetedPlatforms>
12-
<AppType>Application</AppType>
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15-
<Base>true</Base>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
18-
<Base_Win64>true</Base_Win64>
19-
<CfgParent>Base</CfgParent>
20-
<Base>true</Base>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
23-
<Base_Win32>true</Base_Win32>
24-
<CfgParent>Base</CfgParent>
25-
<Base>true</Base>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
28-
<Cfg_1>true</Cfg_1>
29-
<CfgParent>Base</CfgParent>
30-
<Base>true</Base>
31-
</PropertyGroup>
32-
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
33-
<Cfg_2>true</Cfg_2>
34-
<CfgParent>Base</CfgParent>
35-
<Base>true</Base>
36-
</PropertyGroup>
37-
<PropertyGroup Condition="'$(Base)'!=''">
38-
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
39-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
40-
<VerInfo_Locale>1033</VerInfo_Locale>
41-
<DCC_DependencyCheckOutputName>Project1.exe</DCC_DependencyCheckOutputName>
42-
<DCC_ImageBase>00400000</DCC_ImageBase>
43-
<DCC_Platform>x86</DCC_Platform>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
46-
<Icon_MainIcon>Project1_Icon.ico</Icon_MainIcon>
47-
</PropertyGroup>
48-
<PropertyGroup Condition="'$(Base_Win32)'!=''">
49-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
50-
<Icon_MainIcon>Project1_Icon.ico</Icon_MainIcon>
51-
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
52-
<VerInfo_Locale>1033</VerInfo_Locale>
53-
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
54-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
55-
</PropertyGroup>
56-
<PropertyGroup Condition="'$(Cfg_1)'!=''">
57-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
58-
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
59-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
60-
<DCC_DebugInformation>false</DCC_DebugInformation>
61-
</PropertyGroup>
62-
<PropertyGroup Condition="'$(Cfg_2)'!=''">
63-
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
64-
</PropertyGroup>
65-
<ItemGroup>
66-
<DelphiCompile Include="$(MainSource)">
67-
<MainSource>MainSource</MainSource>
68-
</DelphiCompile>
69-
<DCCReference Include="Unit1.pas">
70-
<Form>Form1</Form>
71-
</DCCReference>
72-
<BuildConfiguration Include="Debug">
73-
<Key>Cfg_2</Key>
74-
<CfgParent>Base</CfgParent>
75-
</BuildConfiguration>
76-
<BuildConfiguration Include="Base">
77-
<Key>Base</Key>
78-
</BuildConfiguration>
79-
<BuildConfiguration Include="Release">
80-
<Key>Cfg_1</Key>
81-
<CfgParent>Base</CfgParent>
82-
</BuildConfiguration>
83-
</ItemGroup>
84-
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
85-
<ProjectExtensions>
86-
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
87-
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
88-
<BorlandProject>
89-
<Delphi.Personality>
90-
<Source>
91-
<Source Name="MainSource">Project1.dpr</Source>
92-
</Source>
93-
<Parameters>
94-
<Parameters Name="UseLauncher">False</Parameters>
95-
<Parameters Name="LoadAllSymbols">True</Parameters>
96-
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
97-
</Parameters>
98-
<VersionInfo>
99-
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
100-
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
101-
<VersionInfo Name="MajorVer">1</VersionInfo>
102-
<VersionInfo Name="MinorVer">0</VersionInfo>
103-
<VersionInfo Name="Release">0</VersionInfo>
104-
<VersionInfo Name="Build">0</VersionInfo>
105-
<VersionInfo Name="Debug">False</VersionInfo>
106-
<VersionInfo Name="PreRelease">False</VersionInfo>
107-
<VersionInfo Name="Special">False</VersionInfo>
108-
<VersionInfo Name="Private">False</VersionInfo>
109-
<VersionInfo Name="DLL">False</VersionInfo>
110-
<VersionInfo Name="Locale">1033</VersionInfo>
111-
<VersionInfo Name="CodePage">1252</VersionInfo>
112-
</VersionInfo>
113-
<VersionInfoKeys>
114-
<VersionInfoKeys Name="CompanyName"/>
115-
<VersionInfoKeys Name="FileDescription"/>
116-
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
117-
<VersionInfoKeys Name="InternalName"/>
118-
<VersionInfoKeys Name="LegalCopyright"/>
119-
<VersionInfoKeys Name="LegalTrademarks"/>
120-
<VersionInfoKeys Name="OriginalFilename"/>
121-
<VersionInfoKeys Name="ProductName"/>
122-
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
123-
<VersionInfoKeys Name="Comments"/>
124-
</VersionInfoKeys>
125-
</Delphi.Personality>
126-
<Platforms>
127-
<Platform value="Win64">False</Platform>
128-
<Platform value="Win32">True</Platform>
129-
</Platforms>
130-
</BorlandProject>
131-
<ProjectFileVersion>12</ProjectFileVersion>
132-
</ProjectExtensions>
133-
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
134-
</Project>
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{2E88E1AD-C1A3-403E-8AEE-28895B68FBF7}</ProjectGuid>
4+
<MainSource>Project1.dpr</MainSource>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
6+
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7+
<ProjectVersion>19.1</ProjectVersion>
8+
<FrameworkType>VCL</FrameworkType>
9+
<Base>True</Base>
10+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
11+
<TargetedPlatforms>3</TargetedPlatforms>
12+
<AppType>Application</AppType>
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15+
<Base>true</Base>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
18+
<Base_Win32>true</Base_Win32>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
23+
<Base_Win64>true</Base_Win64>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
28+
<Cfg_1>true</Cfg_1>
29+
<CfgParent>Base</CfgParent>
30+
<Base>true</Base>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
33+
<Cfg_1_Win64>true</Cfg_1_Win64>
34+
<CfgParent>Cfg_1</CfgParent>
35+
<Cfg_1>true</Cfg_1>
36+
<Base>true</Base>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
39+
<Cfg_2>true</Cfg_2>
40+
<CfgParent>Base</CfgParent>
41+
<Base>true</Base>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
44+
<Cfg_2_Win32>true</Cfg_2_Win32>
45+
<CfgParent>Cfg_2</CfgParent>
46+
<Cfg_2>true</Cfg_2>
47+
<Base>true</Base>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
50+
<Cfg_2_Win64>true</Cfg_2_Win64>
51+
<CfgParent>Cfg_2</CfgParent>
52+
<Cfg_2>true</Cfg_2>
53+
<Base>true</Base>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="'$(Base)'!=''">
56+
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
57+
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
58+
<VerInfo_Locale>1033</VerInfo_Locale>
59+
<DCC_DependencyCheckOutputName>Project1.exe</DCC_DependencyCheckOutputName>
60+
<DCC_ImageBase>00400000</DCC_ImageBase>
61+
<DCC_Platform>x86</DCC_Platform>
62+
<SanitizedProjectName>Project1</SanitizedProjectName>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Base_Win32)'!=''">
65+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
66+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
67+
<VerInfo_Locale>1033</VerInfo_Locale>
68+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
69+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
70+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
71+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
72+
</PropertyGroup>
73+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
74+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
75+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
76+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
77+
<BT_BuildType>Debug</BT_BuildType>
78+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
79+
<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>
80+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
83+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
84+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
85+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
86+
<DCC_DebugInformation>0</DCC_DebugInformation>
87+
</PropertyGroup>
88+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
89+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
90+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
91+
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
93+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
94+
</PropertyGroup>
95+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
96+
<BT_BuildType>Debug</BT_BuildType>
97+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
98+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
99+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
100+
</PropertyGroup>
101+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
102+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
103+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
104+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
105+
<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>
106+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
107+
</PropertyGroup>
108+
<ItemGroup>
109+
<DelphiCompile Include="$(MainSource)">
110+
<MainSource>MainSource</MainSource>
111+
</DelphiCompile>
112+
<DCCReference Include="Unit1.pas">
113+
<Form>Form1</Form>
114+
</DCCReference>
115+
<BuildConfiguration Include="Debug">
116+
<Key>Cfg_2</Key>
117+
<CfgParent>Base</CfgParent>
118+
</BuildConfiguration>
119+
<BuildConfiguration Include="Base">
120+
<Key>Base</Key>
121+
</BuildConfiguration>
122+
<BuildConfiguration Include="Release">
123+
<Key>Cfg_1</Key>
124+
<CfgParent>Base</CfgParent>
125+
</BuildConfiguration>
126+
</ItemGroup>
127+
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
128+
<ProjectExtensions>
129+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
130+
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
131+
<BorlandProject>
132+
<Delphi.Personality>
133+
<Source>
134+
<Source Name="MainSource">Project1.dpr</Source>
135+
</Source>
136+
<Parameters>
137+
<Parameters Name="UseLauncher">False</Parameters>
138+
<Parameters Name="LoadAllSymbols">True</Parameters>
139+
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
140+
</Parameters>
141+
<VersionInfo>
142+
<VersionInfo Name="IncludeVerInfo">False</VersionInfo>
143+
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
144+
<VersionInfo Name="MajorVer">1</VersionInfo>
145+
<VersionInfo Name="MinorVer">0</VersionInfo>
146+
<VersionInfo Name="Release">0</VersionInfo>
147+
<VersionInfo Name="Build">0</VersionInfo>
148+
<VersionInfo Name="Debug">False</VersionInfo>
149+
<VersionInfo Name="PreRelease">False</VersionInfo>
150+
<VersionInfo Name="Special">False</VersionInfo>
151+
<VersionInfo Name="Private">False</VersionInfo>
152+
<VersionInfo Name="DLL">False</VersionInfo>
153+
<VersionInfo Name="Locale">1033</VersionInfo>
154+
<VersionInfo Name="CodePage">1252</VersionInfo>
155+
</VersionInfo>
156+
<VersionInfoKeys>
157+
<VersionInfoKeys Name="CompanyName"/>
158+
<VersionInfoKeys Name="FileDescription"/>
159+
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
160+
<VersionInfoKeys Name="InternalName"/>
161+
<VersionInfoKeys Name="LegalCopyright"/>
162+
<VersionInfoKeys Name="LegalTrademarks"/>
163+
<VersionInfoKeys Name="OriginalFilename"/>
164+
<VersionInfoKeys Name="ProductName"/>
165+
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
166+
<VersionInfoKeys Name="Comments"/>
167+
</VersionInfoKeys>
168+
</Delphi.Personality>
169+
<Platforms>
170+
<Platform value="Win32">True</Platform>
171+
<Platform value="Win64">True</Platform>
172+
</Platforms>
173+
</BorlandProject>
174+
<ProjectFileVersion>12</ProjectFileVersion>
175+
</ProjectExtensions>
176+
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
177+
</Project>

‎Demos/Demo06/Project1.res‎

107 KB
Binary file not shown.

‎Demos/Demo06/Unit1.dfm‎

1.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)