diff --git a/ankiqt/ui/main.py b/ankiqt/ui/main.py index 62342cd29..ee13634d0 100644 --- a/ankiqt/ui/main.py +++ b/ankiqt/ui/main.py @@ -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) diff --git a/ankiqt/ui/preferences.py b/ankiqt/ui/preferences.py index 880fe3ec2..aea07b09e 100644 --- a/ankiqt/ui/preferences.py +++ b/ankiqt/ui/preferences.py @@ -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"): diff --git a/designer/preferences.ui b/designer/preferences.ui index 60b2c9c38..1664de0fa 100644 --- a/designer/preferences.ui +++ b/designer/preferences.ui @@ -68,7 +68,7 @@ - <h1>Fonts</h1> + <h1>Fonts & Colours</h1> false @@ -83,115 +83,14 @@ 6 - - - - 300 + + + + Interface font - - - Last card - - - - - - - - 170 - 16777215 - - - - - - - - - 170 - 16777215 - - - - - - - - Interface - - - - - - - 300 - - - - - - - Card editor - - - - - - - - 170 - 16777215 - - - - - - - - 6 - - - 20 - - - - - - - - - - 0 - 0 - - - - <h1>Colours</h1> - - - false - - - - - - - 0 - - - 6 - - - - - - - - - Interface colour @@ -199,19 +98,12 @@ - + - - - - Last card colour - - - @@ -226,6 +118,37 @@ + + + + + + + 140 + 16777215 + + + + + + + + 300 + + + + + + + + + + + 0 + + + 6 + @@ -579,15 +502,6 @@ tabWidget interfaceLang - interfaceFamily - interfaceSize - lastCardFamily - lastCardSize - editFamily - editSize - interfaceColour - lastCardColour - backgroundColour saveWhenClosing saveAfterEvery saveAfterEveryNum