diff --git a/aqt/addcards.py b/aqt/addcards.py index 27b5a9c91..079631667 100644 --- a/aqt/addcards.py +++ b/aqt/addcards.py @@ -11,7 +11,7 @@ from anki.utils import stripHTML from aqt.utils import saveGeom, restoreGeom, showWarning, askUser, shortcut, \ tooltip, openHelp from anki.sound import clearAudioQueue -from anki.hooks import addHook, removeHook +from anki.hooks import addHook, remHook from anki.utils import stripHTMLMedia, isMac import aqt.editor, aqt.modelchooser @@ -164,8 +164,8 @@ question or answer on all cards."""), help="AddItems") def reject(self): if not self.canClose(): return - removeHook('reset', self.onReset) - removeHook('currentModelChanged', self.onReset) + remHook('reset', self.onReset) + remHook('currentModelChanged', self.onReset) clearAudioQueue() self.removeTempNote(self.editor.note) self.editor.setNote(None) diff --git a/aqt/browser.py b/aqt/browser.py index b548aaac4..5aee017e1 100644 --- a/aqt/browser.py +++ b/aqt/browser.py @@ -13,7 +13,7 @@ from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \ showInfo, askUser, tooltip, openHelp from anki.errors import * from anki.db import * -from anki.hooks import runHook, addHook, removeHook +from anki.hooks import runHook, addHook, remHook from aqt.webview import AnkiWebView from aqt.toolbar import Toolbar @@ -1040,10 +1040,10 @@ where id in %s""" % ids2str(self.selectedCards()), mod) addHook("editFocusLost", self.refreshCurrentCard) def teardownHooks(self): - removeHook("reset", self.onReset) - removeHook("editTimer", self.refreshCurrentCard) - removeHook("editFocusLost", self.refreshCurrentCard) - removeHook("undoState", self.onUndoState) + remHook("reset", self.onReset) + remHook("editTimer", self.refreshCurrentCard) + remHook("editFocusLost", self.refreshCurrentCard) + remHook("undoState", self.onUndoState) def onUndoState(self, on): self.form.actionUndo.setEnabled(on) @@ -1363,8 +1363,8 @@ class ChangeModel(QDialog): new=self.targetModel.fields) def cleanup(self): - removeHook("reset", self.onReset) - removeHook("currentModelChanged", self.onReset) + remHook("reset", self.onReset) + remHook("currentModelChanged", self.onReset) self.modelChooser.cleanup() saveGeom(self, "changeModel") diff --git a/aqt/editcurrent.py b/aqt/editcurrent.py index c47300601..dfde6b581 100644 --- a/aqt/editcurrent.py +++ b/aqt/editcurrent.py @@ -5,7 +5,7 @@ from aqt.qt import * import aqt.editor from aqt.utils import saveGeom, restoreGeom -from anki.hooks import addHook, removeHook +from anki.hooks import addHook, remHook class EditCurrent(QDialog): @@ -40,7 +40,7 @@ class EditCurrent(QDialog): self.editor.setNote(n) def onSave(self): - removeHook("reset", self.onReset) + remHook("reset", self.onReset) self.editor.saveNow() self.editor.setNote(None) r = self.mw.reviewer diff --git a/aqt/main.py b/aqt/main.py index 750b81cf8..065300ed4 100755 --- a/aqt/main.py +++ b/aqt/main.py @@ -12,7 +12,7 @@ QtConfig = pyqtconfig.Configuration() from anki import Collection from anki.sound import playFromText, clearAudioQueue, stripSounds from anki.utils import stripHTML, checksum, isWin, isMac -from anki.hooks import runHook, addHook, removeHook +from anki.hooks import runHook, addHook, remHook import anki.consts import aqt, aqt.progress, aqt.webview, aqt.toolbar diff --git a/aqt/modelchooser.py b/aqt/modelchooser.py index 75705f8c7..a973d692e 100644 --- a/aqt/modelchooser.py +++ b/aqt/modelchooser.py @@ -5,7 +5,7 @@ from aqt.qt import * from operator import itemgetter from anki import stdmodels from anki.lang import ngettext -from anki.hooks import addHook, removeHook, runHook +from anki.hooks import addHook, remHook, runHook from aqt.utils import isMac import aqt @@ -64,7 +64,7 @@ class ModelChooser(QHBoxLayout): self.updateTemplates() def cleanup(self): - removeHook('reset', self.onReset) + remHook('reset', self.onReset) def onReset(self): if not self._ignoreReset: