Qt.py support and RV integration

pw_multiScriptEditor/__init__.py

@@ -1,10 +1,5 @@
 import os, sys
 
-root = os.path.dirname(__file__)
-if not root in sys.path:
-    sys.path.append(root)
-
-
 # HOUDINI
 def showHoudini(clear=False, ontop=False, name=None, floating=False, position=(), size=(),
                 pane=None, replacePyPanel=False, hideTitleMenu=True):
@@ -26,12 +21,12 @@ def showNuke(panel=False):
 # MAYA
 def showMaya(dock=False):
     from .managers import _maya
-    reload (_maya)
+    reload(_maya)
     _maya.show(dock)
 
 # 3DSMAX PLUS
 def show3DSMax():
     sys.argv = []
     from .managers import _3dsmax
-    reload (_3dsmax)
-    _3dsmax.show()
+    reload(_3dsmax)
+    _3dsmax.show()

pw_multiScriptEditor/managers/_3dsmax.py

@@ -1,12 +1,12 @@
 import os, sys, re
 
-from PySide import QtGui
-from PySide import QtCore
+from Qt import QtCore, QtWidgets
 
 from pw_multiScriptEditor import scriptEditor
+
 reload(scriptEditor)
 import MaxPlus
-q3dsmax = QtGui.QApplication.instance()
+q3dsmax = QtWidgets.QApplication.instance()
 
 class MaxDialogEvents(QtCore.QObject):
     def eventFilter(self, obj, event):
@@ -24,4 +24,5 @@ def show():
     se.runCommand('import MaxPlus')
     se.MaxEventFilter = MaxDialogEvents()
     se.installEventFilter(se.MaxEventFilter)
+    se.setWindowStyle()
     se.show()

pw_multiScriptEditor/managers/__init__.py

@@ -6,40 +6,40 @@
 
 # NUKE
 def nukeCompleter(*args):
-    from managers import _nuke
+    import _nuke
     return _nuke.completer(*args)
 
 def getNukeContextMenu(*args):
-    from managers import _nuke
+    import _nuke
     reload(_nuke)
     return _nuke.contextMenu(*args)
 ###################################################################
 
 # HOUDINI
 def houdiniCompleter(*args):
-    from managers import _houdini
+    import _houdini
     return _houdini.completer(*args)
 def getHoudiniContextMenu(*args):
-    from managers import _houdini
+    import _houdini
     reload(_houdini)
     return _houdini.contextMenu(*args)
 def houdiniDropEvent(*args):
-    from managers import _houdini
+    import _houdini
     reload(_houdini)
     return _houdini.wrapDroppedText(*args)
 ###################################################################
 
 # MAYA
 def mayaCompleter(*args):
-    from managers import _maya
+    import _maya
     reload(_maya)
     return _maya.completer(*args)
 
 def mayaDropEvent(*args):
-    from managers import _maya
+    import _maya
     return _maya.wrapDroppedText(*args)
 def getMayaContextMenu(*args):
-    from managers import _maya
+    import _maya
     reload(_maya)
     return _maya.contextMenu(*args)
 ###################################################################
@@ -90,4 +90,4 @@ def getMayaContextMenu(*args):
 elif platform.system().lower() == 'darwin':
     _s = 'x'
 else:
-    _s = 'l'
+    _s = 'l'

pw_multiScriptEditor/managers/_maya.py

@@ -1,18 +1,13 @@
 _pyside_ver = 0
 try:
-    from PySide.QtCore import *
-    from PySide.QtGui import *
-    from shiboken import wrapInstance as wrp
+    from Qt import QtCore, QtGui, QtWidgets
     _pyside_ver = 1
 except:
-    from PySide2.QtCore import *
-    from PySide2.QtGui import *
-    from PySide2.QtWidgets import *
     _pyside_ver = 2
 import maya.OpenMayaUI as omui
 
 import os, sys, re
-from managers.completeWidget import contextCompleterClass
+from ..managers.completeWidget import contextCompleterClass
 
 main = __import__('__main__')
 ns = main.__dict__
@@ -27,9 +22,10 @@
 
 def getMayaWindow():
     if _pyside_ver == 1:
+        from shiboken import wrapInstance
         ptr = omui.MQtUtil.mainWindow()
         if ptr is not None:
-            return wrp(long(ptr), QMainWindow)
+            return wrapInstance(long(ptr), QtWidgets.QMainWindow)
     elif _pyside_ver == 2:
         from pymel.core import ui
         return ui.Window('MayaWindow').asQtObject()
@@ -108,7 +104,7 @@ def completer(line, ns):
 # drop event
 
 def wrapDroppedText(namespace, text, event):
-    if event.keyboardModifiers() == Qt.AltModifier:
+    if event.keyboardModifiers() == QtCore.Qt.AltModifier:
         # pymel with namespace
         for k, m in namespace.items():
             if hasattr(m, '__name__'):
@@ -160,13 +156,13 @@ def contextMenu(parent):
     m = mayaMenuClass(parent)
     return m
 
-class mayaMenuClass(QMenu):
+class mayaMenuClass(QtWidgets.QMenu):
     def __init__(self, parent):
         super(mayaMenuClass, self).__init__('Maya', parent)
         self.par = parent
         self.setTearOffEnabled(1)
         self.setWindowTitle('MSE %s Maya' % self.par.ver)
-        a = QAction('Save to shelf', parent, triggered=self.saveToShelfDialog)
+        a = QtWidgets.QAction('Save to shelf', parent, triggered=self.saveToShelfDialog)
         self.addAction(a)
 
     def saveToShelfDialog(self):
@@ -175,30 +171,30 @@ def saveToShelfDialog(self):
         self.dial.show()
 
 
-class mayaIconsClass(QListWidget):
+class mayaIconsClass(QtWidgets.QListWidget):
     def __init__(self, parent):
         super(mayaIconsClass, self).__init__()
         self.par = parent
-        self.setWindowFlags(Qt.Tool)
-        self.setViewMode(QListView.IconMode)
-        self.setIconSize(QSize(32,32))
-        self.setEditTriggers(QAbstractItemView.NoEditTriggers)
-        self.setResizeMode(QListWidget.ResizeMode.Adjust)
+        self.setWindowFlags(QtCore.Qt.Tool)
+        self.setViewMode(QtWidgets.QListView.IconMode)
+        self.setIconSize(QtCore.QSize(32,32))
+        self.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
+        self.setResizeMode(QtWidgets.QListWidget.ResizeMode.Adjust)
         self.fillIcons()
         self.itemClicked.connect(self.print_name)
 
     def fillIcons(self):
         res, files = self.getIcons()
         self.par.out.showMessage( "%s icons found" % len(res+files))
         for ico in sorted(res):
-            item = QListWidgetItem(self)
-            item.setIcon(QIcon(':/'+ico))
+            item = QtWidgets.QListWidgetItem(self)
+            item.setIcon(QtGui.QIcon(':/'+ico))
             item.setData(32, ':/'+ico)
             item.setToolTip(ico)
             self.addItem(item)
         for f in sorted(files, key=lambda x: os.path.splitext(x)[0]):
-            item = QListWidgetItem(self)
-            item.setIcon(QIcon(f))
+            item = QtWidgets.QListWidgetItem(self)
+            item.setIcon(QtGui.QIcon(f))
             item.setData(32, f)
             item.setToolTip(f)
             self.addItem(item)
@@ -225,23 +221,23 @@ def findInPath(self, path):
     def print_name(self, item):
         print item.data(32)
 
-class saveToShelfClass(QDialog):
+class saveToShelfClass(QtWidgets.QDialog):
     def __init__(self, parent):
         super(saveToShelfClass, self).__init__(parent)
         self.par = parent
-        self.setWindowFlags(Qt.Tool)
+        self.setWindowFlags(QtCore.Qt.Tool)
         self.setObjectName('maya_create_shelfButton')
         self.setWindowTitle('Save script to shelf')
-        self.verticalLayout = QVBoxLayout(self)
-        self.gridLayout = QGridLayout()
-        self.label = QLabel('Label')
+        self.verticalLayout = QtWidgets.QVBoxLayout(self)
+        self.gridLayout = QtWidgets.QGridLayout()
+        self.label = QtWidgets.QLabel('Label')
         self.gridLayout.addWidget(self.label, 0, 0, 1, 1)
-        self.lineEdit = QLineEdit(self)
+        self.lineEdit = QtWidgets.QLineEdit(self)
         self.gridLayout.addWidget(self.lineEdit, 0, 1, 1, 1)
         self.verticalLayout.addLayout(self.gridLayout)
         self.listWidget = mayaIconsClass(parent)
         self.verticalLayout.addWidget(self.listWidget)
-        self.pushButton = QPushButton('Save to shelf')
+        self.pushButton = QtWidgets.QPushButton('Save to shelf')
         self.verticalLayout.addWidget(self.pushButton)
 
         self.pushButton.clicked.connect(self.createButton)

pw_multiScriptEditor/managers/_nuke.py

@@ -6,12 +6,11 @@
 exec 'import nukescripts' in ns
 nuke = ns['nuke']
 import nukescripts
-from managers.nuke import nodes
+from ..managers.nuke import nodes
 nuke_nodes = dir(nodes)
-from managers.completeWidget import contextCompleterClass
+from ..managers.completeWidget import contextCompleterClass
 
-from PySide.QtGui import *
-from PySide.QtCore import *
+from Qt import QtCore, QtWidgets
 
 p = os.path.dirname(__file__).replace('\\','/')
 if not p in sys.path:
@@ -21,7 +20,7 @@
 reload(scriptEditor)
 
 # QT
-qApp = QApplication.instance()
+qApp = QtWidgets.QApplication.instance()
 
 def getMainWindow():
     for widget in qApp.topLevelWidgets():
@@ -126,17 +125,17 @@ def contextMenu(parent):
     m = nukeContextMenu(parent)
     return m
 
-class nukeContextMenu(QMenu):
+class nukeContextMenu(QtWidgets.QMenu):
     def __init__(self, parent):
         super(nukeContextMenu, self).__init__('Nuke')
         self.par = parent
         self.setTearOffEnabled(1)
         self.setWindowTitle('MSE %s Nuke' % self.par.ver)
-        self.addAction(QAction('Read PyScript Knob', parent, triggered=self.readPyScriptKnob))
-        self.addAction(QAction('Save To PyScript Knob', parent, triggered=self.saveToKnob))
+        self.addAction(QtWidgets.QAction('Read PyScript Knob', parent, triggered=self.readPyScriptKnob))
+        self.addAction(QtWidgets.QAction('Save To PyScript Knob', parent, triggered=self.saveToKnob))
         self.addSeparator()
-        self.addAction(QAction('From Selected', parent, triggered=self.nodeToCode))
-        self.addAction(QAction('From Clipboard', parent, triggered=self.nodesFromClipboard))
+        self.addAction(QtWidgets.QAction('From Selected', parent, triggered=self.nodeToCode))
+        self.addAction(QtWidgets.QAction('From Clipboard', parent, triggered=self.nodesFromClipboard))
 
     def nodeToCode(self):
         nodes = nuke.selectedNodes()
@@ -180,7 +179,7 @@ def saveToKnob(self):
 
     def nodesFromClipboard(self):
         # nuke.tprint(str(self.par))
-        text = QApplication.clipboard().text()
+        text = QtWidgets.QApplication.clipboard().text()
         nodes = []
         if text:
             for l in text.split('\n'):
@@ -191,22 +190,22 @@ def nodesFromClipboard(self):
         for n in nodes:
             self.par.tab.addToCurrent('nuke.toNode("%s")\n' % n)
 
-class selectDialog(QDialog):
+class selectDialog(QtWidgets.QDialog):
     def __init__(self, items, title, sel=None):
         super(selectDialog, self).__init__()
         self.setWindowTitle(title)
-        self.setWindowFlags(Qt.Tool)
-        self.list = QListWidget(self)
-        self.list.setSelectionMode(QAbstractItemView.SingleSelection)
-        self.ly = QVBoxLayout(self)
+        self.setWindowFlags(QtCore.Qt.Tool)
+        self.list = QtWidgets.QListWidget(self)
+        self.list.setSelectionMode(QtWidgets.QAbstractItemView.SingleSelection)
+        self.ly = QtWidgets.QVBoxLayout(self)
         self.setLayout(self.ly)
         self.ly.addWidget(self.list)
-        self.btn = QPushButton('Select')
+        self.btn = QtWidgets.QPushButton('Select')
         self.ly.addWidget(self.btn)
         self.btn.clicked.connect(self.accept)
         selected = None
         for i in items:
-            item = QListWidgetItem(i)
+            item = QtWidgets.QListWidgetItem(i)
             item.setData(32, i)
             self.list.addItem(item)
             if i == sel:

pw_multiScriptEditor/managers/completeWidget.py

@@ -5,4 +5,4 @@ class contextCompleterClass(object):
     def __init__(self, name, complete, end=None):
         self.name = name
         self.complete = complete
-        self.end_char = end
+        self.end_char = end

pw_multiScriptEditor/managers/houdini/hou.py

@@ -1,4 +1,4 @@
-from PySide2.QtWidgets import *
+from Qt import QtWidgets
 
 class appearanceChangeType:
 
@@ -7074,7 +7074,7 @@ def activeInterface(self):
 
     def activeInterfaceRootWidget(self):
 
-        return QWidget
+        return QtWidgets.QWidget
 
     def setActiveInterface(self, interface):
 
@@ -9878,19 +9878,19 @@ class qt():
 
     def createDialog(self):
 
-        return QWidget
+        return QtWidgets.QWidget
 
     def createMenu(self):
 
-        return QMenu
+        return QtWidgets.QMenu
 
     def createToolTip(self):
 
-        return QWidget
+        return QtWidgets.QWidget
 
     def createWindow(self):
 
-        return QWidget
+        return QtWidgets.QWidget
 
 
 class session():

pw_multiScriptEditor/managers/nuke/geo.py

@@ -126,4 +126,4 @@ def normal(self):
     def points(self):
         """
 Get the list of point indexes for this primitive."""
-        return [0,]
+        return [0,]

pw_multiScriptEditor/managers/rvsupport/plugins/Mu/rvload

@@ -0,0 +1 @@
+1

pw_multiScriptEditor/managers/rvsupport/plugins/Mu/rvload2

@@ -0,0 +1,2 @@
+3
+scriptEditorRv,scriptEditorRv.zip,nil,nil,nil,true,true,4.0.9,false