From 64e40033e0adc4c1394b99cb9c6b76ed08aabb87 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sun, 17 Sep 2023 13:42:40 +1000 Subject: [PATCH] Remove the fields_web experiment --- qt/aqt/fields.py | 19 --------------- qt/aqt/forms/__init__.py | 1 - qt/aqt/forms/fields_web.py | 6 ----- qt/aqt/forms/fields_web.ui | 49 -------------------------------------- 4 files changed, 75 deletions(-) delete mode 100644 qt/aqt/forms/fields_web.py delete mode 100644 qt/aqt/forms/fields_web.ui diff --git a/qt/aqt/fields.py b/qt/aqt/fields.py index 57d5aa843..14b581ee5 100644 --- a/qt/aqt/fields.py +++ b/qt/aqt/fields.py @@ -3,14 +3,12 @@ from __future__ import annotations -import os from typing import Optional import aqt import aqt.forms import aqt.operations from anki.collection import OpChanges -from anki.consts import * from anki.lang import without_unicode_isolation from anki.models import NotetypeDict from aqt import AnkiQt, gui_hooks @@ -27,7 +25,6 @@ from aqt.utils import ( tooltip, tr, ) -from aqt.webview import AnkiWebViewKind class FieldDialog(QDialog): @@ -51,19 +48,6 @@ class FieldDialog(QDialog): without_unicode_isolation(tr.fields_fields_for(val=self.model["name"])) ) - if os.getenv("ANKI_EXPERIMENTAL_FIELDS_WEB"): - form = aqt.forms.fields_web.Ui_Dialog() - form.setupUi(self) - - self.webview = form.webview - self.webview.set_kind(AnkiWebViewKind.FIELDS) - - self.show() - self.refresh() - self.webview.set_bridge_command(self._on_bridge_cmd, self) - self.activateWindow() - return - self.form = aqt.forms.fields.Ui_Dialog() self.form.setupUi(self) self.webview = None @@ -86,9 +70,6 @@ class FieldDialog(QDialog): self.form.fieldList.setCurrentRow(open_at) self.exec() - def refresh(self) -> None: - self.webview.load_ts_page("fields") - def _on_bridge_cmd(self, cmd: str) -> bool: return False diff --git a/qt/aqt/forms/__init__.py b/qt/aqt/forms/__init__.py index 424a1f314..313645e8f 100644 --- a/qt/aqt/forms/__init__.py +++ b/qt/aqt/forms/__init__.py @@ -20,7 +20,6 @@ from . import ( emptycards, exporting, fields, - fields_web, filtered_deck, finddupes, findreplace, diff --git a/qt/aqt/forms/fields_web.py b/qt/aqt/forms/fields_web.py deleted file mode 100644 index e4e1686be..000000000 --- a/qt/aqt/forms/fields_web.py +++ /dev/null @@ -1,6 +0,0 @@ -from aqt.qt import qtmajor - -if qtmajor > 5: - from _aqt.forms.fields_web_qt6 import * -else: - from _aqt.forms.fields_web_qt5 import * # type: ignore diff --git a/qt/aqt/forms/fields_web.ui b/qt/aqt/forms/fields_web.ui deleted file mode 100644 index d00f8b186..000000000 --- a/qt/aqt/forms/fields_web.ui +++ /dev/null @@ -1,49 +0,0 @@ - - - Dialog - - - - 0 - 0 - 400 - 300 - - - - Dialog - - - - :/icons/anki.png:/icons/anki.png - - - - 0 - - - 0 - - - - - - about:blank - - - - - - - - - AnkiWebView - QWidget -
aqt/webview
- 1 -
-
- - - -