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

move card type deletion back to X on card tabs

Browse Source
This commit is contained in:
Damien Elmes 2013-04-11 14:02:01 +09:00
parent e8e1bd9550
commit c437a38446
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
anki/models.py
View File

@ -196,6 +196,11 @@ select id from cards where nid in (select id from notes where mid = ?)""",
return self.col.db.scalar( return self.col.db.scalar(
"select count() from notes where mid = ?", m['id']) "select count() from notes where mid = ?", m['id'])
def tmplUseCount(self, m, ord):
return self.col.db.scalar("""
select count() from cards, notes where cards.nid = notes.id
and notes.mid = ? and cards.ord = ?""", m['id'], ord)
# Copying # Copying
################################################## ##################################################

14
aqt/clayout.py
View File

@ -58,6 +58,7 @@ class CardLayout(QDialog):
c = self.connect c = self.connect
cloze = self.model['type'] == MODEL_CLOZE cloze = self.model['type'] == MODEL_CLOZE
self.tabs = QTabWidget() self.tabs = QTabWidget()
self.tabs.setTabsClosable(not cloze)
self.tabs.setUsesScrollButtons(True) self.tabs.setUsesScrollButtons(True)
if not cloze: if not cloze:
add = QPushButton("+") add = QPushButton("+")
@ -66,6 +67,7 @@ class CardLayout(QDialog):
c(add, SIGNAL("clicked()"), self.onAddCard) c(add, SIGNAL("clicked()"), self.onAddCard)
self.tabs.setCornerWidget(add) self.tabs.setCornerWidget(add)
c(self.tabs, SIGNAL("currentChanged(int)"), self.selectCard) c(self.tabs, SIGNAL("currentChanged(int)"), self.selectCard)
c(self.tabs, SIGNAL("tabCloseRequested(int)"), self.onRemoveTab)
def updateTabs(self): def updateTabs(self):
self.forms = [] self.forms = []
@ -127,8 +129,12 @@ class CardLayout(QDialog):
def onRemoveTab(self, idx): def onRemoveTab(self, idx):
if len(self.model['tmpls']) < 2: if len(self.model['tmpls']) < 2:
return showInfo(_("At least one card is required.")) return showInfo(_("At least one card type is required."))
if not askUser(_("Remove all cards of this type?")): cards = self.mm.tmplUseCount(self.model, idx)
cards = ngettext("%d card", "%d cards", cards) % cards
msg = _("Delete the '%s' card type, and its %s?" %
(self.model['tmpls'][idx]['name'], cards))
if not askUser(msg):
return return
if not self.mm.remTemplate(self.model, self.cards[idx].template()): if not self.mm.remTemplate(self.model, self.cards[idx].template()):
return showWarning(_("""\ return showWarning(_("""\
@ -320,10 +326,6 @@ adjust the template manually to switch the question and answer."""))
a = m.addAction(_("Browser Appearance")) a = m.addAction(_("Browser Appearance"))
a.connect(a, SIGNAL("triggered()"), a.connect(a, SIGNAL("triggered()"),
self.onBrowserDisplay) self.onBrowserDisplay)
if self.model['type'] != MODEL_CLOZE:
a = m.addAction(_("Delete"))
a.connect(a, SIGNAL("triggered()"),
lambda: self.onRemoveTab(self.tabs.currentIndex()))
m.exec_(button.mapToGlobal(QPoint(0,0))) m.exec_(button.mapToGlobal(QPoint(0,0)))
def onBrowserDisplay(self): def onBrowserDisplay(self):