Revert "update to qtpy"

wilecoyote2015 · wilecoyote2015 · commit 4e22c54b6152 · 2022-03-11T18:41:08.000+01:00
This reverts commit c521c7d.
diff --git a/NodeGraphQt/base/commands.py b/NodeGraphQt/base/commands.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtWidgets
+from Qt import QtWidgets
 
 from .utils import minimize_node_ref_count
 from ..constants import IN_PORT, OUT_PORT
diff --git a/NodeGraphQt/base/graph.py b/NodeGraphQt/base/graph.py
@@ -6,7 +6,7 @@
 import os
 import re
 
-from qtpy import QtCore, QtWidgets, QtGui
+from Qt import QtCore, QtWidgets, QtGui
 
 from .commands import (NodeAddedCmd,
                        NodeRemovedCmd,
diff --git a/NodeGraphQt/base/menu.py b/NodeGraphQt/base/menu.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from qtpy import QtGui, QtCore
+from Qt import QtGui, QtCore
 
 from ..errors import NodeMenuError
 from ..widgets.actions import BaseMenu, GraphAction, NodeAction
diff --git a/NodeGraphQt/base/utils.py b/NodeGraphQt/base/utils.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from distutils.version import LooseVersion
 
-from qtpy import QtGui, QtCore
+from Qt import QtGui, QtCore
 
 from ..constants import (PIPE_LAYOUT_CURVED,
                          PIPE_LAYOUT_STRAIGHT,
diff --git a/NodeGraphQt/constants.py b/NodeGraphQt/constants.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from qtpy import QtWidgets
+from Qt import QtWidgets
 
 from .pkg_info import __version__
 
diff --git a/NodeGraphQt/qgraphics/node_abstract.py b/NodeGraphQt/qgraphics/node_abstract.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 
 from ..constants import (Z_VAL_NODE, NODE_WIDTH, NODE_HEIGHT, ITEM_CACHE_MODE)
 
diff --git a/NodeGraphQt/qgraphics/node_backdrop.py b/NodeGraphQt/qgraphics/node_backdrop.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtGui, QtCore, QtWidgets
+from Qt import QtGui, QtCore, QtWidgets
 
 from .node_abstract import AbstractNodeItem
 from .pipe import Pipe
diff --git a/NodeGraphQt/qgraphics/node_base.py b/NodeGraphQt/qgraphics/node_base.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import OrderedDict
 
-from qtpy import QtGui, QtCore, QtWidgets
+from Qt import QtGui, QtCore, QtWidgets
 
 from .node_abstract import AbstractNodeItem
 from .node_overlay_disabled import XDisabledItem
diff --git a/NodeGraphQt/qgraphics/node_overlay_disabled.py b/NodeGraphQt/qgraphics/node_overlay_disabled.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtGui, QtCore, QtWidgets
+from Qt import QtGui, QtCore, QtWidgets
 
 from ..constants import Z_VAL_NODE_WIDGET
 
diff --git a/NodeGraphQt/qgraphics/node_text_item.py b/NodeGraphQt/qgraphics/node_text_item.py
@@ -1,4 +1,4 @@
-from qtpy import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui
 
 
 class NodeTextItem(QtWidgets.QGraphicsTextItem):
diff --git a/NodeGraphQt/qgraphics/pipe.py b/NodeGraphQt/qgraphics/pipe.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from qtpy import QtCore, QtGui, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
 from .port import PortItem
 from ..constants import (
diff --git a/NodeGraphQt/qgraphics/port.py b/NodeGraphQt/qgraphics/port.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtGui, QtCore, QtWidgets
+from Qt import QtGui, QtCore, QtWidgets
 
 from ..constants import (
     IN_PORT, OUT_PORT,
diff --git a/NodeGraphQt/qgraphics/slicer.py b/NodeGraphQt/qgraphics/slicer.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from qtpy import QtCore, QtGui, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
 from ..constants import Z_VAL_NODE_WIDGET, PIPE_SLICER_COLOR
 
diff --git a/NodeGraphQt/widgets/actions.py b/NodeGraphQt/widgets/actions.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 from .stylesheet import STYLE_QMENU
 
 
diff --git a/NodeGraphQt/widgets/dialogs.py b/NodeGraphQt/widgets/dialogs.py
@@ -1,7 +1,7 @@
 import os
 
 from .stylesheet import STYLE_MESSAGEBOX
-from qtpy import QtWidgets
+from Qt import QtWidgets
 
 current_dir = os.path.expanduser('~')
 
diff --git a/NodeGraphQt/widgets/node_publish_widget.py b/NodeGraphQt/widgets/node_publish_widget.py
@@ -1,7 +1,7 @@
 import os
 
 from .properties import PropFileSavePath
-from qtpy import QtWidgets
+from Qt import QtWidgets
 
 
 class _element_widget(QtWidgets.QWidget):
diff --git a/NodeGraphQt/widgets/node_space_bar.py b/NodeGraphQt/widgets/node_space_bar.py
@@ -1,4 +1,4 @@
-from qtpy import QtWidgets, QtCore
+from Qt import QtWidgets, QtCore
 
 from .stylesheet import STYLE_SLASH_BUTTON, STYLE_NODE_BUTTON
 
diff --git a/NodeGraphQt/widgets/node_widgets.py b/NodeGraphQt/widgets/node_widgets.py
@@ -3,7 +3,7 @@
 from .properties import _ValueEdit
 from .stylesheet import *
 
-from qtpy import QtCore, QtWidgets
+from Qt import QtCore, QtWidgets
 from ..constants import Z_VAL_NODE_WIDGET
 from ..errors import NodeWidgetError
 
diff --git a/NodeGraphQt/widgets/nodes_palette.py b/NodeGraphQt/widgets/nodes_palette.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
 
-from qtpy import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui
 
 from ..constants import URN_SCHEME
 
diff --git a/NodeGraphQt/widgets/nodes_tree.py b/NodeGraphQt/widgets/nodes_tree.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from qtpy import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui
 
 from ..constants import URN_SCHEME
 
diff --git a/NodeGraphQt/widgets/properties.py b/NodeGraphQt/widgets/properties.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import defaultdict
 
-from qtpy import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui
 
 from .dialogs import FileDialog
 from ..constants import (NODE_PROP_QLABEL,
diff --git a/NodeGraphQt/widgets/properties_bin.py b/NodeGraphQt/widgets/properties_bin.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtWidgets, QtCore, QtGui
+from Qt import QtWidgets, QtCore, QtGui, QtCompat
 
 from .properties import NodePropWidget
 
@@ -50,9 +50,9 @@ def __init__(self, parent=None):
         self.setShowGrid(False)
         self.verticalHeader().hide()
         self.horizontalHeader().hide()
-        QtWidgets.QHeaderView.setSectionResizeMode(
+        QtCompat.QHeaderView.setSectionResizeMode(
             self.verticalHeader(), QtWidgets.QHeaderView.ResizeToContents)
-        QtWidgets.QHeaderView.setSectionResizeMode(
+        QtCompat.QHeaderView.setSectionResizeMode(
             self.horizontalHeader(), 0, QtWidgets.QHeaderView.Stretch)
         self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
 
diff --git a/NodeGraphQt/widgets/scene.py b/NodeGraphQt/widgets/scene.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from qtpy import QtGui, QtCore, QtWidgets
+from Qt import QtGui, QtCore, QtWidgets
 
 from ..constants import (VIEWER_BG_COLOR,
                          VIEWER_GRID_SIZE,
diff --git a/NodeGraphQt/widgets/tab_search.py b/NodeGraphQt/widgets/tab_search.py
@@ -2,7 +2,7 @@
 import re
 from collections import OrderedDict
 
-from qtpy import QtCore, QtWidgets, QtGui
+from Qt import QtCore, QtWidgets, QtGui
 
 from .stylesheet import STYLE_TABSEARCH, STYLE_TABSEARCH_LIST, STYLE_QMENU
 
diff --git a/NodeGraphQt/widgets/viewer.py b/NodeGraphQt/widgets/viewer.py
@@ -2,11 +2,14 @@
 # -*- coding: utf-8 -*-
 import math
 
-import qtpy
-from qtpy import QtGui, QtCore, QtWidgets
+import Qt
+from Qt import QtGui, QtCore, QtWidgets
 
 # use QOpenGLWidget instead of the deprecated QGLWidget to avoid probelms with Wayland
-from qtpy.QtWidgets import QOpenGLWidget
+if Qt.IsPySide2:
+    from PySide2.QtWidgets import QOpenGLWidget
+elif Qt.IsPyQt5:
+    from PyQt5.QtWidgets import QOpenGLWidget
 
 from .dialogs import BaseDialog, FileDialog
 from .scene import NodeScene
diff --git a/example.py b/example.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from qtpy import QtCore, QtGui, QtWidgets
+from Qt import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt import (NodeGraph,
                          BaseNode,
@@ -134,7 +134,7 @@ def __init__(self):
 
 
 if __name__ == '__main__':
-    # QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
+    QtCore.QCoreApplication.setAttribute(QtCore.Qt.AA_EnableHighDpiScaling)
     app = QtWidgets.QApplication([])
 
     # create node graph.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
-qtpy >= 2.0.0
-pyqt6
+qt.py==1.3.6
+pyqt5==5.15.6

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from qtpy import QtWidgets, QtCore, QtGui`
	`1`	`+from Qt import QtWidgets, QtCore, QtGui`
`2`	`2`
`3`	`3`
`4`	`4`	`class NodeTextItem(QtWidgets.QGraphicsTextItem):`