Merge pull request #20 from spacelord47/fix/use_qt6_enums_properly

Fixes: #19 Fixes: #18
fix: use Qt6 enums properly
2023-11-05 16:02:06 +01:00 · 2023-11-05 13:53:17 +00:00 · 2023-09-25 11:50:44 +02:00
2 changed files with 9 additions and 5 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -117,6 +117,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.idea

 # Spyder project settings
 .spyderproject
--- a/src/init.py
+++ b/src/init.py
@@ -19,7 +19,10 @@ class EditorPreview(object):
    def __init__(self):
        gui_hooks.editor_did_init.append(self.editor_init_hook)
        gui_hooks.editor_did_init_buttons.append(self.editor_init_button_hook)
-        if int(buildinfo.version.split(".")[2]) < 45:  # < 2.1.45
+        buildversion = buildinfo.version.split(".")
+
+        # Anki changed their versioning scheme in 2023 to year.month(.patch), causing things to explode here.
+        if not int(buildversion[0]) >= 23 and int(buildversion[2]) < 45:  # < 2.1.45
            self.js = [
                "js/vendor/jquery.min.js",
                "js/vendor/css_browser_selector.min.js",
@@ -53,22 +56,22 @@ class EditorPreview(object):
        location = config["location"]
        split = QSplitter()
        if location == "above":
-            split.setOrientation(Qt.Vertical)
+            split.setOrientation(Qt.Orientation.Vertical)
            split.addWidget(editor.editor_preview)
            split.addWidget(editor.web)
            sizes = [editorR, mainR]
        elif location == "below":
-            split.setOrientation(Qt.Vertical)
+            split.setOrientation(Qt.Orientation.Vertical)
            split.addWidget(editor.web)
            split.addWidget(editor.editor_preview)
            sizes = [mainR, editorR]
        elif location == "left":
-            split.setOrientation(Qt.Horizontal)
+            split.setOrientation(Qt.Orientation.Horizontal)
            split.addWidget(editor.editor_preview)
            split.addWidget(editor.web)
            sizes = [editorR, mainR]
        elif location == "right":
-            split.setOrientation(Qt.Horizontal)
+            split.setOrientation(Qt.Orientation.Horizontal)
            split.addWidget(editor.web)
            split.addWidget(editor.editor_preview)
            sizes = [mainR, editorR]
Author	SHA1	Message	Date
Tobias Manske	cefa65eadf	Merge pull request #20 from spacelord47/fix/use_qt6_enums_properly All checks were successful continuous-integration/drone/tag Build is passing Details Fixes: #19 Fixes: #18	2023-11-05 16:02:06 +01:00
spacelord47	766d246f46	fix: use Qt6 enums properly New Anki version(23.10) dropped compatibility for Qt5: https://forums.ankiweb.net/t/porting-tips-for-anki-23-10/35916#enumerations-6	2023-11-05 13:53:17 +00:00
Tobias Manske	23f9c0cb68	Patch version check for new versioning scheme I haven't taken a look at anything in the new version yet. But that closes #16.	2023-09-25 11:50:44 +02:00