langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a consistent function signature across load and save hooks

Browse Source
This commit is contained in:
Glutanimate 2020-02-24 15:47:48 +01:00
parent 7cc9311b79
commit 8454e27efb
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt/aqt/deckconf.py
View File

@ -221,7 +221,7 @@ class DeckConf(QDialog):
f.replayQuestion.setChecked(c.get("replayq", True))
# description
f.desc.setPlainText(self.deck["desc"])
gui_hooks.deck_conf_did_load_config(self, self.conf)
gui_hooks.deck_conf_did_load_config(self, self.deck, self.conf)
def onRestore(self):
self.mw.progress.start()

20
qt/aqt/gui_hooks.py
View File

@ -521,20 +521,22 @@ deck_browser_will_show_options_menu = _DeckBrowserWillShowOptionsMenuHook()
class _DeckConfDidLoadConfigHook:
"""Called once widget state has been set from deck config"""
_hooks: List[Callable[["aqt.deckconf.DeckConf", Any], None]] = []
_hooks: List[Callable[["aqt.deckconf.DeckConf", Any, Any], None]] = []
def append(self, cb: Callable[["aqt.deckconf.DeckConf", Any], None]) -> None:
"""(deck_conf: aqt.deckconf.DeckConf, config: Any)"""
def append(self, cb: Callable[["aqt.deckconf.DeckConf", Any, Any], None]) -> None:
"""(deck_conf: aqt.deckconf.DeckConf, deck: Any, config: Any)"""
self._hooks.append(cb)
def remove(self, cb: Callable[["aqt.deckconf.DeckConf", Any], None]) -> None:
def remove(self, cb: Callable[["aqt.deckconf.DeckConf", Any, Any], None]) -> None:
if cb in self._hooks:
self._hooks.remove(cb)
def __call__(self, deck_conf: aqt.deckconf.DeckConf, config: Any) -> None:
def __call__(
self, deck_conf: aqt.deckconf.DeckConf, deck: Any, config: Any
) -> None:
for hook in self._hooks:
try:
hook(deck_conf, config)
hook(deck_conf, deck, config)
except:
# if the hook fails, remove it
self._hooks.remove(hook)
@ -576,7 +578,7 @@ class _DeckConfWillSaveConfigHook:
_hooks: List[Callable[["aqt.deckconf.DeckConf", Any, Any], None]] = []
def append(self, cb: Callable[["aqt.deckconf.DeckConf", Any, Any], None]) -> None:
"""(deck_conf: aqt.deckconf.DeckConf, config: Any, deck: Any)"""
"""(deck_conf: aqt.deckconf.DeckConf, deck: Any, config: Any)"""
self._hooks.append(cb)
def remove(self, cb: Callable[["aqt.deckconf.DeckConf", Any, Any], None]) -> None:
@ -584,11 +586,11 @@ class _DeckConfWillSaveConfigHook:
self._hooks.remove(cb)
def __call__(
self, deck_conf: aqt.deckconf.DeckConf, config: Any, deck: Any
self, deck_conf: aqt.deckconf.DeckConf, deck: Any, config: Any
) -> None:
for hook in self._hooks:
try:
hook(deck_conf, config, deck)
hook(deck_conf, deck, config)
except:
# if the hook fails, remove it
self._hooks.remove(hook)

4
qt/tools/genhooks_gui.py
View File

@ -135,12 +135,12 @@ hooks = [
),
Hook(
name="deck_conf_did_load_config",
args=["deck_conf: aqt.deckconf.DeckConf", "config: Any"],
args=["deck_conf: aqt.deckconf.DeckConf", "deck: Any", "config: Any"],
doc="Called once widget state has been set from deck config",
),
Hook(
name="deck_conf_will_save_config",
args=["deck_conf: aqt.deckconf.DeckConf", "config: Any", "deck: Any"],
args=["deck_conf: aqt.deckconf.DeckConf", "deck: Any", "config: Any"],
doc="Called before widget state is saved to config",
),
# Browser