Skip to content

Commit 5c40983

Browse files
authored
Merge pull request pyscripter#186 from ReinierNL/update_demo31
Updates for demo 31
2 parents 1caa4c7 + ce66bd4 commit 5c40983

File tree

2 files changed

+20
-13
lines changed

2 files changed

+20
-13
lines changed

Demos/Demo31/Demo31.dproj

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,25 @@
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Base_Win32)'!=''">
5959
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
60-
<Icon_MainIcon>Demo31_Icon.ico</Icon_MainIcon>
60+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
6161
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
6262
<VerInfo_Locale>1033</VerInfo_Locale>
6363
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
6464
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
6565
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
6666
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
67+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
6768
</PropertyGroup>
6869
<PropertyGroup Condition="'$(Base_Win64)'!=''">
6970
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
7071
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
7172
<VerInfo_Locale>1033</VerInfo_Locale>
7273
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
73-
<Icon_MainIcon>Demo31_Icon.ico</Icon_MainIcon>
74+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
7475
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
7576
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
7677
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
78+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
7779
</PropertyGroup>
7880
<PropertyGroup Condition="'$(Cfg_1)'!=''">
7981
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -88,15 +90,13 @@
8890
<BT_BuildType>Debug</BT_BuildType>
8991
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
9092
<VerInfo_Locale>1033</VerInfo_Locale>
91-
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
9293
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
9394
<DCC_DebugDCUs>true</DCC_DebugDCUs>
9495
</PropertyGroup>
9596
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
9697
<BT_BuildType>Debug</BT_BuildType>
9798
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
9899
<VerInfo_Locale>1033</VerInfo_Locale>
99-
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
100100
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
101101
<DCC_DebugDCUs>true</DCC_DebugDCUs>
102102
</PropertyGroup>
@@ -163,10 +163,7 @@
163163
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
164164
<VersionInfoKeys Name="Comments"/>
165165
</VersionInfoKeys>
166-
<Excluded_Packages>
167-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k260.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
168-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp260.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
169-
</Excluded_Packages>
166+
<Excluded_Packages/>
170167
</Delphi.Personality>
171168
<Platforms>
172169
<Platform value="Win32">True</Platform>

Demos/Demo31/Unit1.dfm

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@ object Form1: TForm1
3333
Width = 721
3434
Height = 395
3535
Align = alClient
36+
Font.Charset = DEFAULT_CHARSET
37+
Font.Color = clWindowText
38+
Font.Height = -13
39+
Font.Name = 'Consolas'
40+
Font.Pitch = fpVariable
41+
Font.Style = []
3642
Lines.Strings = (
3743

3844
'from spam import DelphiVersion, MainForm, DVar, CreateComponent,' +
@@ -493,7 +499,8 @@ object Form1: TForm1
493499
' unittest.main()'
494500
' except SystemExit:'
495501
' pass')
496-
ScrollBars = ssVertical
502+
ParentFont = False
503+
ScrollBars = ssBoth
497504
TabOrder = 0
498505
WordWrap = False
499506
end
@@ -521,14 +528,17 @@ object Form1: TForm1
521528
Width = 721
522529
Height = 169
523530
Align = alTop
531+
Font.Charset = DEFAULT_CHARSET
532+
Font.Color = clWindowText
533+
Font.Height = -13
534+
Font.Name = 'Consolas'
535+
Font.Pitch = fpVariable
536+
Font.Style = []
537+
ParentFont = False
524538
ScrollBars = ssBoth
525539
TabOrder = 2
526540
end
527541
object PyEngine: TPythonEngine
528-
DllName = 'python38.dll'
529-
APIVersion = 1013
530-
RegVersion = '3.8'
531-
UseLastKnownVersion = False
532542
IO = PythonGUIInputOutput1
533543
Left = 16
534544
Top = 16

0 commit comments

Comments
 (0)