From 4f994f3bc37da69a0927594a09dfba3a8bcb6044 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 15 Feb 2014 20:03:13 +0000 Subject: [PATCH] Cleanup --- source/carla_style.py | 7 ++++--- source/widgets/pixmapdial.py | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/source/carla_style.py b/source/carla_style.py index 93494d8eb..141a94614 100644 --- a/source/carla_style.py +++ b/source/carla_style.py @@ -175,17 +175,18 @@ class CarlaApplication(object): self.loadSettings() def loadSettings(self): - if WINDOWS: return - settings = QSettings() useProTheme = settings.value("Main/UseProTheme", True, type=bool) if useProTheme or True: - #font = QFont("Sans Serif", 8, QFont.Normal, False) + #font = QFont("DejaVu Sans [Book]", 8, QFont.Normal) #self.fApp.setFont(font) #QApplication.setFont(font) + # TODO + if WINDOWS: return + self.fApp.setStyle("carla") #QApplication.setStyle("carla") diff --git a/source/widgets/pixmapdial.py b/source/widgets/pixmapdial.py index 26f935f5f..9bb850bd1 100644 --- a/source/widgets/pixmapdial.py +++ b/source/widgets/pixmapdial.py @@ -66,9 +66,7 @@ class PixmapDial(QDial): self.fLabel = "" self.fLabelPos = QPointF(0.0, 0.0) - self.fLabelFont = QFont() #"DejaVu Sans [Book]", 6, QFont.Normal, False) - #self.fLabelFont.setPixelSize(8) - #self.fLabelFont.setWeight(100) + self.fLabelFont = QFont(self.font()) self.fLabelFont.setPointSize(6) self.fLabelWidth = 0 self.fLabelHeight = 0