diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py index 198f3606d..e0930a4a4 100644 --- a/qt/aqt/browser/browser.py +++ b/qt/aqt/browser/browser.py @@ -800,7 +800,7 @@ class Browser(QMainWindow): @no_arg_trigger @skip_if_selection_is_empty def _on_export_notes(self) -> None: - if self.mw.pm.new_import_export(): + if not self.mw.pm.legacy_import_export(): nids = self.selected_notes() ExportDialog(self.mw, nids=nids) else: diff --git a/qt/aqt/forms/preferences.ui b/qt/aqt/forms/preferences.ui index a8f140624..eb4a4bd35 100644 --- a/qt/aqt/forms/preferences.ui +++ b/qt/aqt/forms/preferences.ui @@ -97,9 +97,9 @@ - + - New import/export handling (beta) + Legacy import/export handling @@ -684,7 +684,7 @@ pastePNG paste_strips_formatting ignore_accents_in_search - new_import_export + legacy_import_export useCurrent default_search_text uiScale diff --git a/qt/aqt/main.py b/qt/aqt/main.py index 45d0a262f..4fe525f4b 100644 --- a/qt/aqt/main.py +++ b/qt/aqt/main.py @@ -134,7 +134,7 @@ class MainWebView(AnkiWebView): paths = [url.toLocalFile() for url in mime.urls()] deck_paths = filter(lambda p: not p.endswith(".colpkg"), paths) for path in deck_paths: - if self.mw.pm.new_import_export(): + if not self.mw.pm.legacy_import_export(): import_file(self.mw, path) else: aqt.importing.importFile(self.mw, path) @@ -1194,7 +1194,7 @@ title="{}" {}>{}""".format( showInfo(tr.qt_misc_please_use_fileimport_to_import_this()) return None - if self.pm.new_import_export(): + if not self.pm.legacy_import_export(): import_file(self, path) else: aqt.importing.importFile(self, path) @@ -1203,7 +1203,7 @@ title="{}" {}>{}""".format( "Importing triggered via File>Import." import aqt.importing - if self.pm.new_import_export(): + if not self.pm.legacy_import_export(): prompt_for_file_then_import(self) else: aqt.importing.onImport(self) @@ -1211,7 +1211,7 @@ title="{}" {}>{}""".format( def onExport(self, did: DeckId | None = None) -> None: import aqt.exporting - if self.pm.new_import_export(): + if not self.pm.legacy_import_export(): ExportDialog(self, did=did) else: aqt.exporting.ExportDialog(self, did=did) diff --git a/qt/aqt/preferences.py b/qt/aqt/preferences.py index a61530ce2..f3b1fee0f 100644 --- a/qt/aqt/preferences.py +++ b/qt/aqt/preferences.py @@ -219,7 +219,7 @@ class Preferences(QDialog): self.form.theme.addItems(themes) self.form.theme.setCurrentIndex(self.mw.pm.theme().value) qconnect(self.form.theme.currentIndexChanged, self.on_theme_changed) - self.form.new_import_export.setChecked(self.mw.pm.new_import_export()) + self.form.legacy_import_export.setChecked(self.mw.pm.legacy_import_export()) self.setup_language() self.setup_video_driver() @@ -236,7 +236,7 @@ class Preferences(QDialog): self.mw.pm.setUiScale(newScale) restart_required = True - self.mw.pm.set_new_import_export(self.form.new_import_export.isChecked()) + self.mw.pm.set_legacy_import_export(self.form.legacy_import_export.isChecked()) if restart_required: showInfo(tr.preferences_changes_will_take_effect_when_you()) diff --git a/qt/aqt/profiles.py b/qt/aqt/profiles.py index 0aa5bb27c..486612da4 100644 --- a/qt/aqt/profiles.py +++ b/qt/aqt/profiles.py @@ -539,11 +539,11 @@ create table if not exists profiles def dark_mode_widgets(self) -> bool: return self.meta.get("dark_mode_widgets", False) - def new_import_export(self) -> bool: - return self.meta.get("new_import_export", False) + def legacy_import_export(self) -> bool: + return self.meta.get("legacy_import", False) - def set_new_import_export(self, enabled: bool) -> None: - self.meta["new_import_export"] = enabled + def set_legacy_import_export(self, enabled: bool) -> None: + self.meta["legacy_import"] = not enabled def last_loaded_profile_name(self) -> str | None: return self.meta.get("last_loaded_profile_name")