From 07bc52a8156d201d89d40143d6e62d6b33263397 Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 13:46:54 +0200 Subject: [PATCH 1/3] Win64 is now the default platform; removed/replaced old icons; improved high DPI awareness --- Demos/Demo27/Demo27.dproj | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Demos/Demo27/Demo27.dproj b/Demos/Demo27/Demo27.dproj index 85619559..88c92d12 100644 --- a/Demos/Demo27/Demo27.dproj +++ b/Demos/Demo27/Demo27.dproj @@ -68,7 +68,7 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments= - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) @@ -77,6 +77,7 @@ true $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png + $(BDS)\bin\delphi_PROJECTICON.ico $(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png @@ -87,6 +88,9 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= 1033 $(BDS)\bin\default_app.manifest + $(BDS)\bin\delphi_PROJECTICON.ico + true + PerMonitorV2 false @@ -112,6 +116,9 @@ true PerMonitorV2 + true + 1033 + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= From 8b8d42429f6b9afd4b2187616104cde76e4ed6c9 Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 13:47:06 +0200 Subject: [PATCH 2/3] Fixed Integer/nativeInt issue --- Demos/Demo27/Unit1.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Demos/Demo27/Unit1.pas b/Demos/Demo27/Unit1.pas index c37f5c9c..637b1267 100644 --- a/Demos/Demo27/Unit1.pas +++ b/Demos/Demo27/Unit1.pas @@ -10,7 +10,7 @@ interface TMySeq = class(TPyObject) public // Mapping services - function MpLength : Integer; override; + function MpLength : NativeInt; override; function MpSubscript( obj : PPyObject) : PPyObject; override; //function MpAssSubscript( obj1, obj2 : PPyObject) : Integer; override; end; @@ -40,7 +40,7 @@ implementation { TMySeq } -function TMySeq.MpLength: Integer; +function TMySeq.MpLength: NativeInt; begin Result := 10; end; From 547f6567c24b2da2bd6c426e5ea8a85a600ca00a Mon Sep 17 00:00:00 2001 From: Reinier Sterkenburg Date: Sun, 4 Oct 2020 13:47:10 +0200 Subject: [PATCH 3/3] Python code now Python 3 compatible; Memo font is now Consolas, size 10 --- Demos/Demo27/Unit1.dfm | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/Demos/Demo27/Unit1.dfm b/Demos/Demo27/Unit1.dfm index 80eac301..029d5a24 100644 --- a/Demos/Demo27/Unit1.dfm +++ b/Demos/Demo27/Unit1.dfm @@ -1,9 +1,9 @@ object Form1: TForm1 Left = 192 Top = 114 - Width = 870 - Height = 640 Caption = 'Form1' + ClientHeight = 601 + ClientWidth = 854 Color = clBtnFace Font.Charset = DEFAULT_CHARSET Font.Color = clWindowText @@ -18,6 +18,12 @@ object Form1: TForm1 Top = 24 Width = 745 Height = 281 + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Consolas' + Font.Style = [] + ParentFont = False TabOrder = 0 end object Memo2: TMemo @@ -25,17 +31,23 @@ object Form1: TForm1 Top = 320 Width = 745 Height = 217 + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -13 + Font.Name = 'Consolas' + Font.Style = [] Lines.Strings = ( 'import test' 'S=test.CreateMySeq()' - 'print S' - 'print len(S)' - 'print S[1]' - 'print S[1,2]' - 'print S[1:2]' - 'print S[1:20:2]' - 'print S[...]' - 'print S[1,4,5:8, 10:20:2, ...]') + 'print (S)' + 'print (len(S))' + 'print (S[1])' + 'print (S[1,2])' + 'print (S[1:2])' + 'print (S[1:20:2])' + 'print (S[...])' + 'print (S[1,4,5:8, 10:20:2, ...])') + ParentFont = False TabOrder = 1 end object Button1: TButton @@ -53,6 +65,8 @@ object Form1: TForm1 Top = 144 end object PythonGUIInputOutput1: TPythonGUIInputOutput + UnicodeIO = True + RawOutput = False Output = Memo1 Left = 40 Top = 176