Qt4 - Simple Prefs. Small modifications on style.

[vlc] / modules / gui / qt4 / components / simple_preferences.cpp

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index eef694ad8b5a253424cda601711f59a434bfe976..dd4c0194453ccd85bb4bbc425d366cfba573d0dc 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * simple_preferences.cpp : "Simple preferences"
  ****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id: preferences.cpp 16348 2006-08-25 21:10:10Z zorglub $
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -43,7 +43,7 @@
 #include "ui/sprefs_interface.h"
 
 #define ICON_HEIGHT 64
-#define BUTTON_HEIGHT 76
+#define BUTTON_HEIGHT 74
 
 /*********************************************************************
  * The List of categories
@@ -166,10 +166,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
     {
         /* Video Panel Implementation */
         START_SPREFS_CAT( Video , "General video settings" );
-         #ifndef WIN32
-            ui.directXBox->setVisible( false );
-         #endif
-            CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
+           CONFIG_GENERIC( "video", Bool, NULL, enableVideo );
 
             CONFIG_GENERIC( "fullscreen", Bool, NULL, fullscreen );
             CONFIG_GENERIC( "overlay", Bool, NULL, overlay );
@@ -182,6 +179,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
             CONFIG_GENERIC( "directx-device", StringList, NULL, 
                     dXdisplayDevice );
+#else
+            ui.directXBox->setVisible( false );
 #endif
 
             CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
@@ -259,17 +258,28 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.defaultLabel->setFont( italicFont );
             ui.skinsLabel->setFont( italicFont );
 
+#if defined( WIN32 ) || defined (__APPLE__)
             CONFIG_GENERIC( "language", StringList, NULL, language );//FIXME
-#if !defined( WIN32 ) && !defined( HAVE_DBUS_3 )
-            ui.OneInterfaceBox->hide();
+#else
+            ui.language->hide();
+            ui.languageLabel->hide();
 #endif
-            /* interface */
+
+           /* interface */
 /*            p_config = config_FindConfig( VLC_OBJECT(p_intf), "intf" );
             if( p_config->value.psz && strcmp( p_config->value.psz, "qt4" ))
-                    ui.qt4->setChecked( true );
+            {
+                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, ??? ); */ //FIXME interface choice
+            {
+                    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 );
@@ -277,6 +287,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
             CONFIG_GENERIC( "playlist-enqueue", Bool, NULL, 
                     EnqueueOneInterfaceMode );
+#else
+            ui.OneInterfaceBox->hide();
 #endif
         END_SPREFS_CAT;