Qt: preferences, fix checkbox behaviours

Remove weird layout margins, and zones for correct deactivations of
groups of groupBoxes

modules/gui/qt4/components/simple_preferences.cpp

@@ -215,6 +215,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          ******************************/
         START_SPREFS_CAT( Video , qtr("Video Settings") );
             CONFIG_BOOL( "video", enableVideo );
+            ui.videoZone->setEnabled( ui.enableVideo->isChecked() );
+            CONNECT( ui.enableVideo, toggled( bool ),
+                     ui.videoZone, setEnabled( bool ) );
 
             CONFIG_BOOL( "fullscreen", fullscreen );
             CONFIG_BOOL( "overlay", overlay );
@@ -259,9 +262,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
         START_SPREFS_CAT( Audio, qtr("Audio Settings") );
 
             CONFIG_BOOL( "audio", enableAudio );
-            ui.SPrefsAudio_zone->setEnabled( ui.enableAudio->isChecked() );
+            ui.audioZone->setEnabled( ui.enableAudio->isChecked() );
             CONNECT( ui.enableAudio, toggled( bool ),
-                     ui.SPrefsAudio_zone, setEnabled( bool ) );
+                     ui.audioZone, setEnabled( bool ) );
 
 #define audioCommon( name ) \
             QWidget * name ## Control = new QWidget( ui.outputAudioBox ); \
@@ -649,6 +652,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                             ui.OSDTitlePosLabel, OSDTitlePos );
 
             CONFIG_BOOL( "spu", spuActiveBox);
+            ui.spuZone->setEnabled( ui.spuActiveBox->isChecked() );
+            CONNECT( ui.spuActiveBox, toggled( bool ),
+                     ui.spuZone, setEnabled( bool ) );
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, ui.encodLabel,
                             encoding );

modules/gui/qt4/ui/sprefs_audio.ui

@@ -7,8 +7,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>703</width>
-    <height>656</height>
+    <width>707</width>
+    <height>536</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -32,8 +32,11 @@
     </widget>
    </item>
    <item>
-    <widget class="QWidget" name="SPrefsAudio_zone" native="true">
-     <layout class="QVBoxLayout" name="verticalLayout">
+    <widget class="QWidget" name="audioZone" native="true">
+     <layout class="QVBoxLayout" name="audioZoneLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
       <item>
        <widget class="QGroupBox" name="audioBox">
         <property name="title">
@@ -166,9 +169,6 @@
            <property name="text">
             <string>Output module:</string>
            </property>
-           <property name="buddy">
-            <cstring>outputModule</cstring>
-           </property>
           </widget>
          </item>
          <item row="0" column="1">
@@ -204,9 +204,6 @@
               <property name="text">
                <string>Destination file:</string>
               </property>
-              <property name="buddy">
-               <cstring>fileName</cstring>
-              </property>
              </widget>
             </item>
             <item>
@@ -264,9 +261,6 @@
            <property name="text">
             <string>Visualization:</string>
            </property>
-           <property name="buddy">
-            <cstring>visualisation</cstring>
-           </property>
           </widget>
          </item>
          <item row="8" column="2" colspan="2">
@@ -309,9 +303,6 @@
            <property name="text">
             <string>Dolby Surround:</string>
            </property>
-           <property name="buddy">
-            <cstring>detectionDolby</cstring>
-           </property>
           </widget>
          </item>
          <item row="5" column="0">
@@ -328,9 +319,6 @@
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
            </property>
-           <property name="buddy">
-            <cstring>replayCombo</cstring>
-           </property>
           </widget>
          </item>
          <item row="5" column="2" colspan="2">
@@ -447,9 +435,6 @@
            <property name="text">
             <string>Preferred audio language:</string>
            </property>
-           <property name="buddy">
-            <cstring>preferredAudioLanguage</cstring>
-           </property>
           </widget>
          </item>
          <item row="0" column="1">
@@ -501,9 +486,6 @@
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="buddy">
-               <cstring>lastfm_pass_edit</cstring>
-              </property>
              </widget>
             </item>
             <item row="0" column="0">
@@ -520,9 +502,6 @@
               <property name="alignment">
                <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
               </property>
-              <property name="buddy">
-               <cstring>lastfm_user_edit</cstring>
-              </property>
              </widget>
             </item>
            </layout>