Skip to content

Commit d240cd8

Browse files
committed
qtplasmac: change power button from ActionButton to QPushButton on 9x16 screen
I noticed this did not behave as expected, for some reason the power button was different than the other two screens (16x9 and 4x3) that behave as expected.
1 parent 5032664 commit d240cd8

File tree

3 files changed

+6
-46
lines changed

3 files changed

+6
-46
lines changed

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '010.076'
1+
VERSION = '010.077'
22
LCNCVER = '2.10'
33

44
'''

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>010.077 2025 Dec 22</u></b>
30+
<ul style="margin:0;">
31+
<li>change power button from ActionButton to QPushButton on 9x16 screen</li>
32+
2933
<br><b><u>010.076 2025 Dec 22</u></b>
3034
<ul style="margin:0;">
3135
<li>allow probe test to be aborted when plasmac.probe-test-error goes true</li>

share/qtvcp/screens/qtplasmac_9x16/qtplasmac_9x16.ui

Lines changed: 1 addition & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,7 +2652,7 @@ ORIGIN</string>
26522652
</widget>
26532653
</item>
26542654
<item>
2655-
<widget class="ActionButton" name="power">
2655+
<widget class="QPushButton" name="power">
26562656
<property name="sizePolicy">
26572657
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
26582658
<horstretch>0</horstretch>
@@ -2695,50 +2695,6 @@ ORIGIN</string>
26952695
<property name="checkable">
26962696
<bool>true</bool>
26972697
</property>
2698-
<property name="indicator_option" stdset="0">
2699-
<bool>false</bool>
2700-
</property>
2701-
<property name="indicator_HAL_pin_option" stdset="0">
2702-
<bool>false</bool>
2703-
</property>
2704-
<property name="indicator_status_option" stdset="0">
2705-
<bool>false</bool>
2706-
</property>
2707-
<property name="checked_state_text_option" stdset="0">
2708-
<bool>false</bool>
2709-
</property>
2710-
<property name="on_color" stdset="0">
2711-
<color>
2712-
<red>255</red>
2713-
<green>0</green>
2714-
<blue>0</blue>
2715-
</color>
2716-
</property>
2717-
<property name="off_color" stdset="0">
2718-
<color>
2719-
<red>0</red>
2720-
<green>0</green>
2721-
<blue>0</blue>
2722-
</color>
2723-
</property>
2724-
<property name="indicator_size" stdset="0">
2725-
<double>0.200000000000000</double>
2726-
</property>
2727-
<property name="true_state_string" stdset="0">
2728-
<string/>
2729-
</property>
2730-
<property name="false_state_string" stdset="0">
2731-
<string/>
2732-
</property>
2733-
<property name="is_estopped_status" stdset="0">
2734-
<bool>false</bool>
2735-
</property>
2736-
<property name="is_on_status" stdset="0">
2737-
<bool>true</bool>
2738-
</property>
2739-
<property name="machine_on_action" stdset="0">
2740-
<bool>true</bool>
2741-
</property>
27422698
</widget>
27432699
</item>
27442700
</layout>

0 commit comments

Comments
 (0)