Merge pull request #230 from mottosso/fix120

Fix #120

README.md

@@ -378,8 +378,8 @@ Tests are automatically run at each commit to GitHub via Travis-CI. You can run
 ```bash
 $ git clone https://github.com/pyblish/pyblish-qml.git
 $ cd pyblish-qml
-$ docker build -t pyblish/pyblish-qml .
-$ docker run --rm -v $(pwd):/pyblish-qml pyblish/pyblish-qml
+$ . build_docker.sh # Only needed once
+$ . test_docker.sh
 # Doctest: pyblish_qml.models.Item ... ok
 # Doctest: pyblish_qml.util.ItemList ... ok
 # Reset works ... ok

build_docker.sh

@@ -0,0 +1,2 @@
+# Source this script
+docker build -t pyblish/pyblish-qml .

pyblish_qml/host.py

@@ -197,9 +197,24 @@ def install_host():
  break
 
 
+def _on_application_quit():
+ """Automatically kill QML on host exit"""
+
+ try:
+ _state["currentServer"].popen.kill()
+
+ except KeyError:
+ # No server started
+ pass
+
+ except OSError:
+ # Already dead
+ pass
+
+
 def _install_maya():
  """Helper function to Autodesk Maya support"""
- from maya import cmds, utils
+ from maya import utils
 
  def threaded_wrapper(func, *args, **kwargs):
  return utils.executeInMainThreadWithResult(
@@ -208,22 +223,8 @@ def threaded_wrapper(func, *args, **kwargs):
  sys.stdout.write("Setting up Pyblish QML in Maya\n")
  register_dispatch_wrapper(threaded_wrapper)
 
- def on_application_quit():
- try:
- _state["currentServer"].popen.kill()
-
- except KeyError:
- # No server started
- pass
-
- except OSError:
- # Already dead
- pass
-
- cmds.scriptJob(
- event=["quitApplication", on_application_quit],
- protected=True
- )
+ app = QtWidgets.QApplication.instance()
+ app.aboutToQuit.connect(_on_application_quit)
 
  # Configure GUI
  settings.ContextLabel = "Maya"
@@ -241,6 +242,9 @@ def threaded_wrapper(func, *args, **kwargs):
  sys.stdout.write("Setting up Pyblish QML in Houdini\n")
  register_dispatch_wrapper(threaded_wrapper)
 
+ app = QtWidgets.QApplication.instance()
+ app.aboutToQuit.connect(_on_application_quit)
+
  settings.ContextLabel = "Houdini"
  settings.WindowTitle = "Pyblish (Houdini)"
 
@@ -259,6 +263,9 @@ def threaded_wrapper(func, *args, **kwargs):
  sys.stdout.write("Setting up Pyblish QML in Nuke\n")
  register_dispatch_wrapper(threaded_wrapper)
 
+ app = QtWidgets.QApplication.instance()
+ app.aboutToQuit.connect(_on_application_quit)
+
  settings.ContextLabel = "Nuke"
  settings.WindowTitle = "Pyblish (Nuke)"
 
@@ -278,6 +285,9 @@ def threaded_wrapper(func, *args, **kwargs):
  sys.stdout.write("Setting up Pyblish QML in Hiero\n")
  register_dispatch_wrapper(threaded_wrapper)
 
+ app = QtWidgets.QApplication.instance()
+ app.aboutToQuit.connect(_on_application_quit)
+
  settings.ContextLabel = "Hiero"
  settings.WindowTitle = "Pyblish (Hiero)"
 

pyblish_qml/version.py

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

test_docker.sh

@@ -0,0 +1,2 @@
+# Source this script
+docker run --rm -v $(pwd):/pyblish-qml pyblish/pyblish-qml