Skip to content

Commit 6d6452a

Browse files
nanexonanexo
committed
Merge branch 'master' into vertec-integration
2 parents 8c79b9e + 1cd6621 commit 6d6452a

File tree

755 files changed

+59282
-152616
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

755 files changed

+59282
-152616
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Disable any line endings auto conversion.
2+
* -text

‎.github/FUNDING.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# These are supported funding model platforms
2+
3+
github: [pyscripter]
4+

‎.gitignore‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,19 @@
33
*.dcu
44
*.obj
55
*.exe
6+
*.dll
67
*.bpl
78
*.bpi
89
*.dcp
910
*.rsm
1011
*.stat
1112
*.map
13+
*.o
14+
*.ppu
15+
*.rsj
16+
*.compiled
17+
*.lib
18+
*.pyd
1219

1320
# Generated source #
1421
###################
@@ -17,6 +24,7 @@
1724
# Backup files #
1825
###################
1926
*.~*
27+
*.bak
2028

2129
# IDE Files #
2230
###################
@@ -39,6 +47,6 @@
3947
/__history
4048
*.bak
4149
*.Patch
42-
VirtualTreeView.zip
4350
*.#00
4451
*.pch
52+
/Tests/TestInsightSettings.ini

‎Delphinus.Info.json‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Delphinus.Install.json‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎PythonForDelphi/Demos/Demo27/Project1.dpr‎ renamed to ‎Demos/Demo01/Demo01.dpr‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
program Project1;
2-
3-
uses
4-
Forms,
5-
Unit1 in 'Unit1.pas' {Form1};
6-
7-
{$R *.res}
8-
9-
begin
10-
Application.Initialize;
11-
Application.CreateForm(TForm1, Form1);
12-
Application.Run;
13-
end.
1+
program Demo01;
2+
3+
4+
5+
uses
6+
Forms,
7+
Unit1 in 'Unit1.pas' {Form1};
8+
9+
{$R *.res}
10+
11+
begin
12+
Application.Initialize;
13+
Application.CreateForm(TForm1, Form1);
14+
Application.Run;
15+
end.

