Skip to content

Commit 2d240af

Browse files
committed
qtplasmac: clarify section/option error message for user buttons
1 parent 5380b98 commit 2d240af

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
VERSION = '015.080'
1+
VERSION = '015.081'
22
LCNCVER = '2.10'
33

44
'''
55
qtplasmac_handler.py
66
77
Copyright (C) 2020-2025 Phillip A Carter
8-
Copyright (C) 2020-2025 Gregory D Carl
8+
Copyright (C) 2020-2026 Gregory D Carl
99
1010
This program is free software; you can redistribute it and/or modify it
1111
under the terms of the GNU General Public License as published by the
@@ -4518,8 +4518,11 @@ def user_button_command(self, bNum, command):
45184518
msg0 = _translate('HandlerClass', 'Invalid code in user button')
45194519
msg1 = self.w[f'button_{bNum}'].text().replace('\n', ' ')
45204520
errorCode = f'{subCommand.replace(":", "{")}' + '}'
4521-
msg2 = _translate('HandlerClass', 'Provided section option pair does not exist')
4522-
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, f'{head}:\n{msg0} #{bNum} ({msg1}):\n"{errorCode}"\n{msg2}\n')
4521+
msg2 = _translate('HandlerClass', 'Section')
4522+
msg3 = _translate('HandlerClass', 'or option')
4523+
msg4 = _translate('HandlerClass', 'does not exist in')
4524+
msg5 = _translate('HandlerClass', 'Section and option pairs are case sensative')
4525+
STATUS.emit('error', linuxcnc.OPERATOR_ERROR, f'{head}:\n{msg0} #{bNum} ({msg1}):\n"{errorCode}"\n{msg2}: "[{section}]" {msg3}: "{option}" {msg4}:\n{self.prefsFile}\n{msg5}\n')
45234526
return
45244527
subCommand = ''
45254528
elif subCommand.startswith(':'):

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,16 @@ <h2>QtPlasmaC Version History - LinuxCNC 2.10</h2>
2626
</table>
2727
<br>
2828
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
29+
<br><b><u>015.081 2026 Feb 03</u></b>
30+
<ul style="margin:0;">
31+
<li>rename variables to avoid conflict with python builtin names</li>
32+
<li>remove redundant str() calls in f-strings</li>
33+
<li>fix tab level</li>
34+
<li>fix typo in pmx485 fault list</li>
35+
<li>allow file clear button to work if single cut encounters a bounds error</li>
36+
<li>clarify section/option error message for user buttons</li>
37+
</ul>
38+
2939
<br><b><u>015.080 2026 Feb 01</u></b>
3040
<ul style="margin:0;">
3141
<li>rework torch pulse</li>

0 commit comments

Comments
 (0)