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

add new css field to clayout

Browse source
This commit is contained in:
Damien Elmes 2011-12-17 17:25:31 +09:00
parent 72a01c0b90
commit 1b3e956d5f
5 changed files with 175 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
aqt/clayout.py
View file

@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-
# Copyright: Damien Elmes <anki@ichi2.net> # Copyright: Damien Elmes <anki@ichi2.net>
# License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html # License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
@ -73,7 +74,12 @@ class CardLayout(QDialog):
# template area # template area
tform = aqt.forms.template.Ui_Form() tform = aqt.forms.template.Ui_Form()
tform.setupUi(left) tform.setupUi(left)
tform.label1.setText(u" →")
tform.label2.setText(u" →")
tform.labelc1.setText(u" ↗")
tform.labelc2.setText(u" ↘")
c(tform.front, SIGNAL("textChanged()"), self.saveCard) c(tform.front, SIGNAL("textChanged()"), self.saveCard)
c(tform.css, SIGNAL("textChanged()"), self.saveCard)
c(tform.back, SIGNAL("textChanged()"), self.saveCard) c(tform.back, SIGNAL("textChanged()"), self.saveCard)
l.addWidget(left, 5) l.addWidget(left, 5)
# preview area # preview area
@ -144,6 +150,7 @@ Please create a new card first."""))
t = self.card.template() t = self.card.template()
self.redrawing = True self.redrawing = True
self.tab['tform'].front.setPlainText(t['qfmt']) self.tab['tform'].front.setPlainText(t['qfmt'])
self.tab['tform'].css.setPlainText(t['css'])
self.tab['tform'].back.setPlainText(t['afmt']) self.tab['tform'].back.setPlainText(t['afmt'])
self.redrawing = False self.redrawing = False
@ -152,6 +159,8 @@ Please create a new card first."""))
return return
text = self.tab['tform'].front.toPlainText() text = self.tab['tform'].front.toPlainText()
self.card.template()['qfmt'] = text self.card.template()['qfmt'] = text
text = self.tab['tform'].css.toPlainText()
self.card.template()['css'] = text
text = self.tab['tform'].back.toPlainText() text = self.tab['tform'].back.toPlainText()
self.card.template()['afmt'] = text self.card.template()['afmt'] = text
self.renderPreview() self.renderPreview()
@ -161,15 +170,14 @@ Please create a new card first."""))
def renderPreview(self): def renderPreview(self):
c = self.card c = self.card
styles = "\n.cloze { font-weight: bold; color: blue; }"
html = '''<html><head>%s</head><body class=card> html = '''<html><head>%s</head><body class=card>
<style>%s</style>%s</body></html>''' <style>%s</style>%s</body></html>'''
ti = self.maybeTextInput ti = self.maybeTextInput
base = getBase(self.mw.col) base = getBase(self.mw.col)
self.tab['pform'].front.setHtml( self.tab['pform'].front.setHtml(
html % (base, styles, ti(mungeQA(c.q(reload=True))))) html % (base, "", ti(mungeQA(c.q(reload=True)))))
self.tab['pform'].back.setHtml( self.tab['pform'].back.setHtml(
html % (base, styles, ti(mungeQA(c.a()), 'a'))) html % (base, "", ti(mungeQA(c.a()), 'a')))
def maybeTextInput(self, txt, type='q'): def maybeTextInput(self, txt, type='q'):
if type == 'q': if type == 'q':

3
aqt/editor.py
View file

@ -564,7 +564,7 @@ class Editor(object):
def onCloze(self): def onCloze(self):
# check that the model is set up for cloze deletion # check that the model is set up for cloze deletion
if 'cloze' not in self.note.model()['tmpls'][0]['qfmt']: if 'cloze' not in self.note.model()['tmpls'][0]['qfmt']:
showInfo(_("Please select the cloze deletion note type first."), showInfo(_("Cloze deletion requires a Cloze note type."),
help="ClozeDeletion") help="ClozeDeletion")
return return
f = self.note.fields[self.currentField] f = self.note.fields[self.currentField]
@ -643,6 +643,7 @@ class Editor(object):
spc = QSpacerItem(5,10, QSizePolicy.Fixed) spc = QSpacerItem(5,10, QSizePolicy.Fixed)
g.addItem(spc, n+1, 0) g.addItem(spc, n+1, 0)
cb = QPushButton(_("+")) cb = QPushButton(_("+"))
cb.setShortcut(QKeySequence("F5"))
cb.connect(cb, SIGNAL("clicked()"), self.onNewColour) cb.connect(cb, SIGNAL("clicked()"), self.onNewColour)
cb.setFixedWidth(80) cb.setFixedWidth(80)
cb.setFixedHeight(16) cb.setFixedHeight(16)

3
aqt/reviewer.py
View file

@ -90,7 +90,7 @@ function _updateQA (q, answerMode) {
typeans.focus(); typeans.focus();
} }
if (answerMode) { if (answerMode) {
window.location = "#answerStart"; window.location = "#answer";
} }
}; };
function _getTypedText () { function _getTypedText () {
@ -213,7 +213,6 @@ function _typeAnsPress() {
_css = """ _css = """
hr { background-color:#ccc; margin: 1em; } hr { background-color:#ccc; margin: 1em; }
body { margin:1.5em; } body { margin:1.5em; }
.cloze { font-weight: bold; color: blue; }
img { max-width: 95%; max-height: 95%; } img { max-width: 95%; max-height: 95%; }
""" """

2
designer/addmodel.ui
View file

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Add Model</string> <string>Add Note Type</string>
</property> </property>
<layout class="QVBoxLayout"> <layout class="QVBoxLayout">
<item> <item>

192
designer/template.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>279</width> <width>470</width>
<height>251</height> <height>569</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,45 +19,173 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_5">
<property name="spacing">
<number>0</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="title"> <property name="spacing">
<string>Front Template</string> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <item>
<property name="margin"> <widget class="QGroupBox" name="groupBox">
<number>0</number> <property name="title">
</property> <string>Front Template</string>
<item> </property>
<widget class="QTextEdit" name="front"/> <layout class="QVBoxLayout" name="verticalLayout_2">
</item> <property name="spacing">
</layout> <number>0</number>
</widget> </property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="front"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="label1">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="groupBox_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizePolicy"> <property name="spacing">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <number>0</number>
<horstretch>10</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="title"> <item>
<string>Back Template</string> <widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Appearance</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="css"/>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>15</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelc1">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="labelc2">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>1</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <item>
<property name="margin"> <widget class="QGroupBox" name="groupBox_2">
<number>0</number> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<item> <horstretch>10</horstretch>
<widget class="QTextEdit" name="back"/> <verstretch>0</verstretch>
</item> </sizepolicy>
</layout> </property>
</widget> <property name="title">
<string>Back Template</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QTextEdit" name="back"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QLabel" name="label2">
<property name="text">
<string/>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>