qtvcp -qt_make_pins: search ui/handler paths when embedding qtvcp panels

we were assuming all embeded panels came from installed system files.
Now we can use custom panels built in the config folder

Author: c-morley

lib/python/qtvcp/qt_makepins.py

@@ -42,6 +42,7 @@ def __init__(self, halcomp, path, window, debug):
         self.window['panel_'] = self
         self._screenOptions = None
         self._geo_string = ''
+        self.PATH = path
 
         # see if a screenoptions widget is present
         # if it is then initiate the preference file
@@ -88,13 +89,20 @@ def __init__(self, halcomp, path, window, debug):
                     pName = name.replace(' ','_')
                     window[pName] = window.makeMainPage(name)
 
-                    hndlr = os.path.join(path.PANELDIR , cmd, cmd+'_handler.py')
-                    if os.path.exists(hndlr):
+                    # search for handler path and load if available
+                    hndlr = self.PATH.find_embed_handler_path(cmd)
+                    if hndlr is not True and os.path.exists(hndlr):
                         window[pName].load_extension(hndlr)
 
-                    window[pName].instance(os.path.join(path.PANELDIR , cmd, cmd+'.ui'))
-                    window[pName].handler_instance.initialized__()
+                    # search for ui path and load if available
+                    uipath = self.PATH.find_embed_panel_path(cmd)
+                    window[pName].instance(uipath)
 
+                    # initialize handler if available
+                    if hndlr is not True and os.path.exists(hndlr):
+                        window[pName].handler_instance.initialized__()
+
+                    # record HAL component base name because we are going to change it
                     oldname = halcomp.comp.getprefix()
                     halcomp.comp.setprefix('{}.{}'.format(oldname,cmd))
 
@@ -105,6 +113,8 @@ def __init__(self, halcomp, path, window, debug):
                             LOG.verbose('{}: HAL-ified widget: {}'.format(name.upper(), idname))
                             if not isinstance(widget, ScreenOptions):
                                 widget.hal_init()
+
+                    # restore HAL component name
                     halcomp.comp.setprefix(oldname)
 
         # parse for HAL objects: