mirror of
https://github.com/ankitects/anki.git
synced 2025-09-21 07:22:23 -04:00
remove some pref fonts/colours, apply interface font to 'soon'
This commit is contained in:
Damien Elmes
parent
0fe089f532
commit
03ee833026
3 changed files with 39 additions and 127 deletions
|
|
@ -337,7 +337,7 @@ class AnkiQt(QMainWindow):
|
|||
for i in range(1, 5):
|
||||
if not self.config['suppressEstimates']:
|
||||
if i == 1:
|
||||
label = QLabel(_("Soon"))
|
||||
label = QLabel(self.withInterfaceFont(_("Soon")))
|
||||
else:
|
||||
label = QLabel(self.withInterfaceFont(text[i-1][1] % nextInts))
|
||||
label.setAlignment(Qt.AlignHCenter)
|
||||
|
|
|
|||
|
|
@ -77,8 +77,6 @@ class Preferences(QDialog):
|
|||
|
||||
fonts = (
|
||||
"interface",
|
||||
"lastCard",
|
||||
"edit",
|
||||
)
|
||||
|
||||
def loadCurrentFonts(self):
|
||||
|
|
@ -119,7 +117,7 @@ class Preferences(QDialog):
|
|||
if sys.platform.startswith("darwin"):
|
||||
# mac widgets don't show colours
|
||||
self.plastiqueStyle = QStyleFactory.create("plastique")
|
||||
for c in ("interface", "lastCard", "background"):
|
||||
for c in ("interface", "background"):
|
||||
colour = c + "Colour"
|
||||
button = getattr(self.dialog, colour)
|
||||
if sys.platform.startswith("darwin"):
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text" >
|
||||
<string><h1>Fonts</h1></string>
|
||||
<string><h1>Fonts & Colours</h1></string>
|
||||
</property>
|
||||
<property name="wordWrap" >
|
||||
<bool>false</bool>
|
||||
|
|
@ -83,115 +83,14 @@
|
|||
<property name="spacing" >
|
||||
<number>6</number>
|
||||
</property>
|
||||
<item row="0" column="2" >
|
||||
<widget class="QSpinBox" name="interfaceSize" >
|
||||
<property name="maximum" >
|
||||
<number>300</number>
|
||||
<item row="0" column="0" >
|
||||
<widget class="QLabel" name="label_8" >
|
||||
<property name="text" >
|
||||
<string>Interface font</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<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><h1>Colours</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" >
|
||||
<property name="text" >
|
||||
<string>Interface colour</string>
|
||||
|
|
@ -199,19 +98,12 @@
|
|||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1" >
|
||||
<widget class="QPushButton" name="lastCardColour" >
|
||||
<widget class="QPushButton" name="interfaceColour" >
|
||||
<property name="text" >
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</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" >
|
||||
<widget class="QLabel" name="label_15" >
|
||||
<property name="text" >
|
||||
|
|
@ -226,6 +118,37 @@
|
|||
</property>
|
||||
</widget>
|
||||
</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>
|
||||
</item>
|
||||
</layout>
|
||||
|
|
@ -579,15 +502,6 @@
|
|||
<tabstops>
|
||||
<tabstop>tabWidget</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>saveAfterEvery</tabstop>
|
||||
<tabstop>saveAfterEveryNum</tabstop>
|
||||
|
|
|
|||
Loading…
Reference in a new issue