qtvcp -move saving of prefs/settings and shutdown code to qtvcp file

If someone didn't want the exit dialog. the settings were not saved.
This behaivour was done by accident a while ago when we were try to stop crashes at exit.

Author: c-morley

lib/python/qtvcp/qt_makegui.py

@@ -130,6 +130,7 @@ def shutdown(self):
     def sync_qsettings(self):
         try:
             self.settings.sync()
+            log.debug('Qsettings sync called:')
         except Exception as e:
             log.debug('Error with Qsettings sync function:\n {}'.format(e))
 

lib/python/qtvcp/widgets/screen_options.py

@@ -391,10 +391,7 @@ def closeEvent(self, event):
                 answer = True
             # system shutdown
             if answer == QtWidgets.QMessageBox.DestructiveRole:
-                self.QTVCP_INSTANCE_.settings.sync()
                 self.QTVCP_INSTANCE_.shutdown()
-                self.QTVCP_INSTANCE_.panel_.shutdown()
-                STATUS.shutdown()
                 try:
                     HANDLER = self.QTVCP_INSTANCE_.handler_instance
                     if 'system_shutdown_request__' in dir(HANDLER):
@@ -411,10 +408,7 @@ def closeEvent(self, event):
             elif answer:
                 if self.PREFS_ and self.play_sounds and self.shutdown_play_sound:
                     STATUS.emit('play-sound', self.shutdown_exit_sound_type)
-                self.QTVCP_INSTANCE_.settings.sync()
                 self.QTVCP_INSTANCE_.shutdown()
-                self.QTVCP_INSTANCE_.panel_.shutdown()
-                STATUS.shutdown()
                 event.accept()
             # cancel
             elif answer == False:

src/emc/usr_intf/qtvcp/qtvcp.py

@@ -247,7 +247,7 @@ def __init__(self):
         global HAL
         HAL = self.halcomp
         # initialize the window
-        window = qt_makegui.VCPWindow(self.hal, self.PATH)
+        self.w = window = qt_makegui.VCPWindow(self.hal, self.PATH)
 
         # give reference to user command line options
         if opts.useropts:
@@ -446,6 +446,21 @@ def postgui_cmd(self):
     # This can be called by control c or an early error.
     # close out HAL pins
     def shutdown(self,signum=None,stack_frame=None):
+
+        from qtvcp.core import Status
+        s = Status()
+        LOG.debug('Status shutdown')
+        s.shutdown()
+
+        try:
+            self.w.sync_qsettings()
+        except:
+            pass
+        try:
+            self.w.panel_.shutdown()
+        except:
+            pass
+
         LOG.debug('Exiting HAL')
         HAL.exit()