Browse Source

Force usage of custom theme under Mac OS

tags/1.9.7
falkTX 10 years ago
parent
commit
46b8abc2fd
2 changed files with 6 additions and 3 deletions
  1. +4
    -2
      source/carla_app.py
  2. +2
    -1
      source/carla_settings.py

+ 4
- 2
source/carla_app.py View File

@@ -66,9 +66,11 @@ class CarlaApplication(object):
self.createApp(appName) self.createApp(appName)
return return


forceTheme = MACOS or (WINDOWS and not config_UseQt5)

# base settings # base settings
settings = QSettings("falkTX", appName) 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: if not useProTheme:
self.createApp(appName) self.createApp(appName)
@@ -88,7 +90,7 @@ class CarlaApplication(object):
# set palette # set palette
proThemeColor = settings.value(CARLA_KEY_MAIN_PRO_THEME_COLOR, CARLA_DEFAULT_MAIN_PRO_THEME_COLOR, type=str).lower() 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 = QPalette()
self.fPalBlack.setColor(QPalette.Disabled, QPalette.Window, QColor(14, 14, 14)) self.fPalBlack.setColor(QPalette.Disabled, QPalette.Window, QColor(14, 14, 14))
self.fPalBlack.setColor(QPalette.Active, QPalette.Window, QColor(17, 17, 17)) self.fPalBlack.setColor(QPalette.Active, QPalette.Window, QColor(17, 17, 17))


+ 2
- 1
source/carla_settings.py View File

@@ -234,8 +234,9 @@ class CarlaSettingsW(QDialog):
for i in range(Theme.THEME_MAX): for i in range(Theme.THEME_MAX):
self.ui.cb_canvas_theme.addItem(getThemeName(i)) 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.setEnabled(False)
self.ui.group_main_theme.setVisible(False)


if host.isControl: if host.isControl:
self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS) self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)


Loading…
Cancel
Save