Qt4 - Simple Prefs: little adjustements.

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index dd4c0194453ccd85bb4bbc425d366cfba573d0dc..8e306c91a1c41996843a88e9bcf931da4cbff46c 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -177,7 +177,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
 #ifdef WIN32
             CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
-            CONFIG_GENERIC( "directx-device", StringList, NULL, 
+            CONFIG_GENERIC( "directx-device", StringList, NULL,
                     dXdisplayDevice );
 #else
             ui.directXBox->setVisible( false );
@@ -206,13 +206,13 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 #endif
          CONFIG_GENERIC( "audio", Bool, NULL, enableAudio );
 
-         CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL, 
+         CONFIG_GENERIC_NO_BOOL( "volume" ,  IntegerRangeSlider, NULL,
                  defaultVolume );
-         CONFIG_GENERIC( "audio-language" , StringList , NULL, 
-                    preferredAudioLanguage ); //FIXME
+         CONFIG_GENERIC( "audio-language" , String , NULL,
+                    preferredAudioLanguage );
 
          CONFIG_GENERIC( "spdif" , Bool , NULL, spdifBox );
-         CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL, 
+         CONFIG_GENERIC( "force-dolby-surround" , IntegerList , NULL,
                     detectionDolby );
 
          CONFIG_GENERIC( "aout" , Module , NULL, outputModule );
@@ -220,15 +220,15 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
          CONFIG_GENERIC( "alsadev" , StringList , NULL, alsaDevice );
          CONFIG_GENERIC_FILE( "dspdev" , File , NULL, OSSDevice, OSSBrowse );
 #else
-         CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL, 
+         CONFIG_GENERIC( "directx-audio-device" , IntegerList, NULL,
                  DirectXDevice );
 #endif
-         CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName, 
+         CONFIG_GENERIC_FILE( "audiofile-file" , File , NULL, FileName,
                  fileBrowseButton );
 
          CONFIG_GENERIC( "headphone-dolby" , Bool , NULL, headphoneEffect );
 //         CONFIG_GENERIC( "" , Bool, NULL, ); activation of normalizer //FIXME
-         CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL, 
+         CONFIG_GENERIC_NO_BOOL( "norm-max-level" , Float , NULL,
                  volNormalizer );
          CONFIG_GENERIC( "audio-visual" , Module , NULL, visualisation);
         END_SPREFS_CAT;
@@ -259,27 +259,24 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.skinsLabel->setFont( italicFont );
 
 #if defined( WIN32 ) || defined (__APPLE__)
-            CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
+            CONFIG_GENERIC( "language", StringList, NULL, language );
 #else
             ui.language->hide();
             ui.languageLabel->hide();
 #endif
 
            /* interface */
-/*            p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
+            p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
             if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
             {
                 ui.qt4->setChecked( true );
-                control =  new StringConfigControl( VLC_OBJECT(p_intf),
-                                 p_config, NULL, ui.qt4 );
-                controls.append( control );
             }
             if( p_config->value.psz && strcmp( p_config->value.psz, "skins2" ))
             {
                     ui.skins->setChecked( true );
-            }*/
-//            CONFIG_GENERIC( "intf", Module, NULL, Interface );
+            }
             //FIXME interface choice
+
             CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
             CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, 
                     skinBrowse );
@@ -296,9 +293,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "osd", Bool, NULL, OSDBox);
 
             CONFIG_GENERIC( "subsdec-encoding", StringList, NULL, encoding );
-            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );//FIXME
-            CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font, 
-                    fontBrowse ); 
+            CONFIG_GENERIC( "sub-language", String, NULL, preferredLanguage );
+            CONFIG_GENERIC_FILE( "freetype-font", File, NULL, font,
+                            fontBrowse );
             CONFIG_GENERIC( "freetype-color", IntegerList, NULL, fontColor );
             CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
                             fontSize );

diff --git a/modules/gui/qt4/ui/sprefs_audio.ui b/modules/gui/qt4/ui/sprefs_audio.ui
index 058f61b2a92b58c4a1f838d8976458bb005d9d9b..d6284205710dec0982cc36866a23e6a965ad40ba 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_audio.ui
+++ b/modules/gui/qt4/ui/sprefs_audio.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
-    <height>539</height>
+    <width>461</width>
+    <height>554</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -77,24 +77,6 @@
         </property>
        </widget>
       </item>
-      <item row="3" column="1" >
-       <widget class="QComboBox" name="preferredAudioLanguage" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>1</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>300</width>
-          <height>16777215</height>
-         </size>
-        </property>
-       </widget>
-      </item>
       <item row="3" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
@@ -130,6 +112,9 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="1" >
+       <widget class="QLineEdit" name="preferredAudioLanguage" />
+      </item>
      </layout>
     </widget>
    </item>

diff --git a/modules/gui/qt4/ui/sprefs_subtitles.ui b/modules/gui/qt4/ui/sprefs_subtitles.ui
index 93793f404152522e4392a492103a27308291afd8..4061b296732f2c4fa899a09c2f8daf68cc9ea99f 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_subtitles.ui
+++ b/modules/gui/qt4/ui/sprefs_subtitles.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>427</width>
-    <height>359</height>
+    <height>365</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -49,6 +49,14 @@
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
+     <property name="sizePolicy" >
+      <sizepolicy>
+       <hsizetype>5</hsizetype>
+       <vsizetype>5</vsizetype>
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="title" >
       <string>Subtitles languages</string>
      </property>
@@ -68,6 +76,14 @@
       </item>
       <item row="1" column="1" >
        <widget class="QComboBox" name="encoding" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>5</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="maxVisibleItems" >
          <number>12</number>
         </property>