Skip to content

Commit 362b8c7

Browse files
mvdw73mvdw73
committed
Revert "Fixed shebang to explicitly call python3 instead of regular python"
This reverts commit 08d0e1d.
1 parent 08d0e1d commit 362b8c7

File tree

6 files changed

+43
-45
lines changed

6 files changed

+43
-45
lines changed

‎samples/ControlsDesktop/controlsdemo.py‎

100755100644
Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#----------------------------------------------------------------------------------
33
# Name: CtrlsDemoFrm
44
# Purpose: More demonstration showing more controls, with more properties and
@@ -88,75 +88,73 @@ def __config_comps(self):
8888
self.mi_exit.SetProps(Parent = self.mi_file, Text = "Exit", OnClick = (lambda sender: Application.Terminate()))
8989
self.od_style.SetProps(Filter = "FireMonkey Styles|*.style;*.fsf")
9090

91-
self.sb_status.SetProps(Parent = self, Padding = Bounds(RectF(2, 5, 30, 5)), Position = Position(PointF(0, 5)),ShowSizeGrip = True)
92-
try:
93-
self.sb_status.Size.SetProps(Size = SizeF(835, 29), PlatformDefault = False)
94-
except Exception as e:
95-
print(e)
91+
self.sb_status.SetProps(Parent = self, Padding = Bounds(RectF(2, 5, 30, 5)), Position = Position(PointF(0, 5)), ShowSizeGrip = True)
92+
self.sb_status.Size.SetProps(Size = SizeF(835, 29), PlatformDefault = False)
93+
9694
self.lbl_status.SetProps(Parent = self.sb_status, Text = "TStatusBar", Position = Position(PointF(2, 5)))
9795

9896
self.lbl_scale_text.SetProps(Parent = self.sb_status, Text = "100%", Align = "Right")
99-
#self.lbl_scale_text.Size.SetProps(Size = SizeF(38, 19), PlatformDefault = False)
97+
self.lbl_scale_text.Size.SetProps(Size = SizeF(38, 19), PlatformDefault = False)
10098
self.lbl_scale_text.TextSettings.SetProps(HorzALign = "Center")
10199

102100
self.tb_scale.SetProps(Parent = self.sb_status, Align = "Right", CanParentFocus = True, Frequency = 0.1, Max = 1.0, Min = 0.5, Orientation = "Horizontal", TabOrder = 2, Value = 1)
103-
#self.tb_scale.Size.SetProps(Size = SizeF(116, 19), PlatformDefault = False)
101+
self.tb_scale.Size.SetProps(Size = SizeF(116, 19), PlatformDefault = False)
104102
self.tb_scale.SetProps(OnChange = self.__on_tb_scale_change)
105103

106104
self.lbl_scale_label.SetProps(Parent = self.sb_status, Text = "Scale:", Align = "Right")
107-
#self.lbl_scale_label.Size.SetProps(Size = SizeF(57, 19), PlatformDefault = False)
105+
self.lbl_scale_label.Size.SetProps(Size = SizeF(57, 19), PlatformDefault = False)
108106
self.lbl_scale_label.TextSettings.SetProps(HorzALign = "Center")
109107

110108
self.lo_control.SetProps(Parent = self, Align = "Client", OnResize = self.__on_lo_control_resize)
111109

112110
self.lo_control_root.SetProps(Parent = self.lo_control, HitTest = True, Padding = Bounds(RectF(5, 5, 5, 5)), Margins = Bounds(RectF(5, 5, 5, 5)), Position = Position(PointF(5, 5)))
113-
#self.lo_control_root.Size.SetProps(Size = SizeF(825, 500), PlatformDefault = False)
111+
self.lo_control_root.Size.SetProps(Size = SizeF(825, 500), PlatformDefault = False)
114112

115113
self.tc_tabs.SetProps(Parent = self.lo_control_root, Align = "Client", Margins = Bounds(RectF(4, 4, 4, 4)), TabIndex = 4, TabPosition = "Top")
116114

117115
self.__config_std_comps()
118116

119117
def __config_std_comps(self):
120118
self.ti_standard.SetProps(Parent = self.tc_tabs, IsSelected = False, Text = "Standard")
121-
#self.ti_standard.Size.SetProps(Size = SizeF(68, 26), PlatformDefault = False)
119+
self.ti_standard.Size.SetProps(Size = SizeF(68, 26), PlatformDefault = False)
122120

