From: Niki Roo <niki@nikiroo.be>
Date: Sun, 14 Sep 2025 16:42:32 +0000 (+0200)
Subject: qt: use imports.py where needed, try Qt5 in prio
X-Git-Url: http://git.nikiroo.be/?a=commitdiff_plain;h=b88770b70c837838b7a7f324402d8ee642e23044;p=gamiki.git

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 f2e3ad2..1b406bd 100755
--- 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 485723c..aa95ece 100644
--- 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 dd2407e..56cc40c 100644
--- 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):