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

Merge pull request #359 from Arthur-Milchior/noDefaultInDeckList2

Browse source 
list of decks contains default iff deck chooser contains default
This commit is contained in:
Damien Elmes 2019-12-06 15:01:15 +10:00 committed by GitHub
commit bceb4feb5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
anki/decks.py
View file

@ -206,16 +206,19 @@ class DeckManager:
self.select(int(list(self.decks.keys())[0]))
self.save()
def allNames(self, dyn=True):
def allNames(self, dyn=True, forceDefault=True):
"An unsorted list of all deck names."
if dyn:
return [x['name'] for x in list(self.decks.values())]
return [x['name'] for x in self.all(forceDefault=forceDefault)]
else:
return [x['name'] for x in list(self.decks.values()) if not x['dyn']]
return [x['name'] for x in self.all(forceDefault=forceDefault) if not x['dyn']]
def all(self):
def all(self, forceDefault=True):
"A list of all decks."
return list(self.decks.values())
decks = list(self.decks.values())
if not forceDefault and not self.col.db.scalar("select 1 from cards where did = 1 limit 1") and len(decks)>1:
decks = [deck for deck in decks if deck['id'] != 1]
return decks
def allIds(self):
return list(self.decks.keys())

2
aqt/studydeck.py
View file

@ -38,7 +38,7 @@ class StudyDeck(QDialog):
if title:
self.setWindowTitle(title)
if not names:
names = sorted(self.mw.col.decks.allNames(dyn=dyn))
names = sorted(self.mw.col.decks.allNames(dyn=dyn, forceDefault=False))
self.nameFunc = None
self.origNames = names
else: