GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 22:42:25 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

revert deck combobox change

Browse source 
This commit reverts c1a16452d6
This commit is contained in:
Damien Elmes 2012-04-19 03:44:02 +09:00
parent 2ab4667a73
commit d6a949bc49
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
aqt/editor.py
View file

@ -598,11 +598,9 @@ class Editor(object):
if self.addMode: if self.addMode:
l = QLabel(_("Deck")) l = QLabel(_("Deck"))
tb.addWidget(l, 0, 0) tb.addWidget(l, 0, 0)
self.deck = QComboBox() self.deck = aqt.tagedit.TagEdit(self.widget, type=1)
self.deck.connect(self.deck, SIGNAL("lostFocus"), self.deck.connect(self.deck, SIGNAL("lostFocus"),
self.saveTagsAndDeck) self.saveTagsAndDeck)
self.deck.setEditable(True)
self.deck.addItems(sorted(self.mw.col.decks.allNames()))
tb.addWidget(self.deck, 0, 1) tb.addWidget(self.deck, 0, 1)
else: else:
self.deck = None self.deck = None
@ -619,13 +617,10 @@ class Editor(object):
def updateTagsAndDeck(self): def updateTagsAndDeck(self):
if self.tags.col != self.mw.col: if self.tags.col != self.mw.col:
if self.deck: if self.deck:
self.deck.clear() self.deck.setCol(self.mw.col)
self.deck.addItems(sorted(self.mw.col.decks.allNames()))
self.tags.setCol(self.mw.col) self.tags.setCol(self.mw.col)
if self.addMode: if self.addMode:
self.deck.lineEdit().setText( self.deck.setText(self.mw.col.decks.name(self.note.model()['did']))
self.mw.col.decks.name(
self.note.model()['did'], default=True))
self.tags.setText(self.note.stringTags().strip()) self.tags.setText(self.note.stringTags().strip())
def saveTagsAndDeck(self): def saveTagsAndDeck(self):
@ -633,7 +628,7 @@ class Editor(object):
return return
self.note.tags = self.mw.col.tags.split(self.tags.text()) self.note.tags = self.mw.col.tags.split(self.tags.text())
if self.addMode: if self.addMode:
name = self.deck.lineEdit().text() name = self.deck.text()
if not name.strip(): if not name.strip():
self.note.model()['did'] = 1 self.note.model()['did'] = 1
else: else:
@ -648,6 +643,8 @@ class Editor(object):
def hideCompleters(self): def hideCompleters(self):
self.tags.hideCompleter() self.tags.hideCompleter()
if self.addMode:
self.deck.hideCompleter()
# Format buttons # Format buttons
###################################################################### ######################################################################