Merge branch 'master' of git://ichi2.net/ankiqt

This commit is contained in:
Susanna Björverud 2009-04-23 18:42:03 +02:00
commit ee9edc3e39
2 changed files with 5 additions and 0 deletions

View file

@ -697,18 +697,22 @@ where id in (%s)""" % ",".join([
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to add:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to add:"))
if tags: if tags:
n = _("Add Tags") n = _("Add Tags")
self.parent.setProgressParent(self)
self.deck.setUndoStart(n) self.deck.setUndoStart(n)
self.deck.addTags(self.selectedFacts(), tags) self.deck.addTags(self.selectedFacts(), tags)
self.deck.setUndoEnd(n) self.deck.setUndoEnd(n)
self.parent.setProgressParent(None)
self.updateAfterCardChange() self.updateAfterCardChange()
def deleteTags(self): def deleteTags(self):
(tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to delete:")) (tags, r) = ui.utils.getTag(self, self.deck, _("Enter tags to delete:"))
if tags: if tags:
n = _("Delete Tags") n = _("Delete Tags")
self.parent.setProgressParent(self)
self.deck.setUndoStart(n) self.deck.setUndoStart(n)
self.deck.deleteTags(self.selectedFacts(), tags) self.deck.deleteTags(self.selectedFacts(), tags)
self.deck.setUndoEnd(n) self.deck.setUndoEnd(n)
self.parent.setProgressParent(None)
self.updateAfterCardChange() self.updateAfterCardChange()
def reschedule(self): def reschedule(self):

View file

@ -33,6 +33,7 @@ class AnkiQt(QMainWindow):
QMainWindow.__init__(self) QMainWindow.__init__(self)
self.errorOccurred = False self.errorOccurred = False
self.inDbHandler = False self.inDbHandler = False
self.reviewingStarted = False
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
qt_mac_set_menubar_icons(False) qt_mac_set_menubar_icons(False)
ankiqt.mw = self ankiqt.mw = self