Qtpy

NodeGraphQt/base/commands.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 from NodeGraphQt.constants import PortTypeEnum
 

NodeGraphQt/base/graph.py

@@ -6,7 +6,7 @@
 import re
 from pathlib import Path
 
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.base.commands import (NodeAddedCmd,
                                        NodesRemovedCmd,
@@ -35,6 +35,11 @@
 from NodeGraphQt.widgets.viewer import NodeViewer
 from NodeGraphQt.widgets.viewer_nav import NodeNavigationWidget
 
+import qtpy
+if qtpy.API_NAME in ("PyQt5", "PySide2"):
+    from qtpy.QtWidgets import QUndoStack
+elif qtpy.API_NAME in ("PyQt6", "PySide6"):
+    from qtpy.QtGui import QUndoStack
 
 class NodeGraph(QtCore.QObject):
     """
@@ -151,7 +156,7 @@ def __init__(self, parent=None, **kwargs):
             kwargs.get('node_factory') or NodeFactory())
         self._undo_view = None
         self._undo_stack = (
-            kwargs.get('undo_stack') or QtWidgets.QUndoStack(self)
+            kwargs.get('undo_stack') or QUndoStack(self)
         )
         self._widget = None
         self._sub_graphs = {}
@@ -695,7 +700,7 @@ def undo_stack(self):
             :meth:`NodeGraph.end_undo()`
 
         Returns:
-            QtWidgets.QUndoStack: undo stack.
+            QUndoStack: undo stack.
         """
         return self._undo_stack
 

NodeGraphQt/base/menu.py

@@ -2,7 +2,7 @@
 import re
 from distutils.version import LooseVersion
 
-from Qt import QtGui, QtCore
+from qtpy import QtGui, QtCore
 
 from NodeGraphQt.errors import NodeMenuError
 from NodeGraphQt.widgets.actions import BaseMenu, GraphAction, NodeAction

NodeGraphQt/constants.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 import os
 
-from Qt import QtWidgets
+from qtpy import QtWidgets
 from enum import Enum
 
 from .pkg_info import __version__ as _v

NodeGraphQt/custom_widgets/nodes_palette.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 from collections import defaultdict
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import MIME_TYPE, URN_SCHEME
 

NodeGraphQt/custom_widgets/nodes_tree.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import MIME_TYPE, URN_SCHEME
 

NodeGraphQt/custom_widgets/properties_bin/custom_widget_color_picker.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from .custom_widget_vectors import PropVector3, PropVector4
 from .prop_widgets_abstract import BaseProperty

NodeGraphQt/custom_widgets/properties_bin/custom_widget_file_paths.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 from NodeGraphQt.widgets.dialogs import FileDialog
 from .prop_widgets_abstract import BaseProperty

NodeGraphQt/custom_widgets/properties_bin/custom_widget_slider.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 from .prop_widgets_abstract import BaseProperty
 

NodeGraphQt/custom_widgets/properties_bin/custom_widget_value_edit.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import re
 
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 _NUMB_REGEX = re.compile(r'^((?:\-)*\d+)*([\.,])*(\d+(?:[eE](?:[\-\+])*\d+)*)*')
 

NodeGraphQt/custom_widgets/properties_bin/custom_widget_vectors.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets
+from qtpy import QtWidgets
 
 from .custom_widget_value_edit import _NumberValueEdit
 from .prop_widgets_abstract import BaseProperty

NodeGraphQt/custom_widgets/properties_bin/node_property_widgets.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import defaultdict
 
-from Qt import QtWidgets, QtCore, QtGui, QtCompat
+from qtpy import QtWidgets, QtCore, QtGui
 
 from .node_property_factory import NodePropertyWidgetFactory
 from .prop_widgets_base import PropLineEdit
@@ -54,10 +54,10 @@ def __init__(self, parent=None):
         self.verticalHeader().hide()
         self.horizontalHeader().hide()
 
-        QtCompat.QHeaderView.setSectionResizeMode(
+        QtWidgets.QHeaderView.setSectionResizeMode(
             self.verticalHeader(), QtWidgets.QHeaderView.ResizeToContents
         )
-        QtCompat.QHeaderView.setSectionResizeMode(
+        QtWidgets.QHeaderView.setSectionResizeMode(
             self.horizontalHeader(), 0, QtWidgets.QHeaderView.Stretch
         )
         self.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel)
@@ -218,7 +218,7 @@ def _build_tree_group(title):
         tree_widget.setHeaderLabels(headers)
         tree_widget.setHeaderHidden(False)
         tree_widget.header().setStretchLastSection(False)
-        QtCompat.QHeaderView.setSectionResizeMode(
+        QtWidgets.QHeaderView.setSectionResizeMode(
             tree_widget.header(), 2, QtWidgets.QHeaderView.Stretch
         )
 
@@ -688,7 +688,7 @@ def __on_port_tree_visible_changed(self, node_id, visible, tree_widget):
             tree_widget.setVisible(visible)
             widget = self._prop_list.cellWidget(items[0].row(), 0)
             widget.adjustSize()
-            QtCompat.QHeaderView.setSectionResizeMode(
+            QtWidgets.QHeaderView.setSectionResizeMode(
                 self._prop_list.verticalHeader(),
                 QtWidgets.QHeaderView.ResizeToContents
             )

NodeGraphQt/custom_widgets/properties_bin/prop_widgets_abstract.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 
 class BaseProperty(QtWidgets.QWidget):

NodeGraphQt/custom_widgets/properties_bin/prop_widgets_base.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtWidgets, QtCore
+from qtpy import QtWidgets, QtCore
 
 
 class PropLabel(QtWidgets.QLabel):

NodeGraphQt/qgraphics/node_abstract.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import (
     Z_VAL_NODE,

NodeGraphQt/qgraphics/node_backdrop.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_BACKDROP, NodeEnum
 from NodeGraphQt.qgraphics.node_abstract import AbstractNodeItem

NodeGraphQt/qgraphics/node_base.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 from collections import OrderedDict
 
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (
     ITEM_CACHE_MODE,

NodeGraphQt/qgraphics/node_circle.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import NodeEnum, PortEnum
 from NodeGraphQt.qgraphics.node_base import NodeItem

NodeGraphQt/qgraphics/node_group.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import NodeEnum, PortEnum
 from NodeGraphQt.qgraphics.node_base import NodeItem

NodeGraphQt/qgraphics/node_overlay_disabled.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET
 

NodeGraphQt/qgraphics/node_port_in.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import NodeEnum
 from NodeGraphQt.qgraphics.node_base import NodeItem

NodeGraphQt/qgraphics/node_port_out.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import NodeEnum
 from NodeGraphQt.qgraphics.node_base import NodeItem

NodeGraphQt/qgraphics/node_text_item.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 
 class NodeTextItem(QtWidgets.QGraphicsTextItem):

NodeGraphQt/qgraphics/pipe.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import (
     LayoutDirectionEnum,

NodeGraphQt/qgraphics/port.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import (
     PortTypeEnum, PortEnum,

NodeGraphQt/qgraphics/slicer.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 import math
 
-from Qt import QtCore, QtGui, QtWidgets
+from qtpy import QtCore, QtGui, QtWidgets
 
 from NodeGraphQt.constants import Z_VAL_NODE_WIDGET, PipeSlicerEnum
 

NodeGraphQt/widgets/actions.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import ViewerEnum
 

NodeGraphQt/widgets/dialogs.py

@@ -1,6 +1,6 @@
 import os
 
-from Qt import QtWidgets, QtGui, QtCore
+from qtpy import QtWidgets, QtGui, QtCore
 
 _current_user_directory = os.path.expanduser('~')
 

NodeGraphQt/widgets/node_graph.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtGui
+from qtpy import QtWidgets, QtGui
 
 from NodeGraphQt.constants import (
     NodeEnum, ViewerEnum, ViewerNavEnum

NodeGraphQt/widgets/node_widgets.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt.constants import ViewerEnum, Z_VAL_NODE_WIDGET
 from NodeGraphQt.errors import NodeWidgetError

NodeGraphQt/widgets/scene.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.constants import ViewerEnum
 

NodeGraphQt/widgets/tab_search.py

@@ -2,7 +2,7 @@
 import re
 from collections import OrderedDict
 
-from Qt import QtCore, QtWidgets, QtGui
+from qtpy import QtCore, QtWidgets, QtGui
 
 from NodeGraphQt.constants import ViewerEnum, ViewerNavEnum
 

NodeGraphQt/widgets/viewer.py

@@ -3,7 +3,7 @@
 import math
 from distutils.version import LooseVersion
 
-from Qt import QtGui, QtCore, QtWidgets
+from qtpy import QtGui, QtCore, QtWidgets
 
 from NodeGraphQt.base.menu import BaseMenu
 from NodeGraphQt.constants import (

NodeGraphQt/widgets/viewer_nav.py

@@ -1,4 +1,4 @@
-from Qt import QtWidgets, QtCore, QtGui
+from qtpy import QtWidgets, QtCore, QtGui
 
 from NodeGraphQt.constants import NodeEnum, ViewerNavEnum
 

NodeGraphQtPy

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

examples/basic_example.py

@@ -3,7 +3,7 @@
 import signal
 from pathlib import Path
 
-from Qt import QtCore, QtWidgets
+from qtpy import QtCore, QtWidgets
 
 from NodeGraphQt import (
     NodeGraph,

examples/hotkeys/hotkey_functions.py

@@ -97,7 +97,7 @@ def quit_qt(graph):
     """
     Quit the Qt application.
     """
-    from Qt import QtCore
+    from qtpy import QtCore
     QtCore.QCoreApplication.quit()
 
 def clear_undo(graph):

examples/nodes/custom_ports_node.py

@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from Qt import QtCore, QtGui
+from qtpy import QtCore, QtGui
 
 from NodeGraphQt import BaseNode
 

requirements.txt

@@ -1 +1 @@
-Qt.py>=1.3.0
+QtPy==2.4.1

utils/convert_to_qtpy.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+
+"""Script converts Qt import to qtpy.
+
+"""
+import fnmatch
+import os
+import re
+import sys
+
+PYTHON_SCRIPT_PATH = sys.argv[1]
+
+if os.path.isdir(PYTHON_SCRIPT_PATH):
+    pattern = re.compile(r"^(from Qt) (.*)$")
+    for root, dirs, files in os.walk(PYTHON_SCRIPT_PATH):
+        for filename in files:
+            if fnmatch.fnmatch(filename, "*.py"):
+                filepath = os.path.join(root, filename)
+                filedata = []
+                with open(filepath) as f:
+                    for line in f.readlines():
+                        match = pattern.match(line)
+                        if match is not None:
+                            line = f"from qtpy {match.group(2)}"
+                        filedata.append(line.strip("\n"))
+                with open(filepath, "w") as f:
+                   f.write("\n".join(filedata))
+else:
+    print("Argument is not a directory")