Skip to content

Commit 57b0dd8

Browse files
pyscripterpyscripter
authored
Merge pull request pyscripter#236 from csevast/lazarus-fpc
lcl.PythonGUIInputOutput and some python code fixes for Lazarus FPC d…
2 parents 5030c52 + 8d8a7a0 commit 57b0dd8

19 files changed

+220
-302
lines changed

‎Demos/FPC/Demo01/project1.lpi

Lines changed: 36 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<CONFIG>
33
<ProjectOptions>
4-
<Version Value="9"/>
4+
<Version Value="11"/>
55
<PathDelim Value="\"/>
66
<General>
77
<MainUnit Value="0"/>
88
<UseXPManifest Value="True"/>
99
<Icon Value="0"/>
10-
<ActiveWindowIndexAtStart Value="0"/>
1110
</General>
1211
<VersionInfo>
1312
<Language Value=""/>
1413
<CharSet Value=""/>
15-
<StringTable ProductVersion=""/>
1614
</VersionInfo>
1715
<BuildModes Count="1">
1816
<Item1 Name="default" Default="True"/>
1917
</BuildModes>
2018
<PublishOptions>
2119
<Version Value="2"/>
22-
<IgnoreBinaries Value="False"/>
23-
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
24-
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
2520
</PublishOptions>
2621
<RunParams>
2722
<local>
28-
<FormatVersion Value="1"/>
2923
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
3024
</local>
25+
<FormatVersion Value="2"/>
26+
<Modes Count="1">
27+
<Mode0 Name="default">
28+
<local>
29+
<LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
30+
</local>
31+
</Mode0>
32+
</Modes>
3133
</RunParams>
3234
<RequiredPackages Count="2">
3335
<Item1>
@@ -38,120 +40,92 @@
3840
<PackageName Value="LCL"/>
3941
</Item2>
4042
</RequiredPackages>
41-
<Units Count="8">
43+
<Units Count="9">
4244
<Unit0>
4345
<Filename Value="project1.lpr"/>
4446
<IsPartOfProject Value="True"/>
45-
<UnitName Value="project1"/>
4647
<UsageCount Value="74"/>
4748
</Unit0>
4849
<Unit1>
4950
<Filename Value="unit1.pas"/>
5051
<IsPartOfProject Value="True"/>
5152
<ComponentName Value="Form1"/>
53+
<HasResources Value="True"/>
5254
<ResourceBaseClass Value="Form"/>
5355
<UnitName Value="Unit1"/>
54-
<EditorIndex Value="0"/>
55-
<WindowIndex Value="0"/>
56-
<TopLine Value="30"/>
57-
<CursorPos X="62" Y="43"/>
56+
<CursorPos X="55" Y="9"/>
5857
<UsageCount Value="74"/>
5958
<Loaded Value="True"/>
6059
<LoadedDesigner Value="True"/>
6160
</Unit1>
6261
<Unit2>
6362
<Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\variants.pp"/>
64-
<UnitName Value="variants"/>
65-
<WindowIndex Value="0"/>
6663
<TopLine Value="4220"/>
6764
<CursorPos X="9" Y="4225"/>
6865
<UsageCount Value="37"/>
6966
</Unit2>
7067
<Unit3>
7168
<Filename Value="..\..\..\..\..\..\lazarus\fpc\2.2.4\source\rtl\inc\varianth.inc"/>
72-
<WindowIndex Value="0"/>
7369
<TopLine Value="115"/>
7470
<CursorPos X="94" Y="134"/>
7571
<UsageCount Value="37"/>
7672
</Unit3>
7773
<Unit4>
7874
<Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
79-
<UnitName Value="PythonGUIInputOutput"/>
80-
<EditorIndex Value="3"/>
81-
<WindowIndex Value="0"/>
75+
<EditorIndex Value="-1"/>
8276
<TopLine Value="154"/>
8377
<CursorPos X="52" Y="166"/>
8478
<UsageCount Value="11"/>
85-
<Loaded Value="True"/>
8679
<DefaultSyntaxHighlighter Value="Delphi"/>
8780
</Unit4>
8881
<Unit5>
8982
<Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
90-
<UnitName Value="PythonEngine"/>
91-
<EditorIndex Value="4"/>
92-
<WindowIndex Value="0"/>
93-
<TopLine Value="1"/>
94-
<CursorPos X="1" Y="1"/>
83+
<EditorIndex Value="-1"/>
9584
<UsageCount Value="11"/>
96-
<Loaded Value="True"/>
9785
<DefaultSyntaxHighlighter Value="Delphi"/>
9886
</Unit5>
9987
<Unit6>
10088
<Filename Value="..\..\..\Components\p4dlaz.pas"/>
10189
<UnitName Value="P4DLaz"/>
102-
<EditorIndex Value="2"/>
103-
<WindowIndex Value="0"/>
104-
<TopLine Value="1"/>
90+
<EditorIndex Value="-1"/>
10591
<CursorPos X="36" Y="11"/>
10692
<UsageCount Value="10"/>
107-
<Loaded Value="True"/>
10893
<DefaultSyntaxHighlighter Value="Delphi"/>
10994
</Unit6>
11095
<Unit7>
11196
<Filename Value="..\Demo06\Unit1.lfm"/>
112-
<IsVisibleTab Value="True"/>
113-
<EditorIndex Value="1"/>
114-
<WindowIndex Value="0"/>
115-
<TopLine Value="1"/>
116-
<CursorPos X="1" Y="1"/>
97+
<ComponentName Value="Form1"/>
98+
<HasResources Value="True"/>
99+
<ResourceBaseClass Value="Form"/>
100+
<EditorIndex Value="2"/>
117101
<UsageCount Value="10"/>
118102
<Loaded Value="True"/>
103+
<LoadedDesigner Value="True"/>
119104
<DefaultSyntaxHighlighter Value="LFM"/>
120105
</Unit7>
106+
<Unit8>
107+
<Filename Value="..\..\..\Source\PythonEngine.pas"/>
108+
<IsVisibleTab Value="True"/>
109+
<EditorIndex Value="1"/>
110+
<TopLine Value="4691"/>
111+
<CursorPos X="11" Y="4720"/>
112+
<UsageCount Value="10"/>
113+
<Loaded Value="True"/>
114+
<DefaultSyntaxHighlighter Value="Delphi"/>
115+
</Unit8>
121116
</Units>
122-
<JumpHistory Count="7" HistoryIndex="6">
117+
<JumpHistory Count="2" HistoryIndex="1">
123118
<Position1>
124-
<Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
125-
<Caret Line="1" Column="1" TopLine="1"/>
119+
<Filename Value="..\Demo06\Unit1.lfm"/>
126120
</Position1>
127121
<Position2>
128-
<Filename Value="..\..\..\Components\Sources\Core\PythonGUIInputOutput.pas"/>
129-
<Caret Line="205" Column="19" TopLine="193"/>
122+
<Filename Value="unit1.pas"/>
123+
<Caret Line="9" Column="55"/>
130124
</Position2>
131-
<Position3>
132-
<Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
133-
<Caret Line="1" Column="1" TopLine="1"/>
134-
</Position3>
135-
<Position4>
136-
<Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
137-
<Caret Line="3044" Column="28" TopLine="3032"/>
138-
</Position4>
139-
<Position5>
140-
<Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
141-
<Caret Line="9602" Column="10" TopLine="9597"/>
142-
</Position5>
143-
<Position6>
144-
<Filename Value="..\..\..\Components\Sources\Core\PythonEngine.pas"/>
145-
<Caret Line="2875" Column="61" TopLine="2863"/>
146-
</Position6>
147-
<Position7>
148-
<Filename Value="..\..\..\Components\p4dlaz.pas"/>
149-
<Caret Line="1" Column="1" TopLine="1"/>
150-
</Position7>
151125
</JumpHistory>
152126
</ProjectOptions>
153127
<CompilerOptions>
154-
<Version Value="9"/>
128+
<Version Value="11"/>
155129
<PathDelim Value="\"/>
156130
<SearchPaths>
157131
<IncludeFiles Value="$(ProjOutDir)"/>
@@ -168,9 +142,6 @@
168142
</Win32>
169143
</Options>
170144
</Linking>
171-
<Other>
172-
<CompilerPath Value="$(CompPath)"/>
173-
</Other>
174145
</CompilerOptions>
175146
<Debugging>
176147
<Exceptions Count="3">

