From 46b8abc2fd73033638db234f5549bfc987dbe46d Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 12 Mar 2016 19:17:14 +0100 Subject: [PATCH] Force usage of custom theme under Mac OS --- source/carla_app.py | 6 ++++-- source/carla_settings.py | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/source/carla_app.py b/source/carla_app.py index aed44aae1..e4c63476e 100644 --- a/source/carla_app.py +++ b/source/carla_app.py @@ -66,9 +66,11 @@ class CarlaApplication(object): self.createApp(appName) return + forceTheme = MACOS or (WINDOWS and not config_UseQt5) + # base settings settings = QSettings("falkTX", appName) - useProTheme = settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, CARLA_DEFAULT_MAIN_USE_PRO_THEME, type=bool) + useProTheme = forceTheme or settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, CARLA_DEFAULT_MAIN_USE_PRO_THEME, type=bool) if not useProTheme: self.createApp(appName) @@ -88,7 +90,7 @@ class CarlaApplication(object): # set palette proThemeColor = settings.value(CARLA_KEY_MAIN_PRO_THEME_COLOR, CARLA_DEFAULT_MAIN_PRO_THEME_COLOR, type=str).lower() - if proThemeColor == "black": + if forceTheme or proThemeColor == "black": self.fPalBlack = QPalette() self.fPalBlack.setColor(QPalette.Disabled, QPalette.Window, QColor(14, 14, 14)) self.fPalBlack.setColor(QPalette.Active, QPalette.Window, QColor(17, 17, 17)) diff --git a/source/carla_settings.py b/source/carla_settings.py index 7255db1b7..5be728bf8 100755 --- a/source/carla_settings.py +++ b/source/carla_settings.py @@ -234,8 +234,9 @@ class CarlaSettingsW(QDialog): for i in range(Theme.THEME_MAX): self.ui.cb_canvas_theme.addItem(getThemeName(i)) - if WINDOWS and not config_UseQt5: + if MACOS or (WINDOWS and not config_UseQt5): self.ui.group_main_theme.setEnabled(False) + self.ui.group_main_theme.setVisible(False) if host.isControl: self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)