‎PythonForDelphi/Demos/Demo31/Project1.dproj‎ renamed to ‎Demos/Demo01/Demo01.dproj‎

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{13782AFF-38C4-49AC-BA0A-8FAFC09245D8}</ProjectGuid>
4-
<MainSource>Project1.dpr</MainSource>
3+
<ProjectGuid>{CA67512A-3B3A-48FD-8952-5503337690C4}</ProjectGuid>
4+
<MainSource>Demo01.dpr</MainSource>
55
<Config Condition="'$(Config)'==''">Debug</Config>
66
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7-
<ProjectVersion>16.1</ProjectVersion>
7+
<ProjectVersion>19.1</ProjectVersion>
88
<FrameworkType>VCL</FrameworkType>
99
<Base>True</Base>
1010
<Platform Condition="'$(Platform)'==''">Win64</Platform>
@@ -29,60 +29,92 @@
2929
<CfgParent>Base</CfgParent>
3030
<Base>true</Base>
3131
</PropertyGroup>
32+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
33+
<Cfg_1_Win32>true</Cfg_1_Win32>
34+
<CfgParent>Cfg_1</CfgParent>
35+
<Cfg_1>true</Cfg_1>
36+
<Base>true</Base>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
39+
<Cfg_1_Win64>true</Cfg_1_Win64>
40+
<CfgParent>Cfg_1</CfgParent>
41+
<Cfg_1>true</Cfg_1>
42+
<Base>true</Base>
43+
</PropertyGroup>
3244
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
3345
<Cfg_2>true</Cfg_2>
3446
<CfgParent>Base</CfgParent>
3547
<Base>true</Base>
3648
</PropertyGroup>
49+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
50+
<Cfg_2_Win32>true</Cfg_2_Win32>
51+
<CfgParent>Cfg_2</CfgParent>
52+
<Cfg_2>true</Cfg_2>
53+
<Base>true</Base>
54+
</PropertyGroup>
55+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
56+
<Cfg_2_Win64>true</Cfg_2_Win64>
57+
<CfgParent>Cfg_2</CfgParent>
58+
<Cfg_2>true</Cfg_2>
59+
<Base>true</Base>
60+
</PropertyGroup>
3761
<PropertyGroup Condition="'$(Base)'!=''">
38-
<SanitizedProjectName>Project1</SanitizedProjectName>
62+
<SanitizedProjectName>Demo01</SanitizedProjectName>
3963
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;$(DCC_Namespace)</DCC_Namespace>
4064
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
41-
<VerInfo_Locale>4105</VerInfo_Locale>
42-
<DCC_DependencyCheckOutputName>Project1.exe</DCC_DependencyCheckOutputName>
65+
<VerInfo_Locale>1033</VerInfo_Locale>
66+
<DCC_DependencyCheckOutputName>Demo01.exe</DCC_DependencyCheckOutputName>
4367
<DCC_ImageBase>00400000</DCC_ImageBase>
4468
<DCC_Platform>x86</DCC_Platform>
4569
</PropertyGroup>
4670
<PropertyGroup Condition="'$(Base_Win32)'!=''">
4771
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
48-
<Icon_MainIcon>Project1_Icon.ico</Icon_MainIcon>
4972
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5073
<VerInfo_Locale>1033</VerInfo_Locale>
5174
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
75+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
76+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
77+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
5278
</PropertyGroup>
5379
<PropertyGroup Condition="'$(Base_Win64)'!=''">
5480
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
55-
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
56-
<VerInfo_Locale>1033</VerInfo_Locale>
5781
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
58-
<Icon_MainIcon>Project1_Icon.ico</Icon_MainIcon>
82+
<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
83+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
84+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
85+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
5986
</PropertyGroup>
6087
<PropertyGroup Condition="'$(Cfg_1)'!=''">
6188
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
6289
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
6390
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
6491
<DCC_DebugInformation>0</DCC_DebugInformation>
6592
</PropertyGroup>
93+
<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
94+
<BT_BuildType>Debug</BT_BuildType>
95+
</PropertyGroup>
96+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
97+
<BT_BuildType>Debug</BT_BuildType>
98+
</PropertyGroup>
6699
<PropertyGroup Condition="'$(Cfg_2)'!=''">
67100
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
68101
</PropertyGroup>
102+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
103+
<BT_BuildType>Debug</BT_BuildType>
104+
</PropertyGroup>
105+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
106+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
107+
<BT_BuildType>Debug</BT_BuildType>
108+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
109+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
110+
</PropertyGroup>
69111
<ItemGroup>
70112
<DelphiCompile Include="$(MainSource)">
71113
<MainSource>MainSource</MainSource>
72114
</DelphiCompile>
73115
<DCCReference Include="Unit1.pas">
74116
<Form>Form1</Form>
75117
</DCCReference>
76-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiExtCtrls.pas"/>
77-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiTypes.pas"/>
78-
<DCCReference Include="Unit2.pas">
79-
<Form>TestForm</Form>
80-
</DCCReference>
81-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiWindows.pas"/>
82-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiComCtrls.pas"/>
83-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiGrids.pas"/>
84-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiGraphics.pas"/>
85-
<DCCReference Include="..\..\Components\Sources\Core\WrapDelphiButtons.pas"/>
86118
<BuildConfiguration Include="Debug">
87119
<Key>Cfg_2</Key>
88120
<CfgParent>Base</CfgParent>
@@ -102,7 +134,7 @@
102134
<BorlandProject>
103135
<Delphi.Personality>
104136
<Source>
105-
<Source Name="MainSource">Project1.dpr</Source>
137+
<Source Name="MainSource">Demo01.dpr</Source>
106138
</Source>
107139
<Parameters>
108140
<Parameters Name="UseLauncher">False</Parameters>
@@ -121,7 +153,7 @@
121153
<VersionInfo Name="Special">False</VersionInfo>
122154
<VersionInfo Name="Private">False</VersionInfo>
123155
<VersionInfo Name="DLL">False</VersionInfo>
124-
<VersionInfo Name="Locale">4105</VersionInfo>
156+
<VersionInfo Name="Locale">1033</VersionInfo>
125157
<VersionInfo Name="CodePage">1252</VersionInfo>
126158
</VersionInfo>
127159
<VersionInfoKeys>
@@ -136,6 +168,7 @@
136168
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
137169
<VersionInfoKeys Name="Comments"/>
138170
</VersionInfoKeys>
171+
<Excluded_Packages/>
139172
</Delphi.Personality>
140173
<Platforms>
141174
<Platform value="Win32">True</Platform>

