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

add whitespace preservation flag; only show active card models when previewing

Browse source
This commit is contained in:
Damien Elmes 2010-11-30 03:28:08 +09:00
parent a5af8fb8e9
commit ae388595da
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
anki/deck.py
View file

@ -1533,7 +1533,7 @@ where facts.id not in (select distinct factId from cards)""")
def previewFact(self, oldFact): def previewFact(self, oldFact):
"Duplicate fact and generate cards for preview. Don't add to deck." "Duplicate fact and generate cards for preview. Don't add to deck."
# check we have card models available # check we have card models available
cms = self.availableCardModels(oldFact, checkActive=False) cms = self.availableCardModels(oldFact, checkActive=True)
if not cms: if not cms:
return [] return []
fact = self.cloneFact(oldFact) fact = self.cloneFact(oldFact)
@ -1642,13 +1642,15 @@ facts.id = cards.factId""", id=model.id))
def rebuildCSS(self): def rebuildCSS(self):
# css for all fields # css for all fields
def _genCSS(prefix, row): def _genCSS(prefix, row):
(id, fam, siz, col, align, rtl) = row (id, fam, siz, col, align, rtl, pre) = row
t = "" t = ""
if fam: t += 'font-family:"%s";' % toPlatformFont(fam) if fam: t += 'font-family:"%s";' % toPlatformFont(fam)
if siz: t += 'font-size:%dpx;' % siz if siz: t += 'font-size:%dpx;' % siz
if col: t += 'color:%s;' % col if col: t += 'color:%s;' % col
if rtl == "rtl": if rtl == "rtl":
t += "direction:rtl;unicode-bidi:embed;" t += "direction:rtl;unicode-bidi:embed;"
if pre:
t += "white-space:pre-wrap;"
if align != -1: if align != -1:
if align == 0: align = "center" if align == 0: align = "center"
elif align == 1: align = "left" elif align == 1: align = "left"
@ -1658,9 +1660,10 @@ facts.id = cards.factId""", id=model.id))
t = "%s%s {%s}\n" % (prefix, hexifyID(id), t) t = "%s%s {%s}\n" % (prefix, hexifyID(id), t)
return t return t
css = "".join([_genCSS(".fm", row) for row in self.s.all(""" css = "".join([_genCSS(".fm", row) for row in self.s.all("""
select id, quizFontFamily, quizFontSize, quizFontColour, -1, features from fieldModels""")]) select id, quizFontFamily, quizFontSize, quizFontColour, -1,
features, editFontFamily from fieldModels""")])
cardRows = self.s.all(""" cardRows = self.s.all("""
select id, null, null, null, questionAlign, 0 from cardModels""") select id, null, null, null, questionAlign, 0, 0 from cardModels""")
css += "".join([_genCSS("#cmq", row) for row in cardRows]) css += "".join([_genCSS("#cmq", row) for row in cardRows])
css += "".join([_genCSS("#cma", row) for row in cardRows]) css += "".join([_genCSS("#cma", row) for row in cardRows])
css += "".join([".cmb%s {background:%s;}\n" % css += "".join([".cmb%s {background:%s;}\n" %

4
anki/models.py
View file

@ -47,9 +47,9 @@ fieldModelsTable = Table(
Column('numeric', Boolean, nullable=False, default=False), Column('numeric', Boolean, nullable=False, default=False),
# display # display
Column('quizFontFamily', UnicodeText), Column('quizFontFamily', UnicodeText),
Column('quizFontSize', Integer), Column('quizFontSize', Integer, default=20),
Column('quizFontColour', String(7)), Column('quizFontColour', String(7)),
Column('editFontFamily', UnicodeText), # unused Column('editFontFamily', Boolean, default=True), # reused as <pre> toggle
Column('editFontSize', Integer, default=20)) Column('editFontSize', Integer, default=20))
class FieldModel(object): class FieldModel(object):