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

background colour per card, tweak ans buttons

Browse source
This commit is contained in:
Damien Elmes 2009-01-31 02:21:08 +09:00
parent 85cd67fab4
commit 4945313bfa
5 changed files with 257 additions and 96 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ankiqt/ui/displayproperties.py
View file

@ -68,7 +68,7 @@ class DisplayProperties(QDialog):
self.main.config['showFontPreview'] = True self.main.config['showFontPreview'] = True
else: else:
self.dialog.previewGroup.hide() self.dialog.previewGroup.hide()
self.setFixedWidth(340) self.setFixedWidth(380)
self.main.config['showFontPreview'] = False self.main.config['showFontPreview'] = False
def setupCards(self): def setupCards(self):
@ -86,10 +86,18 @@ class DisplayProperties(QDialog):
w.setStyle(self.plastiqueStyle) w.setStyle(self.plastiqueStyle)
self.connect(w, self.connect(w,
SIGNAL("clicked()"), SIGNAL("clicked()"),
lambda w=w, t=type: self.chooseColour(w, t)) lambda w=w: self.chooseColour(w))
self.connect(self.cwidget("Align", type), self.connect(self.cwidget("Align", type),
SIGNAL("activated(int)"), SIGNAL("activated(int)"),
self.saveCard) self.saveCard)
# background colour
self.connect(self.dialog.backgroundColour,
SIGNAL("clicked()"),
lambda w=self.dialog.backgroundColour:\
self.chooseColour(w))
if self.plastiqueStyle:
self.dialog.backgroundColour.setStyle(self.plastiqueStyle)
self.drawCards() self.drawCards()
def drawCards(self): def drawCards(self):
@ -119,6 +127,8 @@ class DisplayProperties(QDialog):
getattr(card, type + "FontColour")))) getattr(card, type + "FontColour"))))
self.cwidget("Align", type).setCurrentIndex( self.cwidget("Align", type).setCurrentIndex(
getattr(card, type + "Align")) getattr(card, type + "Align"))
self.dialog.backgroundColour.setPalette(QPalette(QColor(
getattr(card, "lastFontColour"))))
self.card = card self.card = card
def saveCard(self): def saveCard(self):
@ -136,6 +146,8 @@ class DisplayProperties(QDialog):
setattr(self.card, type + "FontColour", unicode(c.name())) setattr(self.card, type + "FontColour", unicode(c.name()))
self.card.model.setModified() self.card.model.setModified()
self.deck.setModified() self.deck.setModified()
setattr(self.card, "lastFontColour", unicode(
self.dialog.backgroundColour.palette().window().color().name()))
self.drawQuestionAndAnswer() self.drawQuestionAndAnswer()
def cwidget(self, name, type): def cwidget(self, name, type):
@ -167,7 +179,7 @@ class DisplayProperties(QDialog):
w.setStyle(self.plastiqueStyle) w.setStyle(self.plastiqueStyle)
self.connect(w, self.connect(w,
SIGNAL("clicked()"), SIGNAL("clicked()"),
lambda w=w, t=type: self.chooseColour(w, t)) lambda w=w: self.chooseColour(w))
self.currentField = None self.currentField = None
self.drawFields() self.drawFields()
@ -260,7 +272,7 @@ class DisplayProperties(QDialog):
self.deck.flushMod() self.deck.flushMod()
self.drawQuestionAndAnswer() self.drawQuestionAndAnswer()
def chooseColour(self, button, type): def chooseColour(self, button):
new = QColorDialog.getColor(button.palette().window().color(), self) new = QColorDialog.getColor(button.palette().window().color(), self)
if new.isValid(): if new.isValid():
button.setPalette(QPalette(new)) button.setPalette(QPalette(new))
@ -275,14 +287,16 @@ class DisplayProperties(QDialog):
f[field.name] = field.name f[field.name] = field.name
f.model = self.model f.model = self.model
c = Card(f, self.card) c = Card(f, self.card)
t = "<br><center>" + c.htmlQuestion() + "</center>" t = "<body><br><center>" + c.htmlQuestion() + "</center></body>"
bg = "body { background-color: %s; }\n" % self.card.lastFontColour
self.dialog.question.setText( self.dialog.question.setText(
"<style>\n" + self.deck.rebuildCSS() + "</style>\n" + t) "<style>\n" + bg + self.deck.rebuildCSS() + "</style>\n" + t)
t = "<br><center>" + c.htmlAnswer() + "</center>" t = "<body><br><center>" + c.htmlAnswer() + "</center></body>"
self.dialog.answer.setText( self.dialog.answer.setText(
"<style>\n" + self.deck.rebuildCSS() + "</style>\n" + t) "<style>\n" + bg + self.deck.rebuildCSS() + "</style>\n" + t)
self.main.updateViews(self.main.state) self.main.updateViews(self.main.state)
def reject(self): def reject(self):
ui.dialogs.close("DisplayProperties") ui.dialogs.close("DisplayProperties")
QDialog.reject(self) QDialog.reject(self)

