From 5a1b00b6e64d7ecfe24158195d5e99d6f1645d94 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 24 Mar 2021 13:17:12 +1000 Subject: [PATCH] dyndeckconf -> filtered_deck --- qt/aqt/__init__.py | 4 ++-- qt/aqt/browser.py | 4 ++-- qt/aqt/{dyndeckconf.py => filtered_deck.py} | 8 ++++---- qt/aqt/forms/__init__.py | 2 +- qt/aqt/forms/{dyndconf.ui => filtered_deck.ui} | 0 qt/aqt/main.py | 4 ++-- qt/aqt/overview.py | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename qt/aqt/{dyndeckconf.py => filtered_deck.py} (98%) rename qt/aqt/forms/{dyndconf.ui => filtered_deck.ui} (100%) diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py index d47145eb7..893bd85bb 100644 --- a/qt/aqt/__init__.py +++ b/qt/aqt/__init__.py @@ -69,7 +69,7 @@ except ImportError as e: # - make preferences modal? cmd+q does wrong thing -from aqt import addcards, addons, browser, editcurrent, dyndeckconf # isort:skip +from aqt import addcards, addons, browser, editcurrent, filtered_deck # isort:skip from aqt import stats, about, preferences, mediasync # isort:skip @@ -80,7 +80,7 @@ class DialogManager: "AddonsDialog": [addons.AddonsDialog, None], "Browser": [browser.Browser, None], "EditCurrent": [editcurrent.EditCurrent, None], - "DynDeckConfDialog": [dyndeckconf.DeckConf, None], + "FilteredDeckConfigDialog": [filtered_deck.FilteredDeckConfigDialog, None], "DeckStats": [stats.DeckStats, None], "NewDeckStats": [stats.NewDeckStats, None], "About": [about.show, None], diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index 4a1f96df8..80187b44e 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -1108,9 +1108,9 @@ where id in %s""" def createFilteredDeck(self) -> None: search = self.form.searchEdit.lineEdit().text() if self.mw.col.schedVer() != 1 and KeyboardModifiersPressed().alt: - aqt.dialogs.open("DynDeckConfDialog", self.mw, search_2=search) + aqt.dialogs.open("FilteredDeckConfigDialog", self.mw, search_2=search) else: - aqt.dialogs.open("DynDeckConfDialog", self.mw, search=search) + aqt.dialogs.open("FilteredDeckConfigDialog", self.mw, search=search) # Preview ###################################################################### diff --git a/qt/aqt/dyndeckconf.py b/qt/aqt/filtered_deck.py similarity index 98% rename from qt/aqt/dyndeckconf.py rename to qt/aqt/filtered_deck.py index 79a743e04..58b01c04f 100644 --- a/qt/aqt/dyndeckconf.py +++ b/qt/aqt/filtered_deck.py @@ -24,7 +24,7 @@ from aqt.utils import ( ) -class DeckConf(QDialog): +class FilteredDeckConfigDialog(QDialog): """Dialogue to modify and build a filtered deck.""" def __init__( @@ -42,7 +42,7 @@ class DeckConf(QDialog): self.mw = mw self.col = self.mw.col self.did: Optional[int] = None - self.form = aqt.forms.dyndconf.Ui_Dialog() + self.form = aqt.forms.filtered_deck.Ui_Dialog() self.form.setupUi(self) self.mw.checkpoint(tr(TR.ACTIONS_OPTIONS)) self.initialSetup() @@ -294,7 +294,7 @@ class DeckConf(QDialog): self.mw.reset() saveGeom(self, "dyndeckconf") QDialog.reject(self) - aqt.dialogs.markClosed("DynDeckConfDialog") + aqt.dialogs.markClosed("FilteredDeckConfigDialog") def accept(self) -> None: try: @@ -310,7 +310,7 @@ class DeckConf(QDialog): saveGeom(self, "dyndeckconf") self.mw.reset() QDialog.accept(self) - aqt.dialogs.markClosed("DynDeckConfDialog") + aqt.dialogs.markClosed("FilteredDeckConfigDialog") def closeWithCallback(self, callback: Callable) -> None: self.reject() diff --git a/qt/aqt/forms/__init__.py b/qt/aqt/forms/__init__.py index 497228594..4553ff248 100644 --- a/qt/aqt/forms/__init__.py +++ b/qt/aqt/forms/__init__.py @@ -13,7 +13,7 @@ from . import clayout_top from . import customstudy from . import dconf from . import debug -from . import dyndconf +from . import filtered_deck from . import editaddon from . import editcurrent from . import edithtml diff --git a/qt/aqt/forms/dyndconf.ui b/qt/aqt/forms/filtered_deck.ui similarity index 100% rename from qt/aqt/forms/dyndconf.ui rename to qt/aqt/forms/filtered_deck.ui diff --git a/qt/aqt/main.py b/qt/aqt/main.py index 73b96172b..fd64fb22b 100644 --- a/qt/aqt/main.py +++ b/qt/aqt/main.py @@ -1325,7 +1325,7 @@ title="%s" %s>%s""" % ( if not deck: deck = self.col.decks.current() if deck["dyn"]: - aqt.dialogs.open("DynDeckConfDialog", self, deck=deck) + aqt.dialogs.open("FilteredDeckConfigDialog", self, deck=deck) else: aqt.deckconf.DeckConf(self, deck) @@ -1402,7 +1402,7 @@ title="%s" %s>%s""" % ( ########################################################################## def onCram(self) -> None: - aqt.dialogs.open("DynDeckConfDialog", self) + aqt.dialogs.open("FilteredDeckConfigDialog", self) # Menu, title bar & status ########################################################################## diff --git a/qt/aqt/overview.py b/qt/aqt/overview.py index b294ad284..04a7e081c 100644 --- a/qt/aqt/overview.py +++ b/qt/aqt/overview.py @@ -87,7 +87,7 @@ class Overview: elif url == "opts": self.mw.onDeckConf() elif url == "cram": - aqt.dialogs.open("DynDeckConfDialog", self.mw) + aqt.dialogs.open("FilteredDeckConfigDialog", self.mw) elif url == "refresh": self.rebuild_current_filtered_deck() elif url == "empty":