qtvcp -keep track of embedded panels so as to call closing functions

otherwise preference saving won't work

Author: c-morley

lib/python/qtvcp/qt_makegui.py

@@ -93,6 +93,7 @@ def __init__(self, halcomp=None, path=None):
         self.PREFS_ = None
         self.originalCloseEvent_ = self.closeEvent
         self._halWidgetList = []
+        self._VCPWindowList = []
         self.settings = QtCore.QSettings('QtVcp', path.BASENAME)
         log.info('Qsettings file path: yellow<{}>'.format(self.settings.fileName()))
         # make an instance with embedded variables so they
@@ -119,10 +120,12 @@ def keyPressTrap(self, e):
     def keyReleaseTrap(self, e):
         return False
 
+    # call closing function on main and embedded windows.
     def shutdown(self):
-        if self.has_closing_handler:
-            log.debug('Calling handler file Closing_cleanup__ function.')
-            self.handler_instance.closing_cleanup__()
+        for i in (self._VCPWindowList):
+            if 'closing_cleanup__' in dir(i):
+                log.debug('Calling handler file Closing_cleanup__ function of {}.'.format(i))
+                i.closing_cleanup__()
 
     def sync_qsettings(self):
         try:

lib/python/qtvcp/qt_makepins.py

@@ -43,6 +43,7 @@ def __init__(self, halcomp, path, window, debug):
         self._screenOptions = None
         self._geo_string = ''
         self.PATH = path
+        window._VCPWindowList.append(window)
 
         # see if a screenoptions widget is present
         # if it is then initiate the preference file
@@ -97,6 +98,7 @@ def __init__(self, halcomp, path, window, debug):
                     # search for ui path and load if available
                     uipath = self.PATH.find_embed_panel_path(cmd)
                     window[pName].instance(uipath)
+                    window._VCPWindowList.append(window[pName])
 
                     # initialize handler if available
                     if hndlr is not True and os.path.exists(hndlr):