Make last exporting dialog the new legacy

ankitects · Apr 29, 2024 · f88f05a · f88f05a
1 parent 6aa49a9
commit f88f05a
Show file tree

Hide file tree

Showing 9 changed files with 444 additions and 926 deletions.
diff --git a/pylib/anki/exporting.py b/pylib/anki/exporting.py
diff --git a/pylib/tests/test_exporting.py b/pylib/tests/test_exporting.py
diff --git a/qt/aqt/browser/browser.py b/qt/aqt/browser/browser.py
@@ -26,8 +26,7 @@
 from aqt import AnkiQt, gui_hooks
 from aqt.editor import Editor
 from aqt.errors import show_exception
-from aqt.exporting import ExportDialog as LegacyExportDialog
-from aqt.import_export.exporting import ExportDialog
+from aqt.import_export import exporting, exporting_web
 from aqt.operations.card import set_card_deck, set_card_flag
 from aqt.operations.collection import redo, undo
 from aqt.operations.note import remove_notes
@@ -916,12 +915,11 @@ def bury_selected_cards(self, checked: bool) -> None:
     @no_arg_trigger
     @skip_if_selection_is_empty
     def _on_export_notes(self) -> None:
+        nids = self.selected_notes()
         if not self.mw.pm.legacy_import_export():
-            nids = self.selected_notes()
-            ExportDialog(self.mw, nids=nids, parent=self)
+            exporting_web.ExportDialog(self.mw, nids=nids, parent=self)
         else:
-            cids = self.selectedNotesAsCards()
-            LegacyExportDialog(self.mw, cids=list(cids), parent=self)
+            exporting.ExportDialog(self.mw, nids=nids, parent=self)
 
     # Flags & Marking
     ######################################################################