‎Demos/FPC/Demo01/project1.res

924 Bytes
Binary file not shown.

‎Demos/FPC/Demo01/unit1.lfm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Form1: TForm1
66
Caption = 'Form1'
77
ClientHeight = 391
88
ClientWidth = 547
9-
LCLVersion = '0.9.30.2'
9+
LCLVersion = '2.0.10.0'
1010
object Panel1: TPanel
1111
Left = 0
1212
Height = 391
@@ -79,15 +79,15 @@ object Form1: TForm1
7979
end
8080
object PythonEngine1: TPythonEngine
8181
IO = PythonGUIInputOutput1
82-
left = 96
83-
top = 48
82+
Left = 96
83+
Top = 48
8484
end
8585
object PythonGUIInputOutput1: TPythonGUIInputOutput
8686
DelayWrites = True
8787
UnicodeIO = False
8888
RawOutput = False
8989
Output = Memo1
90-
left = 338
91-
top = 48
90+
Left = 338
91+
Top = 48
9292
end
9393
end

‎Demos/FPC/Demo01/unit1.lrs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
LazarusResources.Add('TForm1','FORMDATA',[
44
'TPF0'#6'TForm1'#5'Form1'#4'Left'#3'"'#1#6'Height'#3#135#1#3'Top'#3#175#0#5'W'
55
+'idth'#3'#'#2#7'Caption'#6#5'Form1'#12'ClientHeight'#3#135#1#11'ClientWidth'
6-
+#3'#'#2#10'LCLVersion'#6#8'0.9.30.2'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Hei'
6+
+#3'#'#2#10'LCLVersion'#6#8'2.0.10.0'#0#6'TPanel'#6'Panel1'#4'Left'#2#0#6'Hei'
77
+'ght'#3#135#1#3'Top'#2#0#5'Width'#3'#'#2#5'Align'#7#8'alClient'#12'ClientHei'
88
+'ght'#3#135#1#11'ClientWidth'#3'#'#2#8'TabOrder'#2#0#0#5'TMemo'#5'Memo1'#4'L'
99
+'eft'#2#1#6'Height'#3#183#0#3'Top'#2#1#5'Width'#3'!'#2#5'Align'#7#5'alTop'#8
@@ -13,13 +13,13 @@ LazarusResources.Add('TForm1','FORMDATA',[
1313
+#6'Height'#2#8#3'Top'#2#0#5'Width'#2'-'#0#0#17'TPairSplitterSide'#17'PairSpl'
1414
+'itterSide2'#6'Cursor'#7#7'crArrow'#4'Left'#2'2'#6'Height'#2#8#3'Top'#2#0#5
1515
+'Width'#3#239#1#0#0#0#5'TMemo'#5'Memo2'#4'Left'#2#1#6'Height'#3#152#0#3'Top'
16-
+#3#192#0#5'Width'#3'!'#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#9'prin'
17-
+'t 2+2'#0#8'TabOrder'#2#2#0#0#6'TPanel'#6'Panel2'#4'Left'#2#1#6'Height'#2'.'
18-
+#3'Top'#3'X'#1#5'Width'#3'!'#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2'.'
19-
+#11'ClientWidth'#3'!'#2#8'TabOrder'#2#3#0#7'TButton'#7'Button1'#4'Left'#3#223
20-
+#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7'Caption'#6#7'Execute'#7'OnClick'
21-
+#7#12'Button1Click'#8'TabOrder'#2#0#0#0#0#0#13'TPythonEngine'#13'PythonEngin'
22-
+'e1'#2'IO'#7#21'PythonGUIInputOutput1'#4'left'#2'`'#3'top'#2'0'#0#0#21'TPyth'
23-
+'onGUIInputOutput'#21'PythonGUIInputOutput1'#11'DelayWrites'#9#9'UnicodeIO'#8
24-
+#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'left'#3'R'#1#3'top'#2'0'#0#0#0
16+
+#3#192#0#5'Width'#3'!'#2#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#10'pri'
17+
+'nt(2+2)'#0#8'TabOrder'#2#2#0#0#6'TPanel'#6'Panel2'#4'Left'#2#1#6'Height'#2
18+
+'.'#3'Top'#3'X'#1#5'Width'#3'!'#2#5'Align'#7#8'alBottom'#12'ClientHeight'#2
19+
+'.'#11'ClientWidth'#3'!'#2#8'TabOrder'#2#3#0#7'TButton'#7'Button1'#4'Left'#3
20+
+#223#0#6'Height'#2#25#3'Top'#2#8#5'Width'#2'K'#7'Caption'#6#7'Execute'#7'OnC'
21+
+'lick'#7#12'Button1Click'#8'TabOrder'#2#0#0#0#0#0#13'TPythonEngine'#13'Pytho'
22+
+'nEngine1'#2'IO'#7#21'PythonGUIInputOutput1'#4'Left'#2'`'#3'Top'#2'0'#0#0#21
23+
+'TPythonGUIInputOutput'#21'PythonGUIInputOutput1'#11'DelayWrites'#9#9'Unicod'
24+
+'eIO'#8#9'RawOutput'#8#6'Output'#7#5'Memo1'#4'Left'#3'R'#1#3'Top'#2'0'#0#0#0
2525
]);

‎Demos/FPC/Demo01/unit1.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ interface
66

77
uses
88
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
9-
StdCtrls, ExtCtrls, PairSplitter, PythonEngine, PythonGUIInputOutput;
9+
StdCtrls, ExtCtrls, PairSplitter, PythonEngine, lcl.PythonGUIInputOutput;
1010

1111
type
1212

‎Demos/FPC/Demo06/Project1.lpi

Lines changed: 42 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CONFIG>
33
<ProjectOptions>
4-
<Version Value="10"/>
4+
<Version Value="11"/>
55
<PathDelim Value="\"/>
66
<General>
77
<MainUnit Value="0"/>
@@ -17,15 +17,19 @@
1717
</BuildModes>
1818
<PublishOptions>
1919
<Version Value="2"/>
20-
<IgnoreBinaries Value="False"/>
21-
<IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
22-
<ExcludeFileFilter Value="*.(bak|ppu|ppw|o|so);*~;backup"/>
2320
</PublishOptions>
2421
<RunParams>
2522
<local>
26-
<FormatVersion Value="1"/>
2723
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
2824
</local>
25+
<FormatVersion Value="2"/>
26+
<Modes Count="1">
27+
<Mode0 Name="default">
28+
<local>
29+
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
30+
</local>
31+
</Mode0>
32+
</Modes>
2933
</RunParams>
3034
<RequiredPackages Count="2">
3135
<Item1>
@@ -51,8 +55,8 @@
5155
<HasResources Value="True"/>
5256
<ResourceBaseClass Value="Form"/>
5357
<IsVisibleTab Value="True"/>
54-
<TopLine Value="4"/>
55-
<CursorPos X="17" Y="16"/>
58+
<TopLine Value="244"/>
59+
<CursorPos X="16" Y="292"/>
5660
<UsageCount Value="45"/>
5761
<Loaded Value="True"/>
5862
<LoadedDesigner Value="True"/>
@@ -112,13 +116,42 @@
112116
<DefaultSyntaxHighlighter Value="Delphi"/>
113117
</Unit8>
114118
</Units>
115-
<JumpHistory HistoryIndex="-1"/>
119+
<JumpHistory Count="7" HistoryIndex="6">
120+
<Position1>
121+
<Filename Value="Unit1.pas"/>
122+
<Caret Line="16" Column="17" TopLine="4"/>
123+
</Position1>
124+
<Position2>
125+
<Filename Value="Unit1.pas"/>
126+
<Caret Line="11" Column="17"/>
127+
</Position2>
128+
<Position3>
129+
<Filename Value="Unit1.pas"/>
130+
<Caret Line="9" Column="2" TopLine="2"/>
131+
</Position3>
132+
<Position4>
133+
<Filename Value="Unit1.pas"/>
134+
<Caret Line="292"/>
135+
</Position4>
136+
<Position5>
137+
<Filename Value="Unit1.pas"/>
138+
<Caret Line="57" Column="23" TopLine="29"/>
139+
</Position5>
140+
<Position6>
141+
<Filename Value="Unit1.pas"/>
142+
<Caret Line="58" Column="31" TopLine="30"/>
143+
</Position6>
144+
<Position7>
145+
<Filename Value="Unit1.pas"/>
146+
<Caret Line="59" Column="35" TopLine="31"/>
147+
</Position7>
148+
</JumpHistory>
116149
</ProjectOptions>
117150
<CompilerOptions>
118151
<Version Value="11"/>
119152
<PathDelim Value="\"/>
120153
<SearchPaths>
121-
<IncludeFiles Value="$(ProjOutDir);..\..\..\Components\Sources\Core"/>
154+
<IncludeFiles Value="$(ProjOutDir);..\..\..\Source"/>
122155
</SearchPaths>
123156
<Parsing>
124157
<SyntaxOptions>

‎Demos/FPC/Demo06/Project1.res

120 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy