Merge branch '2.9'

LinuxCNC · Feb 7, 2023 · 05eb2be · 05eb2be
2 parents c8d7481 + b9e84d4
commit 05eb2be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
@@ -1,4 +1,4 @@
-VERSION = '1.235.264'
+VERSION = '1.235.265'
 
 '''
 qtplasmac_handler.py
@@ -1918,7 +1918,7 @@ def backup_clicked(self):
             os.remove(tmpFile)
         except:
             log = _translate('HandlerClass', 'Unknown error removing')
-            STATUS.emit('update-machine-log', '{} config_info.txt'.format(log, file), 'TIME')
+            STATUS.emit('update-machine-log', '{} {}'.format(log, tmpFile), 'TIME')
         head = _translate('HandlerClass', 'Backup Complete')
         msg0 = _translate('HandlerClass', 'A compressed backup of the machine configuration including the machine logs has been saved in your home directory as')
         msg1 = _translate('HandlerClass', 'It is safe to delete this file at any time')
@@ -3875,9 +3875,7 @@ def user_button_command(self, bNum, command):
                     if char == '{':
                         subCommand = ':'
                     elif char == '}':
-                        print(f'subCommand={subCommand}<')
                         f1, f2 = subCommand.replace(':','').split()
-                        print(f'f1={f1}<   f2={f2}<')
                         newCommand += self.iniFile.find(f1,f2)
                         subCommand = ''
                     elif subCommand.startswith(':'):
@@ -5230,7 +5228,7 @@ def pmx485_check(self, port, periodic=False):
                     return False
             else:
                 if not periodic:
-                    msg0 = _('cannot be found')
+                    msg0 = _translate('cannot be found')
                     STATUS.emit('error', linuxcnc.OPERATOR_ERROR, '{}:\n{} {}\n{}'.format(head, port, msg0, msg1))
                 return False
         except:

diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html
@@ -30,12 +30,18 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.235.265 2023 Feb 04</u></b>
+<ul style="margin:0;">
+  <li>fix camera selection if multiple cameras are available</li>
+</ul>
+
 <br><b><u>v1.235.264 2023 Jan 24</u></b>
 <ul style="margin:0;">
   <li>use status for motion type</li>
   <li>laser/camera button interlocking</li>
   <li>set laser button active when in use</li>
 </ul>
+
 <i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
 
 <br><b><u>v1.235.263 2023 Jan 21</u></b>