123121
self.lbl_sb.SetProps(Parent = self.ti_standard, Position = Position(PointF(265, 18)), Text = "ListBox & ListBoxItem", TabOrder = 0)
124-
#self.lbl_sb.Size.SetProps(Size = SizeF(127, 17), PlatformDefault = False)
122+
self.lbl_sb.Size.SetProps(Size = SizeF(127, 17), PlatformDefault = False)
125123

126124
self.lbl_text_box.SetProps(Parent = self.ti_standard, Position = Position(PointF(20, 16)), Text = "Edit", TabOrder = 0)
127-
#self.lbl_text_box.Size.SetProps(Size = SizeF(52, 17), PlatformDefault = False)
125+
self.lbl_text_box.Size.SetProps(Size = SizeF(52, 17), PlatformDefault = False)
128126

129127
self.edt_text_box.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 32)), Text = "some text", TabOrder = 2, HelpType = "htKeyword")
130-
#self.edt_text_box.Size.SetProps(Size = SizeF(110, 24), PlatformDefault = False)
128+
self.edt_text_box.Size.SetProps(Size = SizeF(110, 24), PlatformDefault = False)
131129

132130
self.sb_1.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 211)), Value = 33, ViewportSize = 20, SmallChange = 0, TabOrder = 3, Orientation = "Horizontal")
133-
#self.sb_1.Size.SetProps(Size = SizeF(179, 18), PlatformDefault = False)
131+
self.sb_1.Size.SetProps(Size = SizeF(179, 18), PlatformDefault = False)
134132
self.sb_1.SetProps(OnChange = self.__on_change_sb_1)
135133

136134
self.sb_2.SetProps(Parent = self.ti_standard, Position = Position(PointF(218, 77)), ViewportSize = 0.2, SmallChange = 0, TabOrder = 4, Orientation = "Vertical")
137-
#self.sb_2.Size.SetProps(Size = SizeF(18, 154), PlatformDefault = False)
135+
self.sb_2.Size.SetProps(Size = SizeF(18, 154), PlatformDefault = False)
138136

139137
self.cb.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 71)), TabOrder = 5, IsChecked = True, Text = "CheckBox")
140-
#self.cb.Size.SetProps(Size = SizeF(119, 19), PlatformDefault = False)
138+
self.cb.Size.SetProps(Size = SizeF(119, 19), PlatformDefault = False)
141139

142140
self.rb_1.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 95)), TabOrder = 6, Text = "RadioButton")
143-
#self.rb_1.Size.SetProps(Size = SizeF(94, 19), PlatformDefault = False)
141+
self.rb_1.Size.SetProps(Size = SizeF(94, 19), PlatformDefault = False)
144142

145143
self.rb_2.SetProps(Parent = self.ti_standard, Position = Position(PointF(113, 95)), TabOrder = 7, IsChecked = True, Text = "RadioButton")
146-
#self.rb_2.Size.SetProps(Size = SizeF(98, 19), PlatformDefault = False)
144+
self.rb_2.Size.SetProps(Size = SizeF(98, 19), PlatformDefault = False)
147145

148146
self.pg.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 251)), Value = 33)
149-
#self.pg.Size.SetProps(Size = SizeF(384, 18), PlatformDefault = False)
147+
self.pg.Size.SetProps(Size = SizeF(384, 18), PlatformDefault = False)
150148

151149
self.ai.SetProps(Parent = self.ti_standard, Position = Position(PointF(146, 32)), StyleLookup = 'labelstyle', Enabled = True)
152-
#self.ai.Size.SetProps(Size = SizeF(23, 24), PlatformDefault = False)
150+
self.ai.Size.SetProps(Size = SizeF(23, 24), PlatformDefault = False)
153151

154152
self.lb_ani_indicator.SetProps(Parent = self.ti_standard, Position = Position(PointF(171, 37)), TabOrder = 10, Text = 'Ani indicator')
155-
#self.lb_ani_indicator.Size.SetProps(Size = SizeF(80, 15), PlatformDefault = False)
153+
self.lb_ani_indicator.Size.SetProps(Size = SizeF(80, 15), PlatformDefault = False)
156154
self.lb_ani_indicator.TextSettings.HorzAlign = "Center"
157155

158156
self.lb_string.SetProps(Parent = self.ti_standard, Position = Position(PointF(272, 39)), TabOrder = 11, DisableFocusEffect = True, ItemHeight = 19.00)
159-
#self.lb_string.Size.SetProps(Size = SizeF(127, 166), PlatformDefault = False)
157+
self.lb_string.Size.SetProps(Size = SizeF(127, 166), PlatformDefault = False)
160158
self.lb_string.DefaultItemStyles.SetProps(ItemStyle = '', GroupHeaderStyle = '', GroupFooterStyle = '')
161159

162160
self.lb_string.Items.Add("ListBoxItem")
@@ -183,7 +181,7 @@ def __config_std_comps(self):
183181
self.lb_string.Items.Add("ListBoxItem")
184182

185183
self.cb_string.SetProps(Parent = self.ti_standard, Position = Position(PointF(15, 126)), ItemHeight = 19.00, ListBoxResource = 'transparentlistboxstyle', TabOrder = 12)
186-
#self.cb_string.Size.SetProps(Size = SizeF(179, 23), PlatformDefault = False)
184+
self.cb_string.Size.SetProps(Size = SizeF(179, 23), PlatformDefault = False)
187185

188186
self.cb_string.Items.Add("ListBoxItem")
189187
self.cb_string.Items.Add("ListBoxItem")
@@ -209,52 +207,52 @@ def __config_std_comps(self):
209207
self.cb_string.Items.Add("ListBoxItem")
210208

211209
self.btn_glyph.SetProps(Parent = self.ti_standard, Position = Position(PointF(126, 298)), TabOrder = 13, Text = "Glyph")
212-
#self.btn_glyph.Size.SetProps(Size = SizeF(100, 26), PlatformDefault = False)
210+
self.btn_glyph.Size.SetProps(Size = SizeF(100, 26), PlatformDefault = False)
213211

214212
self.pnl.SetProps(Parent = self.ti_standard, Position = Position(PointF(412, 16)), TabOrder = 14)
215-
#self.pnl.Size.SetProps(Size = SizeF(138, 145), PlatformDefault = False)
213+
self.pnl.Size.SetProps(Size = SizeF(138, 145), PlatformDefault = False)
216214

217215
self.lb_panel.SetProps(Parent = self.pnl, Position = Position(PointF(21, 7)), Text = "Panel")
218-
#self.lb_panel.Size.SetProps(Size = SizeF(94, 22), PlatformDefault = False)
216+
self.lb_panel.Size.SetProps(Size = SizeF(94, 22), PlatformDefault = False)
219217
self.lb_panel.TextSettings.HorzAlign = "Center"
220218

221219
self.btn_panel_1.SetProps(Parent = self.pnl, Position = Position(PointF(26, 43)), Text = "SpeedButton")
222-
#self.btn_panel_1.Size.SetProps(Size = SizeF(85, 25), PlatformDefault = False)
220+
self.btn_panel_1.Size.SetProps(Size = SizeF(85, 25), PlatformDefault = False)
223221

224222
self.btn_panel_2.SetProps(Parent = self.pnl, Position = Position(PointF(26, 83)), Text = "SpeedButton")
225-
#self.btn_panel_2.Size.SetProps(Size = SizeF(85, 25), PlatformDefault = False)
223+
self.btn_panel_2.Size.SetProps(Size = SizeF(85, 25), PlatformDefault = False)
226224

227225
self.ssb.SetProps(Parent = self.ti_standard, Position = Position(PointF(243, 79)), TabOrder = 15, ViewportSize = 33, SmallChange = 0, Orientation = "Vertical")
228-
#self.ssb.Size.SetProps(Size = SizeF(8, 150), PlatformDefault = False)
226+
self.ssb.Size.SetProps(Size = SizeF(8, 150), PlatformDefault = False)
229227

