Fixes #45 (#46)

pyblish · Jun 22, 2016 · 555450f · 555450f
1 parent c1e9bf5
commit 555450f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+Version 0.3.3
+-------------
+
+- Fixes parenting to main window (#45)
+
 Version 0.3.2
 -------------
 

diff --git a/README.md b/README.md
@@ -30,6 +30,16 @@ $ python -m pyblish_lite --debug  # Test install
 
 Requires [pyblish-base](https://github.com/pyblish/pyblish-base).
 
+<<<<<<< Updated upstream
+=======
+<<<<<<< HEAD
+<br>
+<br>
+<br>
+
+=======
+>>>>>>> c1e9bf571174619bd0e60642c28d0e91097e5ebb
+>>>>>>> Stashed changes
 ### Usage
 
 Pyblish Lite runs both standalone and from a host and requires either PySide of PyQt bindings to be readily available.

diff --git a/pyblish_lite/version.py b/pyblish_lite/version.py
@@ -1,7 +1,7 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 3
-VERSION_PATCH = 2
+VERSION_PATCH = 3
 
 version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
 version = '%i.%i.%i' % version_info

diff --git a/pyblish_lite/window.py b/pyblish_lite/window.py
@@ -49,7 +49,8 @@ class Window(QtWidgets.QDialog):
     def __init__(self, controller, parent=None):
         super(Window, self).__init__(parent)
         icon = QtGui.QIcon(util.get_asset("img", "logo-extrasmall.png"))
-        self.setWindowFlags(QtCore.Qt.WindowTitleHint |
+        self.setWindowFlags(self.windowFlags() |
+                            QtCore.Qt.WindowTitleHint |
                             QtCore.Qt.WindowMaximizeButtonHint |
                             QtCore.Qt.WindowMinimizeButtonHint |
                             QtCore.Qt.WindowCloseButtonHint)