Merge git://github.com/timo/ankiqt

This commit is contained in:
Damien Elmes 2008-12-09 01:37:40 +09:00
commit 626ad9f813
4 changed files with 2127 additions and 2 deletions

File diff suppressed because it is too large Load diff

View file

@ -4,7 +4,7 @@
from PyQt4.QtGui import * from PyQt4.QtGui import *
from PyQt4.QtCore import * from PyQt4.QtCore import *
import ankiqt import ankiqt
from anki.utils import parseTags, joinTags from anki.utils import parseTags, joinTags, canonifyTags
from ankiqt.ui.utils import saveGeom, restoreGeom from ankiqt.ui.utils import saveGeom, restoreGeom
class ActiveTagsChooser(QDialog): class ActiveTagsChooser(QDialog):
@ -45,7 +45,7 @@ class ActiveTagsChooser(QDialog):
if self.dialog.list.selectionModel().isSelected(idx): if self.dialog.list.selectionModel().isSelected(idx):
suspended.append(self.tags[n]) suspended.append(self.tags[n])
n += 1 n += 1
self.parent.deck.suspended = joinTags(suspended + ["Suspended"]) self.parent.deck.suspended = canonifyTags(joinTags(suspended + ["Suspended"]))
self.parent.deck.setModified() self.parent.deck.setModified()
self.parent.reset() self.parent.reset()
saveGeom(self, "activeTags") saveGeom(self, "activeTags")

View file

@ -1406,6 +1406,7 @@ Error was:\n%(f1)s\n...\n%(f2)s""") % {'f1': fmt1, 'f2': fmt2})
self.maybeShowLookup(False) self.maybeShowLookup(False)
self.maybeShowKanjiStats() self.maybeShowKanjiStats()
self.mainWin.actionEditCurrent.setEnabled(False) self.mainWin.actionEditCurrent.setEnabled(False)
self.mainWin.actionMarkCard.setEnabled(False)
self.mainWin.menuCurrent.setEnabled(False) self.mainWin.menuCurrent.setEnabled(False)
def enableCardMenuItems(self): def enableCardMenuItems(self):
@ -1417,6 +1418,7 @@ Error was:\n%(f1)s\n...\n%(f2)s""") % {'f1': fmt1, 'f2': fmt2})
self.state != "getQuestion")) self.state != "getQuestion"))
self.mainWin.actionRepeatAudio.setEnabled(snd) self.mainWin.actionRepeatAudio.setEnabled(snd)
self.mainWin.actionEditCurrent.setEnabled(True) self.mainWin.actionEditCurrent.setEnabled(True)
self.mainWin.actionMarkCard.setEnabled(True)
self.mainWin.menuCurrent.setEnabled(True) self.mainWin.menuCurrent.setEnabled(True)
def maybeShowKanjiStats(self): def maybeShowKanjiStats(self):

View file

@ -32,6 +32,7 @@ class Preferences(QDialog):
(_("German"), "de_DE"), (_("German"), "de_DE"),
(_("Japanese"), "ja_JP"), (_("Japanese"), "ja_JP"),
(_("Korean"), "ko_KR"), (_("Korean"), "ko_KR"),
(_("Finnish"), "fi_FI"),
(_("Spanish"), "es_ES"), (_("Spanish"), "es_ES"),
(_("Italian"), "it_IT"), (_("Italian"), "it_IT"),
] ]