230228
self.cb_multi_select.SetProps(Parent = self.ti_standard, Position = Position(PointF(272, 212)), TabOrder = 16, Text = "MultiSelect")
231-
#self.cb_multi_select.Size.SetProps(Size = SizeF(120, 19), PlatformDefault = False)
229+
self.cb_multi_select.Size.SetProps(Size = SizeF(120, 19), PlatformDefault = False)
232230
self.cb_multi_select.SetProps(OnChange = self.__on_change_cb_multi_select)
233231

234232
self.cp.SetProps(Parent = self.ti_standard, Position = Position(PointF(412, 185)), TabOrder = 17, CalloutWidth = 23, CalloutLength = 11, CalloutPosition = "Right")
235-
#self.cp.Size.SetProps(Size = SizeF(169, 124), PlatformDefault = False)
233+
self.cp.Size.SetProps(Size = SizeF(169, 124), PlatformDefault = False)
236234

237235
self.lbl_cp.SetProps(Parent = self.cp, Text = "CalloutPanel", Align = "Center")
238-
#self.lbl_cp.Size.SetProps(Size = SizeF(97, 22), PlatformDefault = False)
236+
self.lbl_cp.Size.SetProps(Size = SizeF(97, 22), PlatformDefault = False)
239237
self.lbl_cp.TextSettings.SetProps(HorzAlign = "Center")
240238

241239
self.callout_right.SetProps(Parent = self.cp, Position = Position(PointF(127, 56)), GroupName = "1", IsChecked = True, OnChange = self.__on_co_btn_change)
242-
#self.callout_right.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
240+
self.callout_right.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
243241

244242
self.callout_top.SetProps(Parent = self.cp, Position = Position(PointF(74, 18)), GroupName = "1", IsChecked = False, OnChange = self.__on_co_btn_change)
245-
#self.callout_top.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
243+
self.callout_top.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
246244

247245
self.callout_left.SetProps(Parent = self.cp, Position = Position(PointF(15, 58)), GroupName = "1", IsChecked = False, OnChange = self.__on_co_btn_change)
248-
#self.callout_left.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
246+
self.callout_left.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
249247

250248
self.callout_bottom.SetProps(Parent = self.cp, Position = Position(PointF(74, 86)), GroupName = "1", IsChecked = False, OnChange = self.__on_co_btn_change)
251-
#self.callout_bottom.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
249+
self.callout_bottom.Size.SetProps(Size = SizeF(19, 19), PlatformDefault = False)
252250

253251
self.tb.SetProps(Parent = self.ti_standard, Position = Position(PointF(16, 174)), TabOrder = 18, Orientation = "Horizontal", CanParentFocus = True, Value = 33)
254-
#self.tb.Size.SetProps(Size = SizeF(179, 19), PlatformDefault = False)
252+
self.tb.Size.SetProps(Size = SizeF(179, 19), PlatformDefault = False)
255253

256254
self.lbl_tb.SetProps(Parent = self.ti_standard, Position = Position(PointF(16, 232)), TabOrder = 19)
257-
#self.tb.Size.SetProps(Size = SizeF(120, 15), PlatformDefault = False)
255+
self.tb.Size.SetProps(Size = SizeF(120, 15), PlatformDefault = False)
258256

259257
def __init_comps(self):
260258
self.__on_lo_control_resize(self.lo_control)

‎samples/HelloDelphiFMX.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#----------------------------------------------------------------
33
# Name: HelloDelphiFMX.py
44
# Purpose: Simple DelphiFMX for Python demonstration with OOP

‎samples/HiDPI/HelloHighDpi.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#----------------------------------------------------------------
33
# Name: hello_highdpi.py
44
# Purpose: Test of High DPI Awareness
@@ -69,4 +69,4 @@ def main():
6969
Application.MainForm.Destroy()
7070

7171
if __name__ == '__main__':
72-
main()
72+
main()

‎samples/PasswordGenerator.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#----------------------------------------------------------------
33
# Name: PasswordGenerator.py
44
# Purpose: Password Generator built with DelphiFMX GUI Framework

‎samples/Simplest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#-----------------------------------------------
33
# Name: Simplest.py
44
# Purpose: The simplest demo of Delphi FMX

‎samples/ToDoList.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python
22
#----------------------------------------------------------------
33
# Name: ToDoList.py
44
# Purpose: Simple ToDo List built with Delphi FMX

0 commit comments

Comments
 (0)