epg: narrow input lock

[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 f95ecdabe6417069d7541b2c4c241e630ea75352..f54b433b6a8ac934f06ca941a4620a25a17b41b3 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-2008 the VideoLAN team
+ * Copyright (C) 2006-2010 the VideoLAN team
  * $Id$
  *
  * Authors: Clément Stenac <zorglub@videolan.org>
@@ -441,7 +441,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                                  ui.recordPath, ui.recordBrowse );
 
             CONFIG_GENERIC( "http-proxy", String , ui.httpProxyLabel, proxy );
-            CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, ui.ppLabel,
+            CONFIG_GENERIC_NO_BOOL( "postproc-q", Integer, ui.ppLabel,
                                     PostProcLevel );
             CONFIG_GENERIC( "avi-index", IntegerList, ui.aviLabel, AviRepair );
 
@@ -507,8 +507,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             #ifdef WIN32
             TestCaC( "dshow-caching" );
             #else
-            if (module_exists ("v4l"))
-                TestCaC( "v4l-caching" );
             if (module_exists ("access_jack"))
                 TestCaC( "jack-input-caching" );
             if (module_exists ("v4l2"))
@@ -590,15 +588,21 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             ui.skinsPreview->setPreview( InterfacePreviewWidget::SKINS );
 
             CONFIG_BOOL( "embedded-video", embedVideo );
+            CONFIG_BOOL( "qt-video-autoresize", resizingBox );
+            CONNECT( ui.embedVideo, toggled( bool ), ui.resizingBox, setEnabled( bool ) );
+            ui.resizingBox->setEnabled( ui.embedVideo->isChecked() );
+
             CONFIG_BOOL( "qt-fs-controller", fsController );
             CONFIG_BOOL( "qt-system-tray", systrayBox );
             CONFIG_BOOL( "qt-notification", sysPop );
             CONNECT( ui.systrayBox, toggled( bool ), ui.sysPop, setEnabled( bool ) );
+            ui.sysPop->setEnabled( ui.systrayBox->isChecked() );
 
+            CONFIG_BOOL( "qt-pause-minimized", pauseMinimizedBox );
             CONFIG_BOOL( "playlist-tree", treePlaylist );
+            CONFIG_BOOL( "play-and-pause", playPauseBox );
             CONFIG_GENERIC_FILE( "skins2-last", File, ui.skinFileLabel,
                                  ui.fileSkin, ui.skinBrowse );
-            CONFIG_BOOL( "qt-video-autoresize", resizingBox );
 
             CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
                                                       artFetcher );
@@ -683,6 +687,14 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                     p_config, this, false, gLayout, line );
             controls.append( control );
 
+#ifdef WIN32
+            line++;
+
+            p_config = config_FindConfig( VLC_OBJECT(p_intf), "qt-disable-volume-keys" );
+            control = new BoolConfigControl( VLC_OBJECT(p_intf), p_config, this, gLayout, line );
+            controls.append( control );
+#endif
+
             break;
         }
     }
@@ -797,8 +809,6 @@ void SPrefsPanel::apply()
             #ifdef WIN32
             CaC( "dshow-caching" );
             #else
-            if (module_exists ( "v4l" ))
-                CaC( "v4l-caching" );
             if (module_exists ( "access_jack" ))
             CaC( "jack-input-caching" );
             if (module_exists ( "v4l2" ))
@@ -817,9 +827,10 @@ void SPrefsPanel::apply()
     case SPrefsInterface:
     {
         if( qobject_cast<QRadioButton *>(optionWidgets[skinRB])->isChecked() )
-            config_PutPsz( p_intf, "intf", "skins2" );
-        if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
-            config_PutPsz( p_intf, "intf", "qt" );
+            config_PutPsz( p_intf, "intf", "skins2,any" );
+        else
+        //if( qobject_cast<QRadioButton *>(optionWidgets[qtRB])->isChecked() )
+            config_PutPsz( p_intf, "intf", "" );
         if( qobject_cast<QComboBox *>(optionWidgets[styleCB]) )
             getSettings()->setValue( "MainWindow/QtStyle",
                 qobject_cast<QComboBox *>(optionWidgets[styleCB])->currentText() );