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

remove some pref fonts/colours, apply interface font to 'soon'

Browse source
This commit is contained in:
Damien Elmes 2008-11-21 14:10:12 +09:00
parent 0fe089f532
commit 03ee833026
3 changed files with 39 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ankiqt/ui/main.py
View file

@ -337,7 +337,7 @@ class AnkiQt(QMainWindow):
for i in range(1, 5): for i in range(1, 5):
if not self.config['suppressEstimates']: if not self.config['suppressEstimates']:
if i == 1: if i == 1:
label = QLabel(_("Soon")) label = QLabel(self.withInterfaceFont(_("Soon")))
else: else:
label = QLabel(self.withInterfaceFont(text[i-1][1] % nextInts)) label = QLabel(self.withInterfaceFont(text[i-1][1] % nextInts))
label.setAlignment(Qt.AlignHCenter) label.setAlignment(Qt.AlignHCenter)

4
ankiqt/ui/preferences.py
View file

@ -77,8 +77,6 @@ class Preferences(QDialog):
fonts = ( fonts = (
"interface", "interface",
"lastCard",
"edit",
) )
def loadCurrentFonts(self): def loadCurrentFonts(self):
@ -119,7 +117,7 @@ class Preferences(QDialog):
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):
# mac widgets don't show colours # mac widgets don't show colours
self.plastiqueStyle = QStyleFactory.create("plastique") self.plastiqueStyle = QStyleFactory.create("plastique")
for c in ("interface", "lastCard", "background"): for c in ("interface", "background"):
colour = c + "Colour" colour = c + "Colour"
button = getattr(self.dialog, colour) button = getattr(self.dialog, colour)
if sys.platform.startswith("darwin"): if sys.platform.startswith("darwin"):

160
designer/preferences.ui
View file

@ -68,7 +68,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text" >
<string>&lt;h1>Fonts&lt;/h1></string> <string>&lt;h1>Fonts &amp; Colours&lt;/h1></string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap" >
<bool>false</bool> <bool>false</bool>
@ -83,115 +83,14 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="2" > <item row="0" column="0" >
<widget class="QSpinBox" name="interfaceSize" > <widget class="QLabel" name="label_8" >
<property name="maximum" > <property name="text" >
<number>300</number> <string>Interface font</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="label_9" >
<property name="text" >
<string>Last card</string>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QFontComboBox" name="interfaceFamily" >
<property name="maximumSize" >
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QFontComboBox" name="lastCardFamily" >
<property name="maximumSize" >
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_8" >
<property name="text" >
<string>Interface</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="QSpinBox" name="lastCardSize" >
<property name="maximum" >
<number>300</number>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="label_10" >
<property name="text" >
<string>Card editor</string>
</property>
</widget>
</item>
<item row="2" column="1" >
<widget class="QFontComboBox" name="editFamily" >
<property name="maximumSize" >
<size>
<width>170</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="2" column="2" >
<widget class="QSpinBox" name="editSize" >
<property name="minimum" >
<number>6</number>
</property>
<property name="maximum" >
<number>20</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label_3" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>&lt;h1>Colours&lt;/h1></string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="1" >
<widget class="QPushButton" name="interfaceColour" >
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="label_13" > <widget class="QLabel" name="label_13" >
<property name="text" > <property name="text" >
<string>Interface colour</string> <string>Interface colour</string>
@ -199,19 +98,12 @@
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1" >
<widget class="QPushButton" name="lastCardColour" > <widget class="QPushButton" name="interfaceColour" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" >
<widget class="QLabel" name="label_14" >
<property name="text" >
<string>Last card colour</string>
</property>
</widget>
</item>
<item row="2" column="0" > <item row="2" column="0" >
<widget class="QLabel" name="label_15" > <widget class="QLabel" name="label_15" >
<property name="text" > <property name="text" >
@ -226,6 +118,37 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" >
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<item>
<widget class="QFontComboBox" name="interfaceFamily" >
<property name="maximumSize" >
<size>
<width>140</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="interfaceSize" >
<property name="maximum" >
<number>300</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
</layout> </layout>
</item> </item>
</layout> </layout>
@ -579,15 +502,6 @@
<tabstops> <tabstops>
<tabstop>tabWidget</tabstop> <tabstop>tabWidget</tabstop>
<tabstop>interfaceLang</tabstop> <tabstop>interfaceLang</tabstop>
<tabstop>interfaceFamily</tabstop>
<tabstop>interfaceSize</tabstop>
<tabstop>lastCardFamily</tabstop>
<tabstop>lastCardSize</tabstop>
<tabstop>editFamily</tabstop>
<tabstop>editSize</tabstop>
<tabstop>interfaceColour</tabstop>
<tabstop>lastCardColour</tabstop>
<tabstop>backgroundColour</tabstop>
<tabstop>saveWhenClosing</tabstop> <tabstop>saveWhenClosing</tabstop>
<tabstop>saveAfterEvery</tabstop> <tabstop>saveAfterEvery</tabstop>
<tabstop>saveAfterEveryNum</tabstop> <tabstop>saveAfterEveryNum</tabstop>