GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 15:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Susanna Björverud 2009-04-17 18:53:58 +02:00
commit 60baf9efd8
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ankiqt/ui/cardlist.py
View file

@ -123,10 +123,20 @@ class DeckModel(QAbstractTableModel):
sort = "" sort = ""
if isinstance(self.sortKey, types.StringType): if isinstance(self.sortKey, types.StringType):
# card property # card property
if self.sortKey == "fact":
sort = "order by facts.created, cards.created"
else:
sort = "order by cards." + self.sortKey sort = "order by cards." + self.sortKey
if self.sortKey in ("question", "answer"): if self.sortKey in ("question", "answer"):
sort += " collate nocase" sort += " collate nocase"
query = ("select id from cards ") if self.sortKey == "fact":
query = """
select cards.id from cards, facts
where cards.factId = facts.id """
if ads:
query += ads + " "
else:
query = "select id from cards "
if ads: if ads:
query += "where %s " % ads query += "where %s " % ads
query += sort query += sort
@ -345,7 +355,8 @@ class EditDeck(QMainWindow):
self.dialog.tagList.setFixedWidth(130) self.dialog.tagList.setFixedWidth(130)
self.dialog.tagList.clear() self.dialog.tagList.clear()
self.dialog.tagList.addItems(QStringList( self.dialog.tagList.addItems(QStringList(
[_('<Tag filter>'), _('No tags')] + self.alltags)) [_('<Tag filter>'), _('No tags')] +
[x.replace("_", " ") for x in self.alltags]))
self.dialog.tagList.view().setFixedWidth(200) self.dialog.tagList.view().setFixedWidth(200)
def drawSort(self): def drawSort(self):
@ -358,6 +369,7 @@ class EditDeck(QMainWindow):
_("Interval"), _("Interval"),
_("Reps"), _("Reps"),
_("Ease"), _("Ease"),
_("Fact Created"),
] ]
self.sortFields = sorted(self.deck.allFields()) self.sortFields = sorted(self.deck.allFields())
self.sortList.extend([_("'%s'") % f for f in self.sortFields]) self.sortList.extend([_("'%s'") % f for f in self.sortFields])
@ -384,8 +396,10 @@ class EditDeck(QMainWindow):
self.sortKey = "reps" self.sortKey = "reps"
elif idx == 7: elif idx == 7:
self.sortKey = "factor" self.sortKey = "factor"
elif idx == 8:
self.sortKey = "fact"
else: else:
self.sortKey = ("field", self.sortFields[idx-8]) self.sortKey = ("field", self.sortFields[idx-9])
self.rebuildSortIndex(self.sortKey) self.rebuildSortIndex(self.sortKey)
self.sortIndex = idx self.sortIndex = idx
self.deck.setVar('sortIndex', idx) self.deck.setVar('sortIndex', idx)

1
ankiqt/ui/status.py
View file

@ -70,6 +70,7 @@ class StatusView(object):
self.sep1.setShown(shown) self.sep1.setShown(shown)
self.sep2.setShown(shown) self.sep2.setShown(shown)
self.sep3.setShown(shown) self.sep3.setShown(shown)
self.statusbar.hideOrShow()
# Setup and teardown # Setup and teardown
########################################################################## ##########################################################################