Skip to content

Commit 2283f17

Browse files
committed
qtplasmac: enhance button interlocking and preview stack behavior
1 parent 34fb8d8 commit 2283f17

4 files changed

Lines changed: 304 additions & 229 deletions

File tree

docs/src/plasma/qtplasmac.adoc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ The <<plasma:conversational-tab,CONVERSATIONAL Tab>> enables the user to quickly
10091009

10101010
See <<plasma:shape-library,Conversational Shape Library>> for detailed information on the Conversational feature.
10111011

1012-
It is possible to disable this tab so the conversational feature cannot be used by an operator. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
1012+
It is possible to hide this tab so the conversational feature cannot be used by an operator. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
10131013

10141014
[source,{hal}]
10151015
----
@@ -1027,7 +1027,7 @@ Some functions/features are only used for particular modes and are not displayed
10271027

10281028
This tab is used to display configuration parameters that are modified infrequently.
10291029

1030-
It is possible to disable this tab so machine settings cannot be modified by unauthorized personnel. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
1030+
It is possible to hide this tab so machine settings cannot be modified by unauthorized personnel. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
10311031

10321032
[source,{hal}]
10331033
----
@@ -1205,7 +1205,7 @@ image::images/qtplasmac_settings.png[width=800,align="center"]
12051205

12061206
This tab is used to display GUI configuration parameters, button text, and shutdown text that are modified infrequently as well as some utility buttons.
12071207

1208-
It is possible to disable this tab so machine settings cannot be modified by unauthorized personnel. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
1208+
It is possible to hide this tab so machine settings cannot be modified by unauthorized personnel. This may be achieved either by wiring the pin to a physical key-switch or similar or it may also be set in a HAL file using the following command:
12091209

12101210
[source,{hal}]
12111211
----
@@ -3121,17 +3121,17 @@ Preview = #000000
31213121
=== Custom Python Code
31223122

31233123
It is possible to add custom Python code to change some existing functions or to add new ones.
3124-
Custom code can be added in two different way, a user command file or a user periodic file.
3124+
Custom code can be added in two different ways: a user command file or a user periodic file.
31253125

3126-
A user command file is specified in the DISPLAY section of the _<machine_name>_.ini file and contains Python code that is processed during startup.
3126+
A user command file is specified in the DISPLAY section of the _<machine_name>_.ini file and contains Python code that is processed only once during startup.
31273127

31283128
[source,{ini}]
31293129
----
3130-
n USER_COMMAND_FILE = my_custom_code.py
3130+
USER_COMMAND_FILE = my_custom_code.py
31313131
----
31323132

3133-
A user periodic file must be named user_periodic.py and must be loated in the machines config directory.
3134-
This file is processed every cycle (usually 100ms) and is used for functions that require regular updating.
3133+
A user periodic file must be named user_periodic.py and must be loaded in the machines config directory.
3134+
This file is processed every cycle (usually 100 ms) and is used for functions that require regular updating.
31353135

31363136
== QtPlasmaC Advanced Topics
31373137

lib/python/qtvcp/lib/qtplasmac/tooltips.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def set_tool_tips(W):
204204
W.file_edit.setToolTip(_translate('ToolTips', 'Toggles the use of the G-Code file editor'))
205205
W.mdi_show.setToolTip(_translate('ToolTips', 'Toggles the use of Manual Data Input mode'))
206206
text0 = _translate('ToolTips', 'User button')
207-
text1 = _translate('ToolTips', 'configured in the INI file')
207+
text1 = _translate('ToolTips', 'configured in the SETTINGS tab')
208208
for b in range(1,21):
209209
W['button_{}'.format(b)].setToolTip(_translate('ToolTips', '{} #{} {}'.format(text0, b, text1)))
210210

0 commit comments

Comments
 (0)