From 67dfa9ae14aad68e918cd2ebacab1121eb18e7f8 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 21 Jan 2018 16:41:45 +0100
Subject: [PATCH] Improve some small disabled logic in the settings page

---
 resources/ui/carla_settings.ui | 21 ++++++++++++++++++++-
 source/carla_settings.py       | 14 ++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/resources/ui/carla_settings.ui b/resources/ui/carla_settings.ui
index d997e6c84..21936d4d8 100644
--- a/resources/ui/carla_settings.ui
+++ b/resources/ui/carla_settings.ui
@@ -924,7 +924,7 @@
            </property>
            <layout class="QGridLayout" name="gridLayout_8">
             <item row="5" column="0">
-             <widget class="QLabel" name="label_12">
+             <widget class="QLabel" name="label_engine_ui_bridges_timeout">
               <property name="toolTip">
                <string>How much time to wait for OSC GUIs to ping back the host</string>
               </property>
@@ -1893,6 +1893,9 @@ This mode is not available for VST plugins.</string>
             </item>
             <item>
              <widget class="QCheckBox" name="ch_engine_prefer_plugin_bridges">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
               <property name="toolTip">
                <string>Whenever possible, run the plugins in bridge mode.</string>
               </property>
@@ -2085,5 +2088,21 @@ This mode is not available for VST plugins.</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>cb_exp_plugin_bridges</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>ch_engine_prefer_plugin_bridges</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>402</x>
+     <y>145</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>402</x>
+     <y>433</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/source/carla_settings.py b/source/carla_settings.py
index f431b7a9d..522349dae 100755
--- a/source/carla_settings.py
+++ b/source/carla_settings.py
@@ -326,8 +326,10 @@ class CarlaSettingsW(QDialog):
 
         self.ui.ch_main_experimental.toggled.connect(self.slot_enableExperimental)
         self.ui.ch_exp_wine_bridges.toggled.connect(self.slot_enableWineBridges)
+        self.ui.cb_exp_plugin_bridges.toggled.connect(self.slot_pluginBridgesToggled)
         self.ui.cb_canvas_eyecandy.toggled.connect(self.slot_canvasEyeCandyToggled)
         self.ui.cb_canvas_fancy_eyecandy.toggled.connect(self.slot_canvasFancyEyeCandyToggled)
+        self.ui.cb_canvas_use_opengl.toggled.connect(self.slot_canvasOpenGLToggled)
 
         # ----------------------------------------------------------------------------------------------------
         # Post-connect setup
@@ -860,6 +862,13 @@ class CarlaSettingsW(QDialog):
         else:
             self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
 
+    @pyqtSlot(bool)
+    def slot_pluginBridgesToggled(self, toggled):
+        if not toggled:
+            self.ui.ch_exp_wine_bridges.setChecked(False)
+            self.ui.ch_engine_prefer_plugin_bridges.setChecked(False)
+            self.ui.lw_page.hideRow(self.TAB_INDEX_WINE)
+
     @pyqtSlot(bool)
     def slot_canvasEyeCandyToggled(self, toggled):
         if not toggled:
@@ -870,6 +879,11 @@ class CarlaSettingsW(QDialog):
         if toggled:
             self.ui.cb_canvas_eyecandy.setChecked(True)
 
+    @pyqtSlot(bool)
+    def slot_canvasOpenGLToggled(self, toggled):
+        if not toggled:
+            self.ui.cb_canvas_render_hq_aa.setChecked(False)
+
     # --------------------------------------------------------------------------------------------------------
 
     @pyqtSlot()