falkTX
/
Carla
mirror of https://github.com/falkTX/Carla
1
0
Fork 0
Code Releases 42 Activity
Browse Source

Move manage-uis option from main to engine

tags/1.9.8
falkTX 7 years ago
parent
74bfd2e5b3
commit
5a239594c2
5 changed files with 53 additions and 29 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +24
    -0
      resources/ui/carla_database.ui
  2. +17
    -17
      resources/ui/carla_settings.ui
  3. +2
    -2
      source/carla_host.py
  4. +8
    -8
      source/carla_settings.py
  5. +2
    -2
      source/carla_shared.py

+ 24
- 0
resources/ui/carla_database.ui View File

@@ -189,6 +189,12 @@
</item>
<item row="0" column="0">
<widget class="QLabel" name="l_format">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Plugin format</string>
</property>
@@ -196,6 +202,12 @@
</item>
<item row="0" column="1">
<widget class="QLabel" name="l_category">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Category</string>
</property>
@@ -203,6 +215,12 @@
</item>
<item row="0" column="3">
<widget class="QLabel" name="l_reqs">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Requirements</string>
</property>
@@ -210,6 +228,12 @@
</item>
<item row="0" column="4">
<widget class="QLabel" name="l_arch">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Architecture</string>
</property>


+ 17
- 17
resources/ui/carla_settings.ui View File

@@ -290,7 +290,7 @@
<string>Interface</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="4" column="1">
<item row="3" column="1">
<widget class="QSpinBox" name="sb_main_refresh_interval">
<property name="suffix">
<string> ms</string>
@@ -306,7 +306,7 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="3" column="2">
<spacer name="horizontalSpacer_12">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -322,7 +322,7 @@
</property>
</spacer>
</item>
<item row="4" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_main_refresh_interval">
<property name="text">
<string>Interface refresh interval:</string>
@@ -332,21 +332,14 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="ch_main_manage_uis">
<property name="text">
<string>Make plugin UIs appear on top of Carla (needs restart)</string>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="ch_main_use_custom_skins">
<property name="text">
<string>Use custom plugin slot skins</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3">
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="ch_main_show_logs">
<property name="text">
<string>Show console output in Logs tab (needs engine restart)</string>
@@ -907,7 +900,7 @@
<string>Plugin UIs</string>
</property>
<layout class="QGridLayout" name="gridLayout_8">
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_12">
<property name="toolTip">
<string>How much time to wait for OSC GUIs to ping back the host</string>
@@ -920,7 +913,7 @@
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QSpinBox" name="sb_engine_ui_bridges_timeout">
<property name="toolTip">
<string>How much time to wait for OSC GUIs to ping back the host</string>
@@ -933,7 +926,7 @@
</property>
</widget>
</item>
<item row="4" column="2">
<item row="5" column="2">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -949,7 +942,7 @@
</property>
</spacer>
</item>
<item row="1" column="0" colspan="3">
<item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="ch_engine_prefer_ui_bridges">
<property name="toolTip">
<string>Use OSC-GUI bridges when possible, this way separating the UI from DSP code</string>
@@ -959,13 +952,20 @@
</property>
</widget>
</item>
<item row="0" column="0">
<item row="1" column="0" colspan="3">
<widget class="QCheckBox" name="ch_engine_uis_always_on_top">
<property name="text">
<string>Make UIs always-on-top</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="ch_engine_manage_uis">
<property name="text">
<string>Make plugin UIs appear on top of Carla (needs restart)</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>


+ 2
- 2
source/carla_host.py View File

@@ -2484,9 +2484,9 @@ def loadHostSettings(host):
host.experimental = CARLA_DEFAULT_MAIN_EXPERIMENTAL

try:
host.manageUIs = settings.value(CARLA_KEY_MAIN_MANAGE_UIS, CARLA_DEFAULT_MAIN_MANAGE_UIS, type=bool)
host.manageUIs = settings.value(CARLA_KEY_ENGINE_MANAGE_UIS, CARLA_DEFAULT_MANAGE_UIS, type=bool)
except:
host.manageUIs = CARLA_DEFAULT_MAIN_MANAGE_UIS
host.manageUIs = CARLA_DEFAULT_MANAGE_UIS

try:
host.showLogs = settings.value(CARLA_KEY_MAIN_SHOW_LOGS, CARLA_DEFAULT_MAIN_SHOW_LOGS, type=bool)


+ 8
- 8
source/carla_settings.py View File

@@ -239,14 +239,14 @@ class CarlaSettingsW(QDialog):
self.ui.group_main_theme.setEnabled(False)
self.ui.group_main_theme.setVisible(False)

if MACOS or WINDOWS:
self.ui.ch_main_manage_uis.setEnabled(False)
self.ui.ch_main_manage_uis.setVisible(False)

if WINDOWS or host.isControl:
self.ui.ch_main_show_logs.setEnabled(False)
self.ui.ch_main_show_logs.setVisible(False)

if MACOS or WINDOWS:
self.ui.ch_engine_manage_uis.setEnabled(False)
self.ui.ch_engine_manage_uis.setVisible(False)

if host.isControl:
self.ui.lw_page.hideRow(self.TAB_INDEX_CANVAS)
self.ui.lw_page.hideRow(self.TAB_INDEX_ENGINE)
@@ -340,7 +340,6 @@ class CarlaSettingsW(QDialog):
# ----------------------------------------------------------------------------------------------------
# Main

self.ui.ch_main_manage_uis.setChecked(self.host.manageUIs)
self.ui.ch_main_show_logs.setChecked(self.host.showLogs)
self.ui.ch_engine_uis_always_on_top.setChecked(self.host.uisAlwaysOnTop)

@@ -410,6 +409,7 @@ class CarlaSettingsW(QDialog):
self.ui.cb_engine_process_mode_other.setCurrentIndex(0)

self.ui.sb_engine_max_params.setValue(self.host.maxParameters)
self.ui.ch_engine_manage_uis.setChecked(self.host.manageUIs)
self.ui.ch_engine_prefer_ui_bridges.setChecked(self.host.preferUIBridges)
self.ui.sb_engine_ui_bridges_timeout.setValue(self.host.uiBridgesTimeout)
self.ui.ch_engine_force_stereo.setChecked(self.host.forceStereo or not self.ui.ch_engine_force_stereo.isEnabled())
@@ -488,7 +488,6 @@ class CarlaSettingsW(QDialog):
# ----------------------------------------------------------------------------------------------------
# Main

self.host.manageUIs = self.ui.ch_main_manage_uis.isChecked()
self.host.showLogs = self.ui.ch_main_show_logs.isChecked()
self.host.uisAlwaysOnTop = self.ui.ch_engine_uis_always_on_top.isChecked()

@@ -498,7 +497,6 @@ class CarlaSettingsW(QDialog):
settings.setValue(CARLA_KEY_MAIN_REFRESH_INTERVAL, self.ui.sb_main_refresh_interval.value())
settings.setValue(CARLA_KEY_MAIN_USE_CUSTOM_SKINS, self.ui.ch_main_use_custom_skins.isChecked())

settings.setValue(CARLA_KEY_MAIN_MANAGE_UIS, self.host.manageUIs)
settings.setValue(CARLA_KEY_MAIN_SHOW_LOGS, self.host.showLogs)
settings.setValue(CARLA_KEY_ENGINE_UIS_ALWAYS_ON_TOP, self.host.uisAlwaysOnTop)

@@ -548,6 +546,7 @@ class CarlaSettingsW(QDialog):
self.host.preferUIBridges = self.ui.ch_engine_prefer_ui_bridges.isChecked()
self.host.maxParameters = self.ui.sb_engine_max_params.value()
self.host.uiBridgesTimeout = self.ui.sb_engine_ui_bridges_timeout.value()
self.host.manageUIs = self.ui.ch_engine_manage_uis.isChecked()

if self.ui.ch_engine_force_stereo.isEnabled():
self.host.set_engine_option(ENGINE_OPTION_FORCE_STEREO, self.host.forceStereo, "")
@@ -565,6 +564,7 @@ class CarlaSettingsW(QDialog):
settings.setValue(CARLA_KEY_ENGINE_PREFER_UI_BRIDGES, self.host.preferUIBridges)
settings.setValue(CARLA_KEY_ENGINE_MAX_PARAMETERS, self.host.maxParameters)
settings.setValue(CARLA_KEY_ENGINE_UI_BRIDGES_TIMEOUT, self.host.uiBridgesTimeout)
settings.setValue(CARLA_KEY_ENGINE_MANAGE_UIS, self.host.manageUIs)

