qt: use imports.py where needed, try Qt5 in prio

diff --git a/gamiki/qt/flow_layout.py b/gamiki/qt/flow_layout.py
index f2e3ad24ff74b67e2771ce88992857e178206f3d..1b406bd4ef2a762c42accb5e0fea0061aafe051b 100755 (executable)
--- a/gamiki/qt/flow_layout.py
+++ b/gamiki/qt/flow_layout.py
@@ -40,16 +40,7 @@
 ##
 #############################################################################
 
-try:
-    from PyQt6.QtCore    import *
-    from PyQt6.QtWidgets import *
-except:
-    try:
-        from PyQt5.QtCore    import *
-        from PyQt5.QtWidgets import *
-    except:
-        from PyQt4.QtCore import *
-        from PyQt4.QtGui  import *
+from gamiki.qt.imports import *
 
 class FlowLayout(QLayout):
 

diff --git a/gamiki/qt/imports.py b/gamiki/qt/imports.py
index 485723cc9c8bac5334f1f434b090cacb85a539db..aa95eceabecb50d0b56bc62851d46e9c98dd11d0 100644 (file)
--- a/gamiki/qt/imports.py
+++ b/gamiki/qt/imports.py
@@ -1,22 +1,22 @@
 pyqt_version = ""
 try:
-    from PyQt6.QtCore    import *
-    from PyQt6.QtWidgets import *
-    from PyQt6.QtGui     import *
-    Qt.AlignRight = Qt.AlignmentFlag.AlignRight
-    Qt.WA_TransparentForMouseEvents = (
-        Qt.WidgetAttribute.WA_TransparentForMouseEvents
-    )
-    QApplication.exec_ = QApplication.exec
-    pyqt_version = "PyQt6"
+    from PyQt5.QtCore    import *
+    from PyQt5.QtWidgets import *
+    from PyQt5.QtGui     import *
+    pyqt_version = "PyQt5"
+    
 except:
     try:
-        from PyQt5.QtCore    import *
-        from PyQt5.QtWidgets import *
-        from PyQt5.QtGui     import *
-        pyqt_version = "PyQt5"
+        from PyQt6.QtCore    import *
+        from PyQt6.QtWidgets import *
+        from PyQt6.QtGui     import *
+        Qt.AlignRight = Qt.AlignmentFlag.AlignRight
+        Qt.WA_TransparentForMouseEvents = (
+            Qt.WidgetAttribute.WA_TransparentForMouseEvents
+        )
+        QApplication.exec_ = QApplication.exec
+        pyqt_version = "PyQt6"
     except:
         from PyQt4.QtCore    import *
         from PyQt4.QtGui     import *
         pyqt_version = "PyQt4"
-

diff --git a/gamiki/qt/utils.py b/gamiki/qt/utils.py
index dd2407ef5391bc8031341c2a344136563b82110b..56cc40c62a0139e00672a3b35bf715906b0ffdce 100644 (file)
--- a/gamiki/qt/utils.py
+++ b/gamiki/qt/utils.py
@@ -1,13 +1,4 @@
-try:
-    from PyQt6.QtCore    import *
-    from PyQt6.QtWidgets import *
-except:
-    try:
-        from PyQt5.QtCore    import *
-        from PyQt5.QtWidgets import *
-    except:
-        from PyQt4.QtCore    import *
-        from PyQt4.QtGui     import *
+from gamiki.qt.imports import *
 
 pool = QThreadPool()
 def start(runnable):