qtvcp -dialog widget: add status message control of tool change dialog

you can use STATUS messages to 'press' ok or cancel

Author: c-morley

lib/python/qtvcp/widgets/dialog_widget.py

@@ -398,6 +398,7 @@ def __init__(self, parent=None):
 class ToolDialog(LcncDialog, GeometryMixin):
     def __init__(self, parent=None):
         super(ToolDialog, self).__init__(parent)
+        self._request_name = 'TOOLCHANGE'
         self.setText('<b>Manual Tool Change Request</b>')
         self.setInformativeText('Please Insert Tool 0')
         self.setStandardButtons(QMessageBox.Ok)
@@ -440,6 +441,8 @@ def _hal_init(self):
             self.sound_type = self.PREFS_.getpref('toolDialog_sound_type', 'READY', str, 'DIALOG_OPTIONS')
         else:
             self.play_sound = False
+        # can acknowledge from status messages too
+        STATUS.connect('dialog-update', self._status_update)
 
     # process callback from 'change' HAL pin
     def tool_change(self, change):
@@ -490,18 +493,37 @@ def tool_change(self, change):
     # process callback for 'change-button' HAL pin
     # hide the message dialog or desktop notify message
     def external_acknowledge(self, state):
-        #print('external acklnowledge: {}'.format(state))
+        #print('external acknowledge: {}'.format(state))
         if state:
             if self._useDesktopNotify:
                 self.deskNotice.close()
             elif self.isVisible():
                 self.hide()
             self._processChange(True)
 
+    # callback from status 'update-dialog'
+    def _status_update(self, w, message):
+        print(message)
+        if message.get('NAME') == self._request_name:
+            if not self.isVisible(): return
+            print(self._request_name)
+            response = message.get('response')
+            if not response is None:
+                # 'ok'
+                if response == 1:
+                    if self._useDesktopNotify:
+                        self.deskNotice.close()
+                    elif self.isVisible():
+                        self.hide()
+                        self._processChange(True)
+                # 'cancel'
+                elif response == 0:
+                    self.hide()
+                    self._processChange(False)
 
     # This also is called from DesktopDialog
     def _processChange(self,answer):
-        #print('proces change: {}'.format(answer))
+        print('process change: {}'.format(answer))
         if answer == -1:
             self.changed.set(True)
             ACTION.ABORT()
@@ -517,6 +539,16 @@ def _processChange(self,answer):
         self.record_geometry()
         STATUS.emit('focus-overlay-changed', False, None, None)
 
+    # decode button presses
+    def msgbtn(self, i):
+        LOG.debug('Button pressed is: {}'.format(i.text()))
+        if self.clickedButton() == self._actionbutton:
+            self._processChange(-1)
+        elif self.standardButton(self.clickedButton()) == QMessageBox.Ok:
+            self._processChange(True)
+        else:
+            self._processChange(False)
+
     ###### overridden functions ################
 
     def showdialog(self, message, more_info=None, details=None,
@@ -558,16 +590,6 @@ def showEvent(self, event):
         self.set_geometry()
         super(LcncDialog, self).showEvent(event)
 
-    # decode button presses
-    def msgbtn(self, i):
-        LOG.debug('Button pressed is: {}'.format(i.text()))
-        if self.clickedButton() == self._actionbutton:
-            self._processChange(-1)
-        elif self.standardButton(self.clickedButton()) == QMessageBox.Ok:
-            self._processChange(True)
-        else:
-            self._processChange(False)
-
     ############################################
 
     # **********************