Merge pull request #347 from davidlatwe/Fix#335

Fix#335

Author: davidlatwe

pyblish_qml/__init__.py

@@ -5,7 +5,12 @@
 )
 
 
-def show(parent=None, targets=None, modal=None, foster=None, auto_publish=False, auto_validate=False):
+def show(parent=None,
+         targets=None,
+         modal=None,
+         foster=None,
+         auto_publish=False,
+         auto_validate=False):
     from . import host
 
     if foster is not None:

pyblish_qml/app.py

@@ -70,6 +70,8 @@ class Application(QtGui.QGuiApplication):
     published = QtCore.pyqtSignal()
     validated = QtCore.pyqtSignal()
 
+    targeted = QtCore.pyqtSignal(QtCore.QVariant)
+
     risen = QtCore.pyqtSignal()
     inFocused = QtCore.pyqtSignal()
     outFocused = QtCore.pyqtSignal()
@@ -105,6 +107,8 @@ def __init__(self, source, targets=[]):
         self.published.connect(self.publish)
         self.validated.connect(self.validate)
 
+        self.targeted.connect(self.target)
+
         self.risen.connect(self.rise)
         self.inFocused.connect(self.inFocus)
         self.outFocused.connect(self.outFocus)
@@ -182,8 +186,10 @@ def show(self, client_settings=None):
             util.timer_end("ready", "Awaited statemachine for %.2f ms")
 
         if client_settings:
-            self.controller.data['autoValidate'] = client_settings.get('autoValidate', False)
-            self.controller.data['autoPublish'] = client_settings.get('autoPublish', False)
+            auto_validate = client_settings.get('autoValidate', False)
+            auto_publish = client_settings.get('autoPublish', False)
+            self.controller.data['autoValidate'] = auto_validate
+            self.controller.data['autoPublish'] = auto_publish
 
         self.controller.show.emit()
 
@@ -223,6 +229,9 @@ def validate(self):
         """Fire up the validation sequance"""
         self.controller.validate()
 
+    def target(self, targets):
+        self.controller.targets = targets
+
     def listen(self):
         """Listen on incoming messages from host
 
@@ -249,6 +258,8 @@ def _listen():
                     "publish": "published",
                     "validate": "validated",
 
+                    "target": "targeted",
+
                     "rise": "risen",
                     "inFocus": "inFocused",
                     "outFocus": "outFocused",

pyblish_qml/host.py

@@ -76,7 +76,11 @@ def uninstall():
     sys.stdout.write("Pyblish QML shutdown successful.\n")
 
 
-def show(parent=None, targets=[], modal=None, auto_publish=False, auto_validate=False):
+def show(parent=None,
+         targets=[],
+         modal=None,
+         auto_publish=False,
+         auto_validate=False):
     """Attempt to show GUI
 
     Requires install() to have been run first, and
@@ -106,6 +110,8 @@ def show(parent=None, targets=[], modal=None, auto_publish=False, auto_validate=
         proxy = ipc.server.Proxy(server)
 
         try:
+            # Update target
+            proxy.target(targets)
             proxy.show(show_settings)
             return server
 
@@ -144,7 +150,7 @@ def proxy_call_wrapper(*args, **kwargs):
         # get existing GUI
         if _state.get("currentServer"):
             server = _state["currentServer"]
-            proxy = Proxy(server)
+            proxy = ipc.server.Proxy(server)
             try:
                 return func(proxy, *args, **kwargs)
             except IOError:
@@ -163,7 +169,7 @@ def validate(proxy):
     proxy.validate()
 
 
-@proxy_call 
+@proxy_call
 def hide(proxy):
     proxy.hide()
 

pyblish_qml/ipc/server.py

@@ -77,6 +77,9 @@ def publish(self):
     def validate(self):
         self._dispatch("validate")
 
+    def target(self, targets):
+        self._dispatch("target", args=[targets])
+
     def _dispatch(self, func, args=None):
         data = json.dumps(
             {

pyblish_qml/version.py

@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 1
 VERSION_MINOR = 10
-VERSION_PATCH = 4
+VERSION_PATCH = 5
 
 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
 version = '%i.%i.%i' % version_info