‎Demos/Demo01/Unit1.dfm‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
object Form1: TForm1
2+
Left = 241
3+
Top = 155
4+
Width = 544
5+
Height = 375
6+
VertScrollBar.Range = 200
7+
ActiveControl = Button1
8+
Caption = 'Demo of Python'
9+
Color = clBtnFace
10+
Font.Charset = DEFAULT_CHARSET
11+
Font.Color = clWindowText
12+
Font.Height = 11
13+
Font.Name = 'MS Sans Serif'
14+
Font.Pitch = fpVariable
15+
Font.Style = []
16+
OldCreateOrder = True
17+
PixelsPerInch = 96
18+
TextHeight = 13
19+
object Splitter1: TSplitter
20+
Left = 0
21+
Top = 153
22+
Width = 528
23+
Height = 3
24+
Cursor = crVSplit
25+
Align = alTop
26+
Color = clBtnFace
27+
ParentColor = False
28+
ExplicitWidth = 536
29+
end
30+
object Memo1: TMemo
31+
Left = 0
32+
Top = 156
33+
Width = 528
34+
Height = 136
35+
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 = []
42+
Lines.Strings = (
43+
'print(2+2)')
44+
ParentFont = False
45+
ScrollBars = ssBoth
46+
TabOrder = 1
47+
end
48+
object Panel1: TPanel
49+
Left = 0
50+
Top = 292
51+
Width = 528
52+
Height = 44
53+
Align = alBottom
54+
BevelOuter = bvNone
55+
TabOrder = 0
56+
object Button1: TButton
57+
Left = 6
58+
Top = 8
59+
Width = 115
60+
Height = 25
61+
Caption = 'Execute script'
62+
TabOrder = 0
63+
OnClick = Button1Click
64+
end
65+
object Button2: TButton
66+
Left = 168
67+
Top = 8
68+
Width = 91
69+
Height = 25
70+
Caption = 'Load script...'
71+
TabOrder = 1
72+
OnClick = Button2Click
73+
end
74+
object Button3: TButton
75+
Left = 264
76+
Top = 8
77+
Width = 89
78+
Height = 25
79+
Caption = 'Save script...'
80+
TabOrder = 2
81+
OnClick = Button3Click
82+
end
83+
end
84+
object Memo2: TMemo
85+
Left = 0
86+
Top = 0
87+
Width = 528
88+
Height = 153
89+
Align = alTop
90+
Font.Charset = DEFAULT_CHARSET
91+
Font.Color = clWindowText
92+
Font.Height = -13
93+
Font.Name = 'Consolas'
94+
Font.Pitch = fpVariable
95+
Font.Style = []
96+
ParentFont = False
97+
ScrollBars = ssBoth
98+
TabOrder = 2
99+
end
100+
object PythonEngine1: TPythonEngine
101+
IO = PythonGUIInputOutput1
102+
Left = 32
103+
end
104+
object OpenDialog1: TOpenDialog
105+
DefaultExt = '*.py'
106+
Filter = 'Python files|*.py|Text files|*.txt|All files|*.*'
107+
Title = 'Open'
108+
Left = 176
109+
end
110+
object SaveDialog1: TSaveDialog
111+
DefaultExt = '*.py'
112+
Filter = 'Python files|*.py|Text files|*.txt|All files|*.*'
113+
Title = 'Save As'
114+
Left = 208
115+
end
116+
object PythonGUIInputOutput1: TPythonGUIInputOutput
117+
UnicodeIO = True
118+
RawOutput = False
119+
Output = Memo2
120+
Left = 64
121+
end
122+
end

0 commit comments

Comments
 (0)