removeHook -> remHook

This commit is contained in:
Damien Elmes 2011-12-06 00:11:48 +09:00
parent d34ee6822f
commit 9a6ddae1cb
5 changed files with 15 additions and 15 deletions

View file

@ -11,7 +11,7 @@ from anki.utils import stripHTML
from aqt.utils import saveGeom, restoreGeom, showWarning, askUser, shortcut, \ from aqt.utils import saveGeom, restoreGeom, showWarning, askUser, shortcut, \
tooltip, openHelp tooltip, openHelp
from anki.sound import clearAudioQueue from anki.sound import clearAudioQueue
from anki.hooks import addHook, removeHook from anki.hooks import addHook, remHook
from anki.utils import stripHTMLMedia, isMac from anki.utils import stripHTMLMedia, isMac
import aqt.editor, aqt.modelchooser import aqt.editor, aqt.modelchooser
@ -164,8 +164,8 @@ question or answer on all cards."""), help="AddItems")
def reject(self): def reject(self):
if not self.canClose(): if not self.canClose():
return return
removeHook('reset', self.onReset) remHook('reset', self.onReset)
removeHook('currentModelChanged', self.onReset) remHook('currentModelChanged', self.onReset)
clearAudioQueue() clearAudioQueue()
self.removeTempNote(self.editor.note) self.removeTempNote(self.editor.note)
self.editor.setNote(None) self.editor.setNote(None)

View file

@ -13,7 +13,7 @@ from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter, \
showInfo, askUser, tooltip, openHelp showInfo, askUser, tooltip, openHelp
from anki.errors import * from anki.errors import *
from anki.db 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.webview import AnkiWebView
from aqt.toolbar import Toolbar from aqt.toolbar import Toolbar
@ -1040,10 +1040,10 @@ where id in %s""" % ids2str(self.selectedCards()), mod)
addHook("editFocusLost", self.refreshCurrentCard) addHook("editFocusLost", self.refreshCurrentCard)
def teardownHooks(self): def teardownHooks(self):
removeHook("reset", self.onReset) remHook("reset", self.onReset)
removeHook("editTimer", self.refreshCurrentCard) remHook("editTimer", self.refreshCurrentCard)
removeHook("editFocusLost", self.refreshCurrentCard) remHook("editFocusLost", self.refreshCurrentCard)
removeHook("undoState", self.onUndoState) remHook("undoState", self.onUndoState)
def onUndoState(self, on): def onUndoState(self, on):
self.form.actionUndo.setEnabled(on) self.form.actionUndo.setEnabled(on)
@ -1363,8 +1363,8 @@ class ChangeModel(QDialog):
new=self.targetModel.fields) new=self.targetModel.fields)
def cleanup(self): def cleanup(self):
removeHook("reset", self.onReset) remHook("reset", self.onReset)
removeHook("currentModelChanged", self.onReset) remHook("currentModelChanged", self.onReset)
self.modelChooser.cleanup() self.modelChooser.cleanup()
saveGeom(self, "changeModel") saveGeom(self, "changeModel")

View file

@ -5,7 +5,7 @@
from aqt.qt import * from aqt.qt import *
import aqt.editor import aqt.editor
from aqt.utils import saveGeom, restoreGeom from aqt.utils import saveGeom, restoreGeom
from anki.hooks import addHook, removeHook from anki.hooks import addHook, remHook
class EditCurrent(QDialog): class EditCurrent(QDialog):
@ -40,7 +40,7 @@ class EditCurrent(QDialog):
self.editor.setNote(n) self.editor.setNote(n)
def onSave(self): def onSave(self):
removeHook("reset", self.onReset) remHook("reset", self.onReset)
self.editor.saveNow() self.editor.saveNow()
self.editor.setNote(None) self.editor.setNote(None)
r = self.mw.reviewer r = self.mw.reviewer

View file

@ -12,7 +12,7 @@ QtConfig = pyqtconfig.Configuration()
from anki import Collection from anki import Collection
from anki.sound import playFromText, clearAudioQueue, stripSounds from anki.sound import playFromText, clearAudioQueue, stripSounds
from anki.utils import stripHTML, checksum, isWin, isMac 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 anki.consts
import aqt, aqt.progress, aqt.webview, aqt.toolbar import aqt, aqt.progress, aqt.webview, aqt.toolbar

View file

@ -5,7 +5,7 @@ from aqt.qt import *
from operator import itemgetter from operator import itemgetter
from anki import stdmodels from anki import stdmodels
from anki.lang import ngettext from anki.lang import ngettext
from anki.hooks import addHook, removeHook, runHook from anki.hooks import addHook, remHook, runHook
from aqt.utils import isMac from aqt.utils import isMac
import aqt import aqt
@ -64,7 +64,7 @@ class ModelChooser(QHBoxLayout):
self.updateTemplates() self.updateTemplates()
def cleanup(self): def cleanup(self):
removeHook('reset', self.onReset) remHook('reset', self.onReset)
def onReset(self): def onReset(self):
if not self._ignoreReset: if not self._ignoreReset: