generate pyqt6 forms

qt/aqt/forms/BUILD.bazel

@@ -1,17 +1,48 @@
 load("@rules_python//python:defs.bzl", "py_binary")
 load("compile.bzl", "compile_all")
 
+py_binary(
+    name = "build_ui_qt5",
+    srcs = ["build_ui_qt5.py"],
+    legacy_create_init = False,
+    deps = ["@pyqt5//:pkg"],
+)
+
+py_binary(
+    name = "build_ui_qt6",
+    srcs = ["build_ui_qt6.py"],
+    legacy_create_init = False,
+    deps = ["@pyqt6//:pkg"],
+)
+
 compile_all(
+    name = "forms_qt5",
     srcs = glob(["*.ui"]),
-    group = "forms",
+    builder = "build_ui_qt5",
+    suffix = "_qt5",
+)
+
+compile_all(
+    name = "forms_qt6",
+    srcs = glob(["*.ui"]),
+    builder = "build_ui_qt6",
+    suffix = "_qt6",
+)
+
+filegroup(
+    name = "forms",
+    srcs = glob(
+        ["*.py"],
+        exclude = [
+            "*_qt5.py",
+            "*_qt6.py",
+            "build_ui*.py",
+        ],
+    ) + [
+        ":forms_qt6",
+        ":forms_qt5",
+    ],
     visibility = [
         "//qt/aqt:__pkg__",
     ],
 )
-
-py_binary(
-    name = "build_ui",
-    srcs = ["build_ui.py"],
-    legacy_create_init = False,
-    deps = ["@pyqt5//:pkg"],
-)

qt/aqt/forms/__init___qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/__init___qt6.py

qt/aqt/forms/about.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/about.py

qt/aqt/forms/about.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .about_qt6 import *
+else:
+  from .about_qt5 import *  # type: ignore

qt/aqt/forms/about_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/about_qt6.py

qt/aqt/forms/addcards.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/addcards.py

qt/aqt/forms/addcards.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .addcards_qt6 import *
+else:
+  from .addcards_qt5 import *  # type: ignore

qt/aqt/forms/addcards_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/addcards_qt6.py

qt/aqt/forms/addfield.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/addfield.py

qt/aqt/forms/addfield.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .addfield_qt6 import *
+else:
+  from .addfield_qt5 import *  # type: ignore

qt/aqt/forms/addfield_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/addfield_qt6.py

qt/aqt/forms/addmodel.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/addmodel.py

qt/aqt/forms/addmodel.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .addmodel_qt6 import *
+else:
+  from .addmodel_qt5 import *  # type: ignore

qt/aqt/forms/addmodel_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/addmodel_qt6.py

qt/aqt/forms/addonconf.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/addonconf.py

qt/aqt/forms/addonconf.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .addonconf_qt6 import *
+else:
+  from .addonconf_qt5 import *  # type: ignore

qt/aqt/forms/addonconf_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/addonconf_qt6.py

qt/aqt/forms/addons.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/addons.py

qt/aqt/forms/addons.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .addons_qt6 import *
+else:
+  from .addons_qt5 import *  # type: ignore

qt/aqt/forms/addons_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/addons_qt6.py

qt/aqt/forms/browser.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/browser.py

qt/aqt/forms/browser.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .browser_qt6 import *
+else:
+  from .browser_qt5 import *  # type: ignore

qt/aqt/forms/browser_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/browser_qt6.py

qt/aqt/forms/browserdisp.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/browserdisp.py

qt/aqt/forms/browserdisp.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .browserdisp_qt6 import *
+else:
+  from .browserdisp_qt5 import *  # type: ignore

qt/aqt/forms/browserdisp_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/browserdisp_qt6.py

qt/aqt/forms/browseropts.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/browseropts.py

qt/aqt/forms/browseropts.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .browseropts_qt6 import *
+else:
+  from .browseropts_qt5 import *  # type: ignore

qt/aqt/forms/browseropts_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/browseropts_qt6.py

qt/aqt/forms/build_ui_qt5_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/build_ui_qt5_qt6.py

qt/aqt/forms/build_ui_qt6.py

@@ -0,0 +1,39 @@
+import re
+import sys
+import io
+from PyQt6.uic import compileUi
+
+ui_file = sys.argv[1]
+py_file = sys.argv[2]
+buf = io.StringIO()
+compileUi(open(ui_file), buf)
+
+outdata = buf.getvalue()
+outdata = outdata.replace(
+    "from PyQt6 import QtCore, QtGui, QtWidgets",
+    "from PyQt6 import QtCore, QtGui, QtWidgets\nfrom aqt.utils import tr\n"
+)
+outdata = re.sub(
+    r'(?:QtGui\.QApplication\.)?_?translate\(".*?", "(.*?)"', "tr.\\1(", outdata
+)
+
+
+outlines = []
+qt_bad_types = [
+    ".connect(",
+]
+for line in outdata.splitlines():
+    for substr in qt_bad_types:
+        if substr in line:
+            line = line + "  # type: ignore"
+            break
+    if line == "from . import icons_rc":
+        continue
+    line = line.replace(":/icons/", "icons:")
+    line = line.replace("QAction.PreferencesRole", "QAction.MenuRole.PreferencesRole")
+    line = line.replace("QAction.AboutRole", "QAction.MenuRole.AboutRole")
+    line = line.replace("QComboBox.AdjustToMinimumContentsLength", "QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLength")
+    outlines.append(line)
+
+with open(py_file, "w") as file:
+    file.write("\n".join(outlines))

qt/aqt/forms/build_ui_qt6_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/build_ui_qt6_qt6.py

qt/aqt/forms/changemap.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/changemap.py

qt/aqt/forms/changemap.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .changemap_qt6 import *
+else:
+  from .changemap_qt5 import *  # type: ignore

qt/aqt/forms/changemap_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/changemap_qt6.py

qt/aqt/forms/changemodel.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/changemodel.py

qt/aqt/forms/changemodel.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .changemodel_qt6 import *
+else:
+  from .changemodel_qt5 import *  # type: ignore

qt/aqt/forms/changemodel_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/changemodel_qt6.py

qt/aqt/forms/clayout_top.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/clayout_top.py

qt/aqt/forms/clayout_top.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .clayout_top_qt6 import *
+else:
+  from .clayout_top_qt5 import *  # type: ignore

qt/aqt/forms/clayout_top_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/clayout_top_qt6.py

qt/aqt/forms/compile.bzl

@@ -1,28 +1,28 @@
-def compile(name, ui_file, py_file):
+def compile(name, ui_file, py_file, builder):
     native.genrule(
         name = name,
         srcs = [ui_file],
         outs = [py_file],
-        cmd = "$(location build_ui) $(location {ui_file}) $(location {py_file})".format(
+        cmd = "$(location {builder}) $(location {ui_file}) $(location {py_file})".format(
+            builder = builder,
             ui_file = ui_file,
             py_file = py_file,
         ),
         tools = [
-            "build_ui",
+            builder,
         ],
         message = "Building UI",
     )
 
-def compile_all(group, srcs, visibility):
+def compile_all(name, builder, srcs, suffix):
     py_files = []
     for ui_file in srcs:
-        name = ui_file.replace(".ui", "")
-        py_file = name + ".py"
+        fname = ui_file.replace(".ui", "") + suffix
+        py_file = fname + ".py"
         py_files.append(py_file)
-        compile(name, ui_file, py_file)
+        compile(fname, ui_file, py_file, builder)
 
     native.filegroup(
-        name = group,
-        srcs = py_files + ["__init__.py"],
-        visibility = visibility,
+        name = name,
+        srcs = py_files,
     )

qt/aqt/forms/customstudy.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/customstudy.py

qt/aqt/forms/customstudy.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .customstudy_qt6 import *
+else:
+  from .customstudy_qt5 import *  # type: ignore

qt/aqt/forms/customstudy_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/customstudy_qt6.py

qt/aqt/forms/dconf.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/dconf.py

qt/aqt/forms/dconf.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .dconf_qt6 import *
+else:
+  from .dconf_qt5 import *  # type: ignore

qt/aqt/forms/dconf_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/dconf_qt6.py

qt/aqt/forms/debug.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/debug.py

qt/aqt/forms/debug.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .debug_qt6 import *
+else:
+  from .debug_qt5 import *  # type: ignore

qt/aqt/forms/debug_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/debug_qt6.py

qt/aqt/forms/editaddon.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/editaddon.py

qt/aqt/forms/editaddon.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .editaddon_qt6 import *
+else:
+  from .editaddon_qt5 import *  # type: ignore

qt/aqt/forms/editaddon_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/editaddon_qt6.py

qt/aqt/forms/editcurrent.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/editcurrent.py

qt/aqt/forms/editcurrent.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .editcurrent_qt6 import *
+else:
+  from .editcurrent_qt5 import *  # type: ignore

qt/aqt/forms/editcurrent_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/editcurrent_qt6.py

qt/aqt/forms/edithtml.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/edithtml.py

qt/aqt/forms/edithtml.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .edithtml_qt6 import *
+else:
+  from .edithtml_qt5 import *  # type: ignore

qt/aqt/forms/edithtml_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/edithtml_qt6.py

qt/aqt/forms/emptycards.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/emptycards.py

qt/aqt/forms/emptycards.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .emptycards_qt6 import *
+else:
+  from .emptycards_qt5 import *  # type: ignore

qt/aqt/forms/emptycards_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/emptycards_qt6.py

qt/aqt/forms/exporting.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/exporting.py

qt/aqt/forms/exporting.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .exporting_qt6 import *
+else:
+  from .exporting_qt5 import *  # type: ignore

qt/aqt/forms/exporting_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/exporting_qt6.py

qt/aqt/forms/fields.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/fields.py

qt/aqt/forms/fields.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .fields_qt6 import *
+else:
+  from .fields_qt5 import *  # type: ignore

qt/aqt/forms/fields_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/fields_qt6.py

qt/aqt/forms/filtered_deck.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/filtered_deck.py

qt/aqt/forms/filtered_deck.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .filtered_deck_qt6 import *
+else:
+  from .filtered_deck_qt5 import *  # type: ignore

qt/aqt/forms/filtered_deck_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/filtered_deck_qt6.py

qt/aqt/forms/finddupes.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/finddupes.py

qt/aqt/forms/finddupes.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .finddupes_qt6 import *
+else:
+  from .finddupes_qt5 import *  # type: ignore

qt/aqt/forms/finddupes_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/finddupes_qt6.py

qt/aqt/forms/findreplace.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/findreplace.py

qt/aqt/forms/findreplace.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .findreplace_qt6 import *
+else:
+  from .findreplace_qt5 import *  # type: ignore

qt/aqt/forms/findreplace_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/findreplace_qt6.py

qt/aqt/forms/getaddons.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/getaddons.py

qt/aqt/forms/getaddons.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .getaddons_qt6 import *
+else:
+  from .getaddons_qt5 import *  # type: ignore

qt/aqt/forms/getaddons_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/getaddons_qt6.py

qt/aqt/forms/importing.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/importing.py

qt/aqt/forms/importing.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .importing_qt6 import *
+else:
+  from .importing_qt5 import *  # type: ignore

qt/aqt/forms/importing_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/importing_qt6.py

qt/aqt/forms/main.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/main.py

qt/aqt/forms/main.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .main_qt6 import *
+else:
+  from .main_qt5 import *  # type: ignore

qt/aqt/forms/main_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/main_qt6.py

qt/aqt/forms/modelopts.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/modelopts.py

qt/aqt/forms/modelopts.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .modelopts_qt6 import *
+else:
+  from .modelopts_qt5 import *  # type: ignore

qt/aqt/forms/modelopts_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/modelopts_qt6.py

qt/aqt/forms/models.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/models.py

qt/aqt/forms/models.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .models_qt6 import *
+else:
+  from .models_qt5 import *  # type: ignore

qt/aqt/forms/models_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/models_qt6.py

qt/aqt/forms/preferences.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/preferences.py

qt/aqt/forms/preferences.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .preferences_qt6 import *
+else:
+  from .preferences_qt5 import *  # type: ignore

qt/aqt/forms/preferences_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/preferences_qt6.py

qt/aqt/forms/preview.py

@@ -1 +0,0 @@
-../../../bazel-bin/qt/aqt/forms/preview.py

qt/aqt/forms/preview.py

@@ -0,0 +1,5 @@
+from aqt.qt import qtmajor
+if qtmajor > 5:
+  from .preview_qt6 import *
+else:
+  from .preview_qt5 import *  # type: ignore

qt/aqt/forms/preview_qt6.py

@@ -0,0 +1 @@
+../../../bazel-bin/qt/aqt/forms/preview_qt6.py