| @@ -314,7 +314,7 @@ | |||
| </property> | |||
| <property name="sizeHint" stdset="0"> | |||
| <size> | |||
| <width>138</width> | |||
| <width>130</width> | |||
| <height>10</height> | |||
| </size> | |||
| </property> | |||
| @@ -329,7 +329,7 @@ | |||
| <string>Misc</string> | |||
| </property> | |||
| <layout class="QGridLayout" name="gridLayout_4"> | |||
| <item row="0" column="0"> | |||
| <item row="1" column="0"> | |||
| <widget class="QLabel" name="label_main_refresh_interval"> | |||
| <property name="text"> | |||
| <string>GUI Refresh interval:</string> | |||
| @@ -339,7 +339,7 @@ | |||
| </property> | |||
| </widget> | |||
| </item> | |||
| <item row="0" column="1"> | |||
| <item row="1" column="1"> | |||
| <widget class="QSpinBox" name="sb_main_refresh_interval"> | |||
| <property name="suffix"> | |||
| <string> ms</string> | |||
| @@ -355,22 +355,29 @@ | |||
| </property> | |||
| </widget> | |||
| </item> | |||
| <item row="0" column="2"> | |||
| <item row="1" column="2"> | |||
| <spacer name="horizontalSpacer_12"> | |||
| <property name="orientation"> | |||
| <enum>Qt::Horizontal</enum> | |||
| </property> | |||
| <property name="sizeType"> | |||
| <enum>QSizePolicy::Preferred</enum> | |||
| <enum>QSizePolicy::Fixed</enum> | |||
| </property> | |||
| <property name="sizeHint" stdset="0"> | |||
| <size> | |||
| <width>40</width> | |||
| <width>130</width> | |||
| <height>10</height> | |||
| </size> | |||
| </property> | |||
| </spacer> | |||
| </item> | |||
| <item row="0" column="0" colspan="3"> | |||
| <widget class="QCheckBox" name="cb_main_use_custom_skins"> | |||
| <property name="text"> | |||
| <string>Use custom plugin slot skins</string> | |||
| </property> | |||
| </widget> | |||
| </item> | |||
| </layout> | |||
| </widget> | |||
| </item> | |||
| @@ -458,6 +458,12 @@ class HostWindow(QMainWindow): | |||
| except: | |||
| maxParameters = CARLA_DEFAULT_MAX_PARAMETERS | |||
| # int values | |||
| try: | |||
| useCustomSkins = settings.value(CARLA_KEY_MAIN_USE_CUSTOM_SKINS, CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS, type=bool) | |||
| except: | |||
| useCustomSkins = CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS | |||
| try: | |||
| uiBridgesTimeout = settings.value(CARLA_KEY_ENGINE_UI_BRIDGES_TIMEOUT, CARLA_DEFAULT_UI_BRIDGES_TIMEOUT, type=int) | |||
| except: | |||
| @@ -541,7 +547,8 @@ class HostWindow(QMainWindow): | |||
| gCarla.host.set_engine_option(ENGINE_OPTION_AUDIO_DEVICE, 0, audioDevice) | |||
| # save this for later | |||
| gCarla.maxParameters = maxParameters | |||
| gCarla.maxParameters = maxParameters | |||
| gCarla.useCustomSkins = useCustomSkins | |||
| # return selected driver name | |||
| return audioDriver | |||
| @@ -56,6 +56,7 @@ CARLA_DEFAULT_MAIN_PROJECT_FOLDER = QDir.homePath() | |||
| CARLA_DEFAULT_MAIN_USE_PRO_THEME = True | |||
| CARLA_DEFAULT_MAIN_PRO_THEME_COLOR = "Black" | |||
| CARLA_DEFAULT_MAIN_REFRESH_INTERVAL = 20 | |||
| CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS = True | |||
| # Canvas | |||
| CARLA_DEFAULT_CANVAS_THEME = "Modern Dark" | |||
| @@ -342,6 +343,7 @@ class CarlaSettingsW(QDialog): | |||
| self.ui.ch_main_theme_pro.setChecked(settings.value(CARLA_KEY_MAIN_USE_PRO_THEME, CARLA_DEFAULT_MAIN_USE_PRO_THEME, type=bool)) | |||
| self.ui.cb_main_theme_color.setCurrentIndex(self.ui.cb_main_theme_color.findText(settings.value(CARLA_KEY_MAIN_PRO_THEME_COLOR, CARLA_DEFAULT_MAIN_PRO_THEME_COLOR, type=str))) | |||
| self.ui.sb_main_refresh_interval.setValue(settings.value(CARLA_KEY_MAIN_REFRESH_INTERVAL, CARLA_DEFAULT_MAIN_REFRESH_INTERVAL, type=int)) | |||
| self.ui.cb_main_use_custom_skins.setChecked(settings.value(CARLA_KEY_MAIN_USE_CUSTOM_SKINS, CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS, type=bool)) | |||
| # --------------------------------------- | |||
| # Canvas | |||
| @@ -453,6 +455,7 @@ class CarlaSettingsW(QDialog): | |||
| settings.setValue(CARLA_KEY_MAIN_USE_PRO_THEME, self.ui.ch_main_theme_pro.isChecked()) | |||
| settings.setValue(CARLA_KEY_MAIN_PRO_THEME_COLOR, self.ui.cb_main_theme_color.currentText()) | |||
| settings.setValue(CARLA_KEY_MAIN_REFRESH_INTERVAL, self.ui.sb_main_refresh_interval.value()) | |||
| settings.setValue(CARLA_KEY_MAIN_USE_CUSTOM_SKINS, self.ui.cb_main_use_custom_skins.isChecked()) | |||
| # --------------------------------------- | |||
| @@ -537,9 +540,10 @@ class CarlaSettingsW(QDialog): | |||
| def slot_resetSettings(self): | |||
| if self.ui.lw_page.currentRow() == self.TAB_INDEX_MAIN: | |||
| self.ui.le_main_proj_folder.setText(CARLA_DEFAULT_MAIN_PROJECT_FOLDER) | |||
| self.ui.ch_theme_pro.setChecked(CARLA_DEFAULT_MAIN_USE_PRO_THEME) | |||
| self.ui.cb_theme_color.setCurrentIndex(self.ui.cb_theme_color.findText(CARLA_DEFAULT_MAIN_PRO_THEME_COLOR)) | |||
| self.ui.sb_gui_refresh.setValue(CARLA_DEFAULT_MAIN_REFRESH_INTERVAL) | |||
| self.ui.ch_main_theme_pro.setChecked(CARLA_DEFAULT_MAIN_USE_PRO_THEME) | |||
| self.ui.cb_main_theme_color.setCurrentIndex(self.ui.cb_theme_color.findText(CARLA_DEFAULT_MAIN_PRO_THEME_COLOR)) | |||
| self.ui.sb_main_refresh_interval.setValue(CARLA_DEFAULT_MAIN_REFRESH_INTERVAL) | |||
| self.ui.cb_main_use_custom_skins.setChecked(CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS) | |||
| elif self.ui.lw_page.currentRow() == self.TAB_INDEX_CANVAS: | |||
| self.ui.cb_canvas_theme.setCurrentIndex(self.ui.cb_canvas_theme.findText(CARLA_DEFAULT_CANVAS_THEME)) | |||
| @@ -186,6 +186,7 @@ CARLA_KEY_MAIN_PROJECT_FOLDER = "Main/ProjectFolder" # str | |||
| CARLA_KEY_MAIN_USE_PRO_THEME = "Main/UseProTheme" # bool | |||
| CARLA_KEY_MAIN_PRO_THEME_COLOR = "Main/ProThemeColor" # str | |||
| CARLA_KEY_MAIN_REFRESH_INTERVAL = "Main/RefreshInterval" # int | |||
| CARLA_KEY_MAIN_USE_CUSTOM_SKINS = "Main/UseCustomSkins" # bool | |||
| CARLA_KEY_CANVAS_THEME = "Canvas/Theme" # str | |||
| CARLA_KEY_CANVAS_SIZE = "Canvas/Size" # str "NxN" | |||
| @@ -245,6 +246,8 @@ class CarlaObject(object): | |||
| 'transportMode', | |||
| # current max parameters | |||
| 'maxParameters', | |||
| # wherever to use custom skins | |||
| 'useCustomSkins', | |||
| # binary dir | |||
| 'pathBinaries', | |||
| # resources dir | |||
| @@ -273,8 +276,9 @@ gCarla.processMode = ENGINE_PROCESS_MODE_MULTIPLE_CLIENTS if LINUX else EN | |||
| gCarla.processModeForced = False | |||
| gCarla.transportMode = ENGINE_TRANSPORT_MODE_JACK if LINUX else ENGINE_TRANSPORT_MODE_INTERNAL | |||
| gCarla.maxParameters = MAX_DEFAULT_PARAMETERS | |||
| gCarla.pathBinaries = "" | |||
| gCarla.pathResources = "" | |||
| gCarla.useCustomSkins = True | |||
| gCarla.pathBinaries = "" | |||
| gCarla.pathResources = "" | |||
| # ------------------------------------------------------------------------------------------------------------ | |||
| # Default Plugin Folders (get) | |||
| @@ -1438,6 +1438,9 @@ class PluginSlot_ZynFX(AbstractPluginSlot): | |||
| # ------------------------------------------------------------------------------------------------------------ | |||
| def createPluginSlot(parent, pluginId): | |||
| if not gCarla.useCustomSkins: | |||
| return PluginSlot_Default(parent, pluginId) | |||
| pluginInfo = gCarla.host.get_plugin_info(pluginId) | |||
| pluginName = gCarla.host.get_real_plugin_name(pluginId) | |||
| pluginLabel = pluginInfo['label'] | |||
| @@ -1461,7 +1464,6 @@ def createPluginSlot(parent, pluginId): | |||
| #return PluginSlot_Nekobi(parent, pluginId) | |||
| return PluginSlot_BasicFX(parent, pluginId) | |||
| return PluginSlot_Default(parent, pluginId) | |||
| # ------------------------------------------------------------------------------------------------------------ | |||
| # Main Testing | |||