From 3d83d6d810b13cf9e8d965da1d70a198d1ebb72c Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 21 Jan 2018 16:50:48 +0100 Subject: [PATCH] Add note in settings regarding UIs in plugin bridges for macOS --- resources/ui/carla_settings.ui | 21 ++++++++++++++------- source/carla_settings.py | 3 +++ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/resources/ui/carla_settings.ui b/resources/ui/carla_settings.ui index 21936d4d8..587a1ab6d 100644 --- a/resources/ui/carla_settings.ui +++ b/resources/ui/carla_settings.ui @@ -708,7 +708,7 @@ - + 2 @@ -989,6 +989,13 @@ + + + + NOTE: Plugin-bridge UIs cannot be managed by Carla on macOS + + + @@ -1006,9 +1013,9 @@ - + - + Qt::Horizontal @@ -1021,7 +1028,7 @@ - + 22 @@ -1040,14 +1047,14 @@ - + Restart the engine to load the new settings - + Qt::Horizontal @@ -1069,7 +1076,7 @@ 20 - 225 + 300 diff --git a/source/carla_settings.py b/source/carla_settings.py index 522349dae..b236e8dfa 100755 --- a/source/carla_settings.py +++ b/source/carla_settings.py @@ -283,6 +283,9 @@ class CarlaSettingsW(QDialog): self.ui.ch_exp_prevent_bad_behaviour.setVisible(False) self.ui.lw_page.hideRow(self.TAB_INDEX_WINE) + if not MACOS: + self.ui.label_engine_ui_bridges_mac_note.setVisible(False) + # FIXME, pipes on win32 not working, and mis-behaving on macOS if MACOS or WINDOWS: self.ui.ch_engine_prefer_ui_bridges.setChecked(False)