# ----------------------------------------------------------------------------------------------------
# Paths
@@ -639,7 +639,6 @@ class CarlaSettingsW(QDialog):
self.ui.cb_main_theme_color.setCurrentIndex(self.ui.cb_main_theme_color.findText(CARLA_DEFAULT_MAIN_PRO_THEME_COLOR))
self.ui.sb_main_refresh_interval.setValue(CARLA_DEFAULT_MAIN_REFRESH_INTERVAL)
self.ui.ch_main_use_custom_skins.setChecked(CARLA_DEFAULT_MAIN_USE_CUSTOM_SKINS)
self.ui.ch_main_manage_uis.setChecked(CARLA_DEFAULT_MAIN_MANAGE_UIS)
self.ui.ch_main_show_logs.setChecked(CARLA_DEFAULT_MAIN_SHOW_LOGS)

# ----------------------------------------------------------------------------------------------------
@@ -673,6 +672,7 @@ class CarlaSettingsW(QDialog):
self.ui.ch_engine_uis_always_on_top.setChecked(CARLA_DEFAULT_UIS_ALWAYS_ON_TOP)
self.ui.ch_engine_prefer_ui_bridges.setChecked(CARLA_DEFAULT_PREFER_UI_BRIDGES)
self.ui.sb_engine_ui_bridges_timeout.setValue(CARLA_DEFAULT_UI_BRIDGES_TIMEOUT)
self.ui.ch_engine_manage_uis.setChecked(CARLA_DEFAULT_MANAGE_UIS)

# ----------------------------------------------------------------------------------------------------
# Paths


+ 2
- 2
source/carla_shared.py View File

@@ -192,7 +192,6 @@ 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_MAIN_MANAGE_UIS = "Main/ManageUIs" # bool
CARLA_KEY_MAIN_SHOW_LOGS = "Main/ShowLogs" # bool
CARLA_KEY_MAIN_EXPERIMENTAL = "Main/Experimental" # bool

@@ -214,6 +213,7 @@ CARLA_KEY_ENGINE_TRANSPORT_MODE = "Engine/TransportMode" # enum
CARLA_KEY_ENGINE_FORCE_STEREO = "Engine/ForceStereo" # bool
CARLA_KEY_ENGINE_PREFER_PLUGIN_BRIDGES = "Engine/PreferPluginBridges" # bool
CARLA_KEY_ENGINE_PREFER_UI_BRIDGES = "Engine/PreferUiBridges" # bool
CARLA_KEY_ENGINE_MANAGE_UIS = "Engine/ManageUIs" # bool
CARLA_KEY_ENGINE_UIS_ALWAYS_ON_TOP = "Engine/UIsAlwaysOnTop" # bool
CARLA_KEY_ENGINE_MAX_PARAMETERS = "Engine/MaxParameters" # int
CARLA_KEY_ENGINE_UI_BRIDGES_TIMEOUT = "Engine/UiBridgesTimeout" # int
@@ -242,7 +242,6 @@ 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
CARLA_DEFAULT_MAIN_MANAGE_UIS = True
CARLA_DEFAULT_MAIN_SHOW_LOGS = bool(not WINDOWS)
CARLA_DEFAULT_MAIN_EXPERIMENTAL = False

@@ -264,6 +263,7 @@ CARLA_DEFAULT_CANVAS_HQ_ANTIALIASING = False
CARLA_DEFAULT_FORCE_STEREO = False
CARLA_DEFAULT_PREFER_PLUGIN_BRIDGES = False
CARLA_DEFAULT_PREFER_UI_BRIDGES = bool(not WINDOWS)
CARLA_DEFAULT_MANAGE_UIS = True
CARLA_DEFAULT_UIS_ALWAYS_ON_TOP = False
CARLA_DEFAULT_MAX_PARAMETERS = MAX_DEFAULT_PARAMETERS
CARLA_DEFAULT_UI_BRIDGES_TIMEOUT = 4000


Write Preview
Loading…
Cancel
Save