5
ankiqt/ui/main.py
View file

@ -437,12 +437,7 @@ new:
########################################################################## ##########################################################################
def setupButtons(self): def setupButtons(self):
if sys.platform.startswith("darwin"):
self.easeButtonHeight = 35
else:
self.easeButtonHeight = 25
# ask # ask
self.mainWin.showAnswerButton.setFixedHeight(self.easeButtonHeight)
self.connect(self.mainWin.showAnswerButton, SIGNAL("clicked()"), self.connect(self.mainWin.showAnswerButton, SIGNAL("clicked()"),
lambda: self.moveToState("showAnswer")) lambda: self.moveToState("showAnswer"))
# answer # answer

9
ankiqt/ui/view.py
View file

@ -64,10 +64,12 @@ class View(object):
if self.haveTop: if self.haveTop:
self.drawTopSection() self.drawTopSection()
if self.state == "showQuestion": if self.state == "showQuestion":
self.setBackground()
self.drawQuestion() self.drawQuestion()
if self.drawRule: if self.drawRule:
self.write("<hr>") self.write("<hr>")
elif self.state == "showAnswer": elif self.state == "showAnswer":
self.setBackground()
if not self.main.currentCard.cardModel.questionInAnswer: if not self.main.currentCard.cardModel.questionInAnswer:
self.drawQuestion(nosound=True) self.drawQuestion(nosound=True)
if self.drawRule: if self.drawRule:
@ -92,6 +94,10 @@ class View(object):
self.body.setHtml("") self.body.setHtml("")
self.buffer = "" self.buffer = ""
def setBackground(self):
col = self.main.currentCard.cardModel.lastFontColour
self.write("<style>html { background: %s;}</style>" % col)
# Font properties & output # Font properties & output
########################################################################## ##########################################################################
@ -157,7 +163,6 @@ class View(object):
ret += ("<span style='%s'>%s</span>" % (bad, " " * (j2 - j1))) ret += ("<span style='%s'>%s</span>" % (bad, " " * (j2 - j1)))
return ret return ret
def drawAnswer(self): def drawAnswer(self):
"Show the answer." "Show the answer."
a = self.main.currentCard.htmlAnswer() a = self.main.currentCard.htmlAnswer()
@ -242,7 +247,7 @@ class View(object):
########################################################################## ##########################################################################
def drawWelcomeMessage(self): def drawWelcomeMessage(self):
self.main.mainWin.welcomeText.setText(_(""" self.main.mainWin.welcomeText.setText(_("""\
<h1>Welcome to Anki!</h1> <h1>Welcome to Anki!</h1>
<p> <p>
<table> <table>

67
designer/displayproperties.ui
View file

@ -5,8 +5,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>763</width> <width>818</width>
<height>399</height> <height>427</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -45,6 +45,18 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" >
<size>
<width>360</width>
<height>0</height>
</size>
</property>
<property name="maximumSize" >
<size>
<width>360</width>
<height>16777215</height>
</size>
</property>
<property name="frameShape" > <property name="frameShape" >
<enum>QFrame::NoFrame</enum> <enum>QFrame::NoFrame</enum>
</property> </property>
@ -84,7 +96,7 @@
<item> <item>
<widget class="QTabWidget" name="tabWidget" > <widget class="QTabWidget" name="tabWidget" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -97,8 +109,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>297</width> <width>348</width>
<height>289</height> <height>317</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -250,20 +262,37 @@
</widget> </widget>
</item> </item>
<item row="8" column="0" > <item row="8" column="0" >
<spacer name="verticalSpacer" > <widget class="QLabel" name="label_5" >
<property name="orientation" > <property name="text" >
<enum>Qt::Vertical</enum> <string>Background colour</string>
</property> </property>
<property name="sizeHint" stdset="0" > </widget>
<size> </item>
<width>20</width> <item row="8" column="1" >
<height>40</height> <widget class="QPushButton" name="backgroundColour" >
</size> <property name="text" >
<string/>
</property> </property>
</spacer> <property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<spacer name="verticalSpacer" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2" > <widget class="QWidget" name="tab_2" >
@ -271,8 +300,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>297</width> <width>960</width>
<height>289</height> <height>480</height>
</rect> </rect>
</property> </property>
<attribute name="title" > <attribute name="title" >
@ -558,12 +587,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="minimumSize" >
<size>
<width>400</width>
<height>0</height>
</size>
</property>
<property name="readOnly" > <property name="readOnly" >
<bool>true</bool> <bool>true</bool>
</property> </property>

234
designer/main.ui
View file

@ -6,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>699</width> <width>699</width>
<height>433</height> <height>446</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy" >
@ -23,6 +23,14 @@
<normaloff>:/icons/anki.png</normaloff>:/icons/anki.png</iconset> <normaloff>:/icons/anki.png</normaloff>:/icons/anki.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget" > <widget class="QWidget" name="centralwidget" >
<property name="geometry" >
<rect>
<x>0</x>
<y>69</y>
<width>699</width>
<height>357</height>
</rect>
</property>
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>1</horstretch> <horstretch>1</horstretch>
@ -115,43 +123,44 @@
<enum>QFrame::Raised</enum> <enum>QFrame::Raised</enum>
</property> </property>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="gridLayout" >
<property name="leftMargin" > <property name="margin" >
<number>4</number>
</property>
<property name="topMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="rightMargin" >
<number>4</number>
</property>
<property name="bottomMargin" >
<number>6</number>
</property>
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QStackedWidget" name="buttonStack" > <widget class="QStackedWidget" name="buttonStack" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>1</verstretch>
</sizepolicy>
</property>
<property name="currentIndex" > <property name="currentIndex" >
<number>5</number> <number>5</number>
</property> </property>
<widget class="QWidget" name="page1" > <widget class="QWidget" name="page1" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>59</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QVBoxLayout" name="verticalLayout" >
<item> <property name="margin" >
<spacer name="verticalSpacer" > <number>4</number>
<property name="orientation" > </property>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>1</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QPushButton" name="showAnswerButton" > <widget class="QPushButton" name="showAnswerButton" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Minimum" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" > <property name="minimumSize" >
<size> <size>
<width>0</width> <width>0</width>
@ -169,27 +178,29 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page2" > <widget class="QWidget" name="page2" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>53</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3" > <layout class="QVBoxLayout" name="verticalLayout_3" >
<property name="spacing" >
<number>0</number>
</property>
<property name="leftMargin" > <property name="leftMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="topMargin" > <property name="topMargin" >
<number>0</number> <number>4</number>
</property> </property>
<property name="rightMargin" > <property name="rightMargin" >
<number>0</number> <number>0</number>
</property> </property>
<property name="bottomMargin" > <property name="bottomMargin" >
<number>6</number> <number>4</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" > <layout class="QHBoxLayout" name="horizontalLayout" >
<property name="spacing" >
<number>0</number>
</property>
<item> <item>
<spacer name="horizontalSpacer" > <spacer name="horizontalSpacer" >
<property name="orientation" > <property name="orientation" >
@ -205,12 +216,22 @@
</item> </item>
<item> <item>
<layout class="QGridLayout" name="gridLayout_2" > <layout class="QGridLayout" name="gridLayout_2" >
<property name="horizontalSpacing" >
<number>6</number>
</property>
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="2" >
<spacer name="verticalSpacer_7" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>55</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="easeLabel1" > <widget class="QLabel" name="easeLabel1" >
<property name="text" > <property name="text" >
@ -291,19 +312,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" >
<spacer name="verticalSpacer_7" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>
@ -324,6 +332,14 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page3" > <widget class="QWidget" name="page3" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>53</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4" > <layout class="QVBoxLayout" name="verticalLayout_4" >
<item> <item>
<spacer name="verticalSpacer_2" > <spacer name="verticalSpacer_2" >
@ -351,6 +367,14 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page4" > <widget class="QWidget" name="page4" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>53</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6" > <layout class="QVBoxLayout" name="verticalLayout_6" >
<item> <item>
<spacer name="verticalSpacer_5" > <spacer name="verticalSpacer_5" >
@ -385,6 +409,14 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page5" > <widget class="QWidget" name="page5" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>53</height>
</rect>
</property>
<layout class="QVBoxLayout" name="typeAnswerLayout" > <layout class="QVBoxLayout" name="typeAnswerLayout" >
<item> <item>
<spacer name="verticalSpacer_6" > <spacer name="verticalSpacer_6" >
@ -404,23 +436,52 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="page" /> <widget class="QWidget" name="page" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>53</height>
</rect>
</property>
</widget>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QStackedWidget" name="mainStack" > <widget class="QStackedWidget" name="mainStack" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" > <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>99</verstretch> <verstretch>100</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex" > <property name="currentIndex" >
<number>0</number> <number>4</number>
</property> </property>
<widget class="QWidget" name="blankPage" /> <widget class="QWidget" name="blankPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>304</height>
</rect>
</property>
</widget>
<widget class="QWidget" name="welcomePage" > <widget class="QWidget" name="welcomePage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>304</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5" > <layout class="QVBoxLayout" name="verticalLayout_5" >
<property name="margin" >
<number>6</number>
</property>
<item> <item>
<widget class="QTextBrowser" name="welcomeText" > <widget class="QTextBrowser" name="welcomeText" >
<property name="focusPolicy" > <property name="focusPolicy" >
@ -434,6 +495,14 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="editPage" > <widget class="QWidget" name="editPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>304</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" > <layout class="QVBoxLayout" name="verticalLayout_2" >
<property name="spacing" > <property name="spacing" >
<number>0</number> <number>0</number>
@ -447,6 +516,14 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="optionsPage" > <widget class="QWidget" name="optionsPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>304</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_3" > <layout class="QGridLayout" name="gridLayout_3" >
<property name="verticalSpacing" > <property name="verticalSpacing" >
<number>0</number> <number>0</number>
@ -749,16 +826,46 @@
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="congratsPage" > <widget class="QWidget" name="congratsPage" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>422</width>
<height>304</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9" > <layout class="QVBoxLayout" name="verticalLayout_9" >
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3" > <layout class="QHBoxLayout" name="horizontalLayout_3" >
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_10" > <layout class="QVBoxLayout" name="verticalLayout_10" >
<property name="leftMargin" >
<number>6</number>
</property>
<item>
<spacer name="verticalSpacer_10" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="congratsLabel" > <widget class="QLabel" name="congratsLabel" >
<property name="text" > <property name="text" >
<string>xxx</string> <string>xxx</string>
</property> </property>
<property name="margin" >
<number>0</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -1029,7 +1136,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>699</width> <width>699</width>
<height>25</height> <height>23</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuHelp" > <widget class="QMenu" name="menuHelp" >
@ -1172,11 +1279,28 @@
<addaction name="menu_Settings" /> <addaction name="menu_Settings" />
<addaction name="menuHelp" /> <addaction name="menuHelp" />
</widget> </widget>
<widget class="QStatusBar" name="statusbar" /> <widget class="QStatusBar" name="statusbar" >
<property name="geometry" >
<rect>
<x>0</x>
<y>426</y>
<width>699</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="QToolBar" name="toolBar" > <widget class="QToolBar" name="toolBar" >
<property name="enabled" > <property name="enabled" >
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="geometry" >
<rect>
<x>0</x>
<y>23</y>
<width>699</width>
<height>46</height>
</rect>
</property>
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>