Merge branch '2.9'

Author: c-morley

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -495,6 +495,7 @@ def dialog_return(self, w, message):
         elif wait_code and name == 'MESSAGE':
             self.h['eoffset-spindle-count'] = 0
             self.h['eoffset-clear'] = True
+            self.add_status('Spindle lowered')
         elif unhome_code and name == 'MESSAGE' and rtn is True:
             ACTION.SET_MACHINE_UNHOMED(-1)
         elif overwrite and name == 'MESSAGE':
@@ -683,8 +684,10 @@ def disable_pause_buttons(self, state):
             fval = float(self.w.lineEdit_eoffset_count.text())
             self.h['eoffset-spindle-count'] = int(fval)
             self.h['spindle-inhibit'] = True
+            self.add_status("Spindle stopped and raised {}".format(fval))
         else:
             self.h['spindle-inhibit'] = False
+            self.add_status('Spindle re-started')
         # instantiate warning box
             info = "Wait for spindle at speed signal before resuming"
             mess = {'NAME':'MESSAGE', 'ICON':'WARNING', 'ID':'_wait_resume_', 'MESSAGE':'CAUTION', 'MORE':info, 'TYPE':'OK'}
@@ -1175,12 +1178,12 @@ def adjust_stacked_widgets(self,requestedIndex):
                     TAB_FILE: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
                     TAB_OFFSETS: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
                     TAB_TOOL: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
-                    TAB_STATUS: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
+                    TAB_STATUS: (requestedIndex,PAGE_GCODE,False,SHOW_DRO),
                     TAB_PROBE: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
                     TAB_CAMERA: (requestedIndex,PAGE_UNCHANGED,False,SHOW_DRO),
                     TAB_GCODES: (requestedIndex,PAGE_UNCHANGED,False,SHOW_DRO),
                     TAB_SETUP: (requestedIndex,PAGE_UNCHANGED,False,SHOW_DRO),
-                    TAB_SETTINGS: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
+                    TAB_SETTINGS: (requestedIndex,PAGE_GCODE,False,SHOW_DRO),
                     TAB_UTILITIES: (TAB_MAIN,PAGE_GCODE,False,SHOW_DRO),
                     TAB_USER: (requestedIndex,PAGE_UNCHANGED,IGNORE,IGNORE) }
         else:

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

@@ -530,6 +530,7 @@ def dialog_return(self, w, message):
             self.h['eoffset-clear'] = True
             self.h['eoffset-spindle-count'] = 0
             self.w.spindle_eoffset_value.setText('0')
+            self.add_status('Spindle lowered')
         elif unhome_code and name == 'MESSAGE' and rtn is True:
             ACTION.SET_MACHINE_UNHOMED(-1)
         elif overwrite and name == 'MESSAGE':
@@ -689,12 +690,14 @@ def btn_pause_spindle_clicked(self, state):
             self.h['eoffset-spindle-count'] = int(fval)
             self.w.spindle_eoffset_value.setText(self.w.lineEdit_eoffset_count.text())
             self.h['spindle-inhibit'] = True
+            self.add_status("Spindle stopped and raised {}".format(fval))
             if not QHAL.hal.component_exists("z_level_compensation"):
                 self.add_status("Z level compensation HAL component not loaded", CRITICAL)
                 return
         else:
             # turn spindle back on
             self.h['spindle-inhibit'] = False
+            self.add_status('Spindle re-started')
             # wait for dialog to close before lowering spindle
             if STATUS.is_auto_running():
                 info = "Wait for spindle at speed signal before resuming"
@@ -1228,7 +1231,7 @@ def adjust_stacked_widgets(self,requestedIndex):
                     TAB_CAMVIEW: (requestedIndex,PAGE_UNCHANGED,SHOW_DRO),
                     TAB_GCODES: (requestedIndex,PAGE_UNCHANGED,SHOW_DRO),
                     TAB_SETUP: (requestedIndex,PAGE_UNCHANGED,SHOW_DRO),
-                    TAB_SETTINGS: (TAB_MAIN,PAGE_GCODE,SHOW_DRO),
+                    TAB_SETTINGS: (requestedIndex,PAGE_GCODE,SHOW_DRO),
                     TAB_UTILS: (TAB_MAIN,PAGE_GCODE,SHOW_DRO),
                     TAB_USER: (requestedIndex,PAGE_UNCHANGED,IGNORE) }
         else: