GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-24 16:56:36 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

display new style formats, but keep old style on DB for now

Browse source
This commit is contained in:
Damien Elmes 2010-11-28 02:02:36 +09:00
parent f8c099ccf7
commit d770008228
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ankiqt/ui/modelproperties.py
View file

@ -274,6 +274,16 @@ class ModelProperties(QDialog):
self.saveCurrentCard() self.saveCurrentCard()
self.readCurrentCard() self.readCurrentCard()
def formatToScreen(self, fmt):
fmt = fmt.replace("<br>", "<br>\n")
fmt = re.sub("%\((.+?)\)s", "{{\\1}}", fmt)
return fmt
def screenToFormat(self, fmt):
fmt = fmt.replace("<br>\n", "<br>")
fmt = re.sub("{{(.+?)}}", "%(\\1)s", fmt)
return fmt
def readCurrentCard(self): def readCurrentCard(self):
if not len(self.m.cardModels): if not len(self.m.cardModels):
self.dialog.cardEditBox.hide() self.dialog.cardEditBox.hide()
@ -289,8 +299,8 @@ class ModelProperties(QDialog):
self.currentCard = self.m.cardModels[self.dialog.cardList.currentRow()] self.currentCard = self.m.cardModels[self.dialog.cardList.currentRow()]
card = self.currentCard card = self.currentCard
self.dialog.cardName.setText(card.name) self.dialog.cardName.setText(card.name)
self.dialog.cardQuestion.setPlainText(card.qformat.replace("<br>", "<br>\n")) self.dialog.cardQuestion.setPlainText(self.formatToScreen(card.qformat))
self.dialog.cardAnswer.setPlainText(card.aformat.replace("<br>", "<br>\n")) self.dialog.cardAnswer.setPlainText(self.formatToScreen(card.aformat))
self.dialog.questionInAnswer.setChecked(card.questionInAnswer) self.dialog.questionInAnswer.setChecked(card.questionInAnswer)
self.dialog.allowEmptyAnswer.setChecked(card.allowEmptyAnswer) self.dialog.allowEmptyAnswer.setChecked(card.allowEmptyAnswer)
self.dialog.typeAnswer.clear() self.dialog.typeAnswer.clear()
@ -335,11 +345,9 @@ order by n""", id=card.id)
newname = _("Card-%d") % (self.m.cardModels.index(card) + 1) newname = _("Card-%d") % (self.m.cardModels.index(card) + 1)
self.updateField(card, 'name', newname) self.updateField(card, 'name', newname)
s = unicode(self.dialog.cardQuestion.toPlainText()) s = unicode(self.dialog.cardQuestion.toPlainText())
s = s.replace("<br>\n", "<br>") changed = self.updateField(card, 'qformat', self.screenToFormat(s))
changed = self.updateField(card, 'qformat', s)
s = unicode(self.dialog.cardAnswer.toPlainText()) s = unicode(self.dialog.cardAnswer.toPlainText())
s = s.replace("<br>\n", "<br>") changed2 = self.updateField(card, 'aformat', self.screenToFormat(s))
changed2 = self.updateField(card, 'aformat', s)
self.needRebuild = self.needRebuild or changed or changed2 self.needRebuild = self.needRebuild or changed or changed2
self.updateField(card, 'questionInAnswer', self.dialog.questionInAnswer.isChecked()) self.updateField(card, 'questionInAnswer', self.dialog.questionInAnswer.isChecked())
self.updateField(card, 'allowEmptyAnswer', self.dialog.allowEmptyAnswer.isChecked()) self.updateField(card, 'allowEmptyAnswer', self.dialog.allowEmptyAnswer.isChecked())