diff --git a/resources/ui/carla_settings.ui b/resources/ui/carla_settings.ui index e347aff0d..d1a58a60a 100644 --- a/resources/ui/carla_settings.ui +++ b/resources/ui/carla_settings.ui @@ -395,6 +395,22 @@ + + + + Advanced + + + + + + Load Carla backend in local namespace (RECOMMENDED) + + + + + + diff --git a/source/carla_settings.py b/source/carla_settings.py index d1fc0a20a..231e478e2 100755 --- a/source/carla_settings.py +++ b/source/carla_settings.py @@ -272,6 +272,9 @@ class CarlaSettingsW(QDialog): if self.host.processMode == ENGINE_PROCESS_MODE_CONTINUOUS_RACK: self.ui.ch_engine_force_stereo.setEnabled(False) + if host.isControl or host.isPlugin: + self.ui.group_main_advanced.hide() + # FIXME, pipes on win32 not working if WINDOWS: self.ui.ch_engine_prefer_ui_bridges.setChecked(False) @@ -359,6 +362,11 @@ class CarlaSettingsW(QDialog): settings = QSettings("falkTX", "Carla2") + # ---------------------------------------------------------------------------------------------------- + # Main + + self.ui.ch_main_load_lib_local.setChecked(settings.value(CARLA_KEY_MAIN_LOAD_LIB_LOCAL, CARLA_DEFAULT_MAIN_LOAD_LIB_LOCAL, type=bool)) + # ---------------------------------------------------------------------------------------------------- # Engine @@ -491,6 +499,11 @@ class CarlaSettingsW(QDialog): settings = QSettings("falkTX", "Carla2") + # ---------------------------------------------------------------------------------------------------- + # Main + + settings.setValue(CARLA_KEY_MAIN_LOAD_LIB_LOCAL, self.ui.ch_main_load_lib_local.isChecked()) + # ---------------------------------------------------------------------------------------------------- # Engine @@ -599,6 +612,7 @@ class CarlaSettingsW(QDialog): 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) + self.ui.ch_main_load_lib_local.setChecked(CARLA_DEFAULT_MAIN_LOAD_LIB_LOCAL) # ---------------------------------------------------------------------------------------------------- # Canvas