Skip to content

Commit e51d14e

Browse files
phillc54phillc54
committed
qtplasmac: fix 5th axis buttons
1 parent 6684382 commit e51d14e

File tree

7 files changed

+64
-61
lines changed

7 files changed

+64
-61
lines changed

‎share/qtvcp/images/qtplasmac/images/jog_b_minus.svg‎

Lines changed: 22 additions & 20 deletions
Loading

‎share/qtvcp/images/qtplasmac/images/jog_b_plus.svg‎

Lines changed: 22 additions & 20 deletions
Loading

‎share/qtvcp/screens/qtplasmac/qtplasmac.ui‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8176,6 +8176,9 @@ HOME ALL</string>
81768176
<property name="text">
81778177
<string notr="true">0</string>
81788178
</property>
8179+
<property name="popupMode">
8180+
<enum>QToolButton::InstantPopup</enum>
8181+
</property>
81798182
<property name="joint_number" stdset="0">
81808183
<number>4</number>
81818184
</property>
@@ -14480,7 +14483,7 @@ HOME ALL</string>
1448014483
<rect>
1448114484
<x>0</x>
1448214485
<y>0</y>
14483-
<width>101</width>
14486+
<width>706</width>
1448414487
<height>636</height>
1448514488
</rect>
1448614489
</property>
@@ -17255,7 +17258,7 @@ CONFIG</string>
1725517258
</customwidget>
1725617259
<customwidget>
1725717260
<class>WebWidget</class>
17258-
<extends>QWebView</extends>
17261+
<extends>QWidget</extends>
1725917262
<header>qtvcp.widgets.web_widget</header>
1726017263
</customwidget>
1726117264
<customwidget>
@@ -17329,11 +17332,6 @@ CONFIG</string>
1732917332
<extends>QToolButton</extends>
1733017333
<header>qtvcp.widgets.system_tool_button</header>
1733117334
</customwidget>
17332-
<customwidget>
17333-
<class>QWebView</class>
17334-
<extends>QWidget</extends>
17335-
<header location="global">QtWebKitWidgets/QWebView</header>
17336-
</customwidget>
1733717335
</customwidgets>
1733817336
<tabstops>
1733917337
<tabstop>arc_fail_delay</tabstop>

‎share/qtvcp/screens/qtplasmac/qtplasmac_handler.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.236.291'
1+
VERSION = '1.236.292'
22

33
'''
44
qtplasmac_handler.py
@@ -2508,7 +2508,7 @@ def set_interlock_defaults(self):
25082508
self.alwaysOnList = []
25092509
self.machineOnList = []
25102510
self.idleList = ['file_clear', 'file_open', 'file_reload', 'file_edit']
2511-
self.idleOnList = ['home_x', 'home_y', 'home_z', 'home_a', 'home_all']
2511+
self.idleOnList = ['home_x', 'home_y', 'home_z', 'home_a', 'home_b', 'home_all']
25122512
self.idleHomedList = ['camera', 'laser', 'touch_x', 'touch_y', 'touch_z', 'touch_a', 'touch_b', 'touch_xy', \
25132513
'mdi_show', 'height_lower', 'height_raise', 'wcs_button', 'set_offsets']
25142514
self.ccButton, self.otButton, self.ptButton, self.tpButton = '', '', '', ''

‎share/qtvcp/screens/qtplasmac/versions.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.236.292 2023 Oct 09</u></b>
34+
<ul style="margin:0;">
35+
<li>fix 5th axis buttons </li>
36+
</ul>
37+
3338
<br><b><u>v1.236.291 2023 Oct 01</u></b>
3439
<ul style="margin:0;">
3540
<li>less strict syntax for gcode parameters</li>

‎share/qtvcp/screens/qtplasmac_4x3/qtplasmac_4x3.ui‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2037,6 +2037,9 @@ HOME</string>
20372037
<property name="text">
20382038
<string>0</string>
20392039
</property>
2040+
<property name="popupMode">
2041+
<enum>QToolButton::InstantPopup</enum>
2042+
</property>
20402043
<property name="joint_number" stdset="0">
20412044
<number>4</number>
20422045
</property>
@@ -17314,7 +17317,7 @@ CONFIG</string>
1731417317
</customwidget>
1731517318
<customwidget>
1731617319
<class>WebWidget</class>
17317-
<extends>QWebView</extends>
17320+
<extends>QWidget</extends>
1731817321
<header>qtvcp.widgets.web_widget</header>
1731917322
</customwidget>
1732017323
<customwidget>
@@ -17388,11 +17391,6 @@ CONFIG</string>
1738817391
<extends>QToolButton</extends>
1738917392
<header>qtvcp.widgets.system_tool_button</header>
1739017393
</customwidget>
17391-
<customwidget>
17392-
<class>QWebView</class>
17393-
<extends>QWidget</extends>
17394-
<header location="global">QtWebKitWidgets/QWebView</header>
17395-
</customwidget>
1739617394
</customwidgets>
1739717395
<resources>
1739817396
<include location="."/>

‎share/qtvcp/screens/qtplasmac_9x16/qtplasmac_9x16.ui‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4606,6 +4606,9 @@ HOME</string>
46064606
<property name="text">
46074607
<string>0</string>
46084608
</property>
4609+
<property name="popupMode">
4610+
<enum>QToolButton::InstantPopup</enum>
4611+
</property>
46094612
<property name="joint_number" stdset="0">
46104613
<number>4</number>
46114614
</property>
@@ -17718,7 +17721,7 @@ CONFIG</string>
1771817721
</customwidget>
1771917722
<customwidget>
1772017723
<class>WebWidget</class>
17721-
<extends>QWebView</extends>
17724+
<extends>QWidget</extends>
1772217725
<header>qtvcp.widgets.web_widget</header>
1772317726
</customwidget>
1772417727
<customwidget>
@@ -17792,11 +17795,6 @@ CONFIG</string>
1779217795
<extends>QToolButton</extends>
1779317796
<header>qtvcp.widgets.system_tool_button</header>
1779417797
</customwidget>
17795-
<customwidget>
17796-
<class>QWebView</class>
17797-
<extends>QWidget</extends>
17798-
<header location="global">QtWebKitWidgets/QWebView</header>
17799-
</customwidget>
1780017798
</customwidgets>
1780117799
<resources>
1780217800
<include location="."/>

0 commit comments

Comments
 (0)