mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
minimum necessary for the (empty) add cards dialog to open
This commit is contained in:
parent
5334fc0978
commit
37b7bb00d6
4 changed files with 15 additions and 13 deletions
|
@ -34,8 +34,8 @@ class DialogManager(object):
|
|||
def __init__(self):
|
||||
from aqt import addcards, cardlist
|
||||
self._dialogs = {
|
||||
"AddCards": (addcards.AddCards, None),
|
||||
"CardList": (cardlist.EditDeck, None),
|
||||
"AddCards": [addcards.AddCards, None],
|
||||
"CardList": [cardlist.EditDeck, None],
|
||||
}
|
||||
|
||||
def open(self, name, *args):
|
||||
|
|
|
@ -12,6 +12,7 @@ from anki.utils import stripHTML, parseTags
|
|||
from aqt.utils import saveGeom, restoreGeom, saveSplitter, restoreSplitter
|
||||
from anki.sound import clearAudioQueue
|
||||
from anki.hooks import addHook, removeHook
|
||||
import aqt.facteditor, aqt.modelchooser
|
||||
|
||||
class FocusButton(QPushButton):
|
||||
def focusInEvent(self, evt):
|
||||
|
@ -25,7 +26,6 @@ class AddCards(QDialog):
|
|||
windParent = None
|
||||
QDialog.__init__(self, windParent, Qt.Window)
|
||||
self.parent = parent
|
||||
ui.utils.applyStyles(self)
|
||||
self.config = parent.config
|
||||
self.dialog = aqt.forms.addcards.Ui_AddCards()
|
||||
self.dialog.setupUi(self)
|
||||
|
@ -42,17 +42,17 @@ class AddCards(QDialog):
|
|||
self.dialog.splitter.setChildrenCollapsible(False)
|
||||
self.show()
|
||||
addHook('guiReset', self.modelChanged)
|
||||
ui.dialogs.open("AddCards", self)
|
||||
|
||||
def setupEditor(self):
|
||||
self.editor = ui.facteditor.FactEditor(self,
|
||||
self.editor = aqt.facteditor.FactEditor(self,
|
||||
self.dialog.fieldsArea,
|
||||
self.parent.deck)
|
||||
self.editor.addMode = True
|
||||
self.editor.resetOnEdit = False
|
||||
|
||||
def addChooser(self):
|
||||
self.modelChooser = ui.modelchooser.ModelChooser(self,
|
||||
return
|
||||
self.modelChooser = aqt.modelchooser.ModelChooser(self,
|
||||
self.parent,
|
||||
self.parent.deck,
|
||||
self.modelChanged)
|
||||
|
@ -100,6 +100,7 @@ class AddCards(QDialog):
|
|||
browser.onFact()
|
||||
|
||||
def modelChanged(self, model=None):
|
||||
return
|
||||
oldFact = self.editor.fact
|
||||
# create a new fact
|
||||
fact = self.parent.deck.newFact()
|
||||
|
@ -114,7 +115,7 @@ class AddCards(QDialog):
|
|||
n += 1
|
||||
fact.tags = oldFact.tags
|
||||
else:
|
||||
fact.tags = self.parent.deck.lastTags
|
||||
fact.tags = "last" #self.parent.deck.lastTags
|
||||
# set the new fact
|
||||
self.editor.setFact(fact, check=True, forceRedraw=True)
|
||||
self.setTabOrder(self.editor.tags, self.addButton)
|
||||
|
|
|
@ -41,7 +41,7 @@ class FactEditor(object):
|
|||
self.fact = None
|
||||
self.fontChanged = False
|
||||
self.addMode = False
|
||||
self.setupFields()
|
||||
#self.setupFields()
|
||||
self.onChange = None
|
||||
self.onFactValid = None
|
||||
self.onFactInvalid = None
|
||||
|
@ -62,6 +62,7 @@ class FactEditor(object):
|
|||
def setFact(self, fact, noFocus=False, check=False, scroll=False,
|
||||
forceRedraw=False):
|
||||
"Make FACT the current fact."
|
||||
return
|
||||
self.fact = fact
|
||||
self.factState = None
|
||||
if self.changeTimer:
|
||||
|
@ -419,9 +420,10 @@ class FactEditor(object):
|
|||
self.parent.setTabOrder(last, self.tags)
|
||||
|
||||
def needToRedraw(self):
|
||||
return True
|
||||
if self.fact is None:
|
||||
return True
|
||||
if len(self.fact.fields) != len(self.fields):
|
||||
if len(self.fact._fields) != len(self.fields):
|
||||
return True
|
||||
for field in self.fact.fields:
|
||||
if field.name not in self.fields:
|
||||
|
|
|
@ -7,7 +7,6 @@ from operator import attrgetter
|
|||
import anki, sys
|
||||
from anki import stdmodels
|
||||
from anki.models import *
|
||||
from aqt import ui
|
||||
import aqt.forms
|
||||
from anki.hooks import addHook, removeHook
|
||||
|
||||
|
@ -70,7 +69,7 @@ class ModelChooser(QHBoxLayout):
|
|||
|
||||
def onEdit(self):
|
||||
ui.deckproperties.DeckProperties(self.parent, self.deck,
|
||||
onFinish=self.onModelEdited)
|
||||
onFinish=self.onModelEdited)
|
||||
|
||||
def onModelEdited(self):
|
||||
# hack
|
||||
|
@ -93,10 +92,10 @@ class ModelChooser(QHBoxLayout):
|
|||
|
||||
def drawModels(self):
|
||||
self.models.clear()
|
||||
self._models = sorted(self.deck.models, key=attrgetter("name"))
|
||||
self._models = sorted(self.deck.models().values(), key=attrgetter("name"))
|
||||
self.models.addItems(QStringList(
|
||||
[m.name for m in self._models]))
|
||||
idx = self._models.index(self.deck.currentModel)
|
||||
idx = self._models.index(self.deck.currentModel())
|
||||
self.models.setCurrentIndex(idx)
|
||||
|
||||
def drawCardModels(self):
|
||||
|
|
Loading…
Reference in a new issue