update files to qt wrapper imports

examples/Mentor/10.2.setEventCB.py

@@ -39,8 +39,8 @@
 from pivy.gui.soqt import *
 
 # PySide module has to be imported as last one if used in the same namespace
-from PySide2.QtCore import *
-from PySide2.QtGui import *
+from pivy.qt.QtCore import *
+from pivy.qt.QtGui import *
 
 # Timer sensor 
 # Rotate 90 degrees every second, update 30 times a second

examples/QtDesigner/python/main.py

@@ -2,10 +2,10 @@
 
 import sys
 from pivy.gui.soqt import SoQt
-from PySide2.QtGui import QApplication
-from PySide2.QtCore import QObject
-from PySide2.QtCore import SIGNAL
-from PySide2.QtCore import SLOT
+from pivy.qt.QtGui import QApplication
+from pivy.qt.QtCore import QObject
+from pivy.qt.QtCore import SIGNAL
+from pivy.qt.QtCore import SLOT
 from mainwindow import MainWindow
 
 if __name__ == "__main__":

examples/QtDesigner/python/mainwindow.py

@@ -4,11 +4,11 @@
 from pivy.coin import *
 from pivy.gui.soqt import SoQtExaminerViewer
 from ui_test import Ui_MainWindow
-from PySide2.QtGui import QWidget
-from PySide2.QtGui import QMainWindow
-from PySide2.QtGui import QButtonGroup
-from PySide2.QtCore import QObject
-from PySide2.QtCore import SIGNAL
+from pivy.qt.QtGui import QWidget
+from pivy.qt.QtGui import QMainWindow
+from pivy.qt.QtGui import QButtonGroup
+from pivy.qt.QtCore import QObject
+from pivy.qt.QtCore import SIGNAL
 
 class MainWindow(QMainWindow, Ui_MainWindow):
     def __init__(self, parent = None):

examples/QtDesigner/python/ui_test.py

@@ -7,7 +7,7 @@
 #
 # WARNING! All changes made in this file will be lost!
 
-from PySide2 import QtCore, QtGui
+from pivy.qt import QtCore, QtGui
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):

examples/Quarter/mdi.py

@@ -19,8 +19,8 @@
 import os
 import sys
 
-from PySide2 import QtCore, QtGui
-from PySide2.QtGui import QMainWindow, QWorkspace, QAction, QFileDialog, QApplication
+from pivy.qt import QtCore, QtGui
+from pivy.qt.QtGui import QMainWindow, QWorkspace, QAction, QFileDialog, QApplication
 
 from pivy.coin import SoInput, SoDB
 from pivy.quarter import QuarterWidget

examples/Quarter/minimal.py

@@ -18,7 +18,7 @@
 
 import sys
 
-from PySide2.QtWidgets import QApplication
+from pivy.qt.QtWidgets import QApplication
 
 from pivy.coin import SoSeparator
 from pivy.coin import SoBaseColor

examples/examiner_embed4.py

@@ -27,10 +27,10 @@
 from pivy.gui.soqt import *
 
 try:
-    from PySide2.QtWidgets import *
+    from pivy.qt.QtWidgets import *
 except ImportError:
-    from PySide2.QtGui import *
-from PySide2.QtCore import *
+    from pivy.qt.QtGui import *
+from pivy.qt.QtCore import *
 
 class EmbeddedWindow(QMainWindow):
     def __init__(self, *args):

examples/soqt/renderAreaCallback.py

@@ -2,7 +2,7 @@
 import sys
 from pivy import coin
 from pivy.gui import soqt
-from PySide2.QtCore import QEvent
+from pivy.qt.QtCore import QEvent
 
 
 def foo(a, event):

examples/utils/GlClipPlane.py

@@ -1,5 +1,5 @@
 import sys
-from PySide2 import QtGui, QtWidgets
+from pivy.qt import QtGui, QtWidgets
 from pivy import quarter, coin
 from OpenGL.GL import *
 

examples/utils/event_callback.py

@@ -1,6 +1,6 @@
 import sys
-from PySide2.QtGui import QColor
-from PySide2.QtWidgets import QApplication
+from pivy.qt.QtGui import QColor
+from pivy.qt.QtWidgets import QApplication
 from pivy import quarter, coin
 
 

examples/utils/interaction.py

@@ -1,6 +1,6 @@
 import sys
-from PySide2.QtWidgets import QApplication
-from PySide2.QtGui import QColor
+from pivy.qt.QtWidgets import QApplication
+from pivy.qt.QtGui import QColor
 from pivy import quarter, coin, graphics, utils
 
 class ConnectionMarker(graphics.Marker):

pivy/graphics/viewer.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 from pivy import quarter, coin
-from PySide2 import QtGui, QtCore
+from pivy.qt import QtGui, QtCore
 import tempfile
 
 class Viewer(quarter.QuarterWidget):

pivy/gui/qt.py

@@ -1,3 +1,3 @@
-from PySide2.QtCore import *
-from PySide2.QtGui import *
-from PySide2.QtWidgets import *
+from pivy.qt.QtCore import *
+from pivy.qt.QtGui import *
+from pivy.qt.QtWidgets import *

pivy/qt/QtCore/__init__.py

@@ -1,4 +1,4 @@
 try:
-    from PySide2.QtCore import *
+    from PySide6.QtCore import *
 except ImportError:
-    from PySide6.QtCore import *
+    from PySide2.QtCore import *

pivy/qt/QtGui/__init__.py

@@ -1,4 +1,4 @@
 try:
-    from PySide2.QtGui import *
+    from PySide6.QtGui import *
 except ImportError:
-    from PySide6.QtGui import *
+    from PySide2.QtGui import *

pivy/qt/QtOpenGL/__init__.py

@@ -1,4 +1,4 @@
 try:
-    from PySide2.QtOpenGL import *
+    from PySide6.QtOpenGL import *
 except ImportError:
-    from PySide6.QtOpenGL import *
+    from PySide2.QtOpenGL import *

pivy/qt/QtWidgets/__init__.py

@@ -1,4 +1,4 @@
 try:
-    from PySide2.QtWidgets import *
+    from PySide6.QtWidgets import *
 except ImportError:
-    from PySide6.QtWidgets import *
+    from PySide2.QtWidgets import *

pivy/qt/__init__.py

@@ -0,0 +1,4 @@
+try:
+    import PySide6
+except ImportError:
+    import PySide2

pivy/quarter/ContextMenu.py

@@ -14,10 +14,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2 import QtCore
-from PySide2.QtCore import QObject
-from PySide2.QtGui import QMouseEvent
-from PySide2.QtWidgets import QMenu, QActionGroup, QAction
+from pivy.qt import QtCore
+from pivy.qt.QtCore import QObject
+from pivy.qt.QtGui import QMouseEvent
+from pivy.qt.QtWidgets import QMenu, QActionGroup, QAction
 
 from pivy import coin
 from pivy.coin import SoEventManager, SoScXMLStateMachine, SoRenderManager, SoGLRenderAction

pivy/quarter/ImageReader.py

@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2.QtGui import QImage
+from pivy.qt.QtGui import QImage
 from pivy.coin import SbImage
 
 

pivy/quarter/QuarterWidget.py

@@ -110,7 +110,7 @@
   \subpage examiner
 """
 
-from PySide2 import QtCore, QtGui, QtOpenGL
+from pivy.qt import QtCore, QtGui, QtOpenGL
 
 from pivy import coin
 

pivy/quarter/SensorManager.py

@@ -14,10 +14,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2.QtCore import QTimer
-from PySide2.QtCore import QObject
-from PySide2.QtCore import QThread
-from PySide2.QtCore import SIGNAL
+from pivy.qt.QtCore import QTimer
+from pivy.qt.QtCore import QObject
+from pivy.qt.QtCore import QThread
+from pivy.qt.QtCore import SIGNAL
 
 from pivy.coin import SoDB
 from pivy.coin import SbTime

pivy/quarter/SignalThread.py

@@ -14,10 +14,10 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2.QtCore import QThread
-from PySide2.QtCore import QWaitCondition
-from PySide2.QtCore import QMutex
-from PySide2.QtCore import SIGNAL
+from pivy.qt.QtCore import QThread
+from pivy.qt.QtCore import QWaitCondition
+from pivy.qt.QtCore import QMutex
+from pivy.qt.QtCore import SIGNAL
 
 
 class SignalThread(QThread):

pivy/quarter/devices/DeviceHandler.py

@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2 import QtCore
+from pivy.qt import QtCore
 
 from pivy import coin
 

pivy/quarter/devices/DeviceManager.py

@@ -24,8 +24,8 @@
 """
 from __future__ import print_function
 
-from PySide2.QtCore import QEvent
-from PySide2.QtGui import QMouseEvent
+from pivy.qt.QtCore import QEvent
+from pivy.qt.QtGui import QMouseEvent
 from pivy.coin import SoLocation2Event
 from pivy.coin import SbVec2s
 

pivy/quarter/devices/KeyboardHandler.py

@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2 import QtCore
+from pivy.qt import QtCore
 
 from pivy import coin
 

pivy/quarter/devices/MouseHandler.py

@@ -14,7 +14,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-from PySide2 import QtCore, QtGui
+from pivy.qt import QtCore, QtGui
 
 from pivy import coin
 

pivy/quarter/eventhandlers/DragDropHandler.py

@@ -22,7 +22,7 @@
   DeviceManager by default.
 """
 
-from PySide2 import QtCore
+from pivy.qt import QtCore
 from pivy import coin
 from .EventHandler import EventHandler
 

pivy/quarter/plugins/designer/python/PyQuarterWidgetPlugin.py

@@ -22,7 +22,7 @@
 QT_PLUGIN_PATH environment variable.
 """
 
-from PySide2 import QtGui, QtCore, QtDesigner
+from pivy.qt import QtGui, QtCore, QtDesigner
 from pivy import coin, quarter
 
 class PyQuarterWidgetPlugin(QtDesigner.QPyDesignerCustomWidgetPlugin):

pivy/sogui.py

@@ -109,12 +109,12 @@ def __hash__(self):
 # if no GUI has been specified try using Quarter
 if not gui:
     try:
-        __import__('PySide2')
+        __import__('pivy.qt')
         quarter = __import__('pivy.quarter').quarter
         gui = 'Quarter'
 
         import pivy
-        from PySide2 import QtGui, QtCore, QtWidgets
+        from pivy.qt import QtGui, QtCore, QtWidgets
 
         class SoGui(object):
             @staticmethod

pivy/utils.py

@@ -6,7 +6,7 @@ def add_marker_from_svg(file_path, marker_name, pixel_x=10, pixel_y=None,
     """adds a new marker bitmap from a vector graphic (svg)"""
 
     # get an icon from the svg rendered with the given pixel
-    from PySide2 import QtCore, QtGui
+    from pivy.qt import QtCore, QtGui
     pixel_y = pixel_y or pixel_x
     icon = QtGui.QIcon(file_path)
     icon = QtGui.QBitmap(icon.pixmap(pixel_x, pixel_y))

tests/pyside_test.py

@@ -1,6 +1,6 @@
 from __future__ import print_function
 import unittest
-from PySide2 import QtCore
+from pivy.qt import QtCore
 import shiboken2 as wrapper
 
 

tests/visual_test.py

@@ -1,6 +1,6 @@
 import sys
 
-from PySide2 import QtWidgets
+from pivy.qt import QtWidgets
 from pivy import coin, quarter