Qt4 - network policy in Sprefs and in privacy policy dialog.

[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 0f35cf4473e56ae932d581c7155c6e791671de31..31936d5ee55ba04226b1792757b75ad399b99292 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -39,6 +39,8 @@
 #include <QUrl>
 #include <QVBoxLayout>
 
+#include <string>
+
 #define ICON_HEIGHT 64
 #define BUTTON_HEIGHT 74
 
@@ -214,6 +216,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             /* General Audio Options */
             CONFIG_GENERIC_NO_BOOL( "volume" , IntegerRangeSlider, NULL,
                                      defaultVolume );
+            CONNECT( ui.defaultVolume, valueChanged( int ),
+                    this, updateAudioVolume( int ) );
+
             CONFIG_GENERIC( "audio-language" , String , NULL,
                             preferredAudioLanguage );
 
@@ -233,7 +238,10 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             CONNECT( ui.outputModule, currentIndexChanged( int ),
                      this, updateAudioOptions( int ) );
 
-#ifndef WIN32
+#ifdef WIN32
+            CONFIG_GENERIC( "directx-audio-device", IntegerList,
+                    ui.DirectXLabel, DirectXDevice );
+#else
             if( module_Exists( p_intf, "alsa" ) )
             {
                 CONFIG_GENERIC( "alsadev" , StringList , ui.alsaLabel,
@@ -244,9 +252,6 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 CONFIG_GENERIC_FILE( "dspdev" , File , ui.OSSLabel, OSSDevice,
                                  OSSBrowse );
             }
-#else
-            CONFIG_GENERIC( "directx-audio-device", IntegerList,
-                    ui.DirectXLabel, DirectXDevice );
 #endif
         // File exists everywhere
             CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel,
@@ -258,6 +263,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets.append( ui.fileControl );
             optionWidgets.append( ui.outputModule );
             optionWidgets.append( ui.volNormBox );
+            /*Little mofification of ui.volumeValue to compile with Qt < 4.3 */
+#if HAS_QT43
+            ui.volumeValue->setButtonSymbols(QAbstractSpinBox::NoButtons);
+#endif
+            optionWidgets.append( ui.volumeValue );
             updateAudioOptions( ui.outputModule->currentIndex() );
 
             /* LastFM */
@@ -289,6 +299,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
                 ui.volNormSpin->setEnabled( b_normalizer );
             }
 
+            /* Volume Label */
+            updateAudioVolume( ui.defaultVolume->value() ); // First time init
+
         END_SPREFS_CAT;
 
         /* Input and Codecs Panel Implementation */
@@ -422,16 +435,26 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
             optionWidgets.append( ui.skins );
             optionWidgets.append( ui.qt4 );
 
-            CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher );
+            CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel,
+                                                      artFetcher );
             CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher );
+            CONFIG_GENERIC( "security-policy", IntegerList,
+                            ui.netPolicyLabel, netPolicyBox );
 #ifdef UPDATE_CHECK
-            CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates );
+            CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, updatesBox );
+            CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL,
+                    updatesDays );
+            CONNECT( ui.updatesBox, toggled( bool ),
+                     ui.updatesDays, setEnabled( bool ) );
+#else
+            ui.updatesBox->hide();
+            ui.updatesDays->hide();
 #endif
             CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
             CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo );
             CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
                     skinBrowse );
-#if defined( WIN32 ) || defined( HAVE_DBUS_3 )
+#if defined( WIN32 ) || defined( HAVE_DBUS_3 ) || defined(__APPLE__)
             CONFIG_GENERIC( "one-instance", Bool, NULL, OneInterfaceMode );
             CONFIG_GENERIC( "playlist-enqueue", Bool, NULL,
                     EnqueueOneInterfaceMode );
@@ -485,15 +508,22 @@ void SPrefsPanel::updateAudioOptions( int number)
     QString value = qobject_cast<QComboBox *>(optionWidgets[audioOutCoB])
                                             ->itemData( number ).toString();
 
-#ifndef WIN32
+#ifdef WIN32
+    optionWidgets[directxW]->setVisible( ( value == "directx" ) );
+#else
     optionWidgets[ossW]->setVisible( ( value == "oss" ) );
     optionWidgets[alsaW]->setVisible( ( value == "alsa" ) );
-#else
-    optionWidgets[directxW]->setVisible( ( value == "directx" ) );
 #endif
     optionWidgets[fileW]->setVisible( ( value == "aout_file" ) );
 }
 
+void SPrefsPanel::updateAudioVolume( int volume )
+{
+    qobject_cast<QSpinBox *>(optionWidgets[volLW])
+        ->setValue( volume * 100 / 256 );
+}
+
+
 /* Function called from the main Preferences dialog on each SPrefs Panel */
 void SPrefsPanel::apply()
 {
@@ -631,7 +661,6 @@ void SPrefsPanel::lastfm_Changed( int i_state )
 }
 
 #ifdef WIN32
-#include <QListWidget>
 #include <QDialogButtonBox>
 #include <QHeaderView>
 #include "util/registry.hpp"
@@ -691,7 +720,7 @@ void SPrefsPanel::assoDialog()
     aTa( ".m4a" ); aTa( ".m4p" ); aTa( ".mka" ); aTa( ".mod" ); aTa( ".mp1" );
     aTa( ".mp2" ); aTa( ".mp3" ); aTa( ".ogg" ); aTa( ".spx" ); aTa( ".wav" );
     aTa( ".wma" ); aTa( ".xm" );
-    audioType->setCheckState( 0, ( i_temp > 0 ) ? 
+    audioType->setCheckState( 0, ( i_temp > 0 ) ?
                               ( ( i_temp == audioType->childCount() ) ?
                                Qt::Checked : Qt::PartiallyChecked )
                             : Qt::Unchecked );
@@ -703,7 +732,7 @@ void SPrefsPanel::assoDialog()
     aTv( ".mpeg1" ); aTv( ".mpeg2" ); aTv( ".mpeg4" ); aTv( ".mpg" );
     aTv( ".mxf" ); aTv( ".ogm" ); aTv( ".ps" ); aTv( ".ts" );
     aTv( ".vob" ); aTv( ".wmv" );
-    videoType->setCheckState( 0, ( i_temp > 0 ) ? 
+    videoType->setCheckState( 0, ( i_temp > 0 ) ?
                               ( ( i_temp == audioType->childCount() ) ?
                                Qt::Checked : Qt::PartiallyChecked )
                             : Qt::Unchecked );
@@ -711,7 +740,7 @@ void SPrefsPanel::assoDialog()
     i_temp = 0;
     aTo( ".asx" ); aTo( ".b4s" ); aTo( ".m3u" ); aTo( ".pls" ); aTo( ".vlc" );
     aTo( ".xspf" );
-    otherType->setCheckState( 0, ( i_temp > 0 ) ? 
+    otherType->setCheckState( 0, ( i_temp > 0 ) ?
                               ( ( i_temp == audioType->childCount() ) ?
                                Qt::Checked : Qt::PartiallyChecked )
                             : Qt::Unchecked );
@@ -740,14 +769,14 @@ void addAsso( QVLCRegistry *qvReg, char *psz_ext )
 
     /* Save a backup if already assigned */
     char *psz_value = qvReg->ReadRegistryString( psz_ext, "", ""  );
-    
+
     if( psz_value && strlen( psz_value ) > 0 )
         qvReg->WriteRegistryString( psz_ext, "VLC.backup", psz_value );
     delete psz_value;
-        
+
     /* Put a "link" to VLC.EXT as default */
     qvReg->WriteRegistryString( psz_ext, "", s_path.c_str() );
-    
+
     /* Create the needed Key if they weren't done in the installer */
     if( !qvReg->RegistryKeyExists( s_path.c_str() ) )
     {
@@ -757,15 +786,15 @@ void addAsso( QVLCRegistry *qvReg, char *psz_ext )
 
         /* Get the installer path */
         QVLCRegistry *qvReg2 = new QVLCRegistry( HKEY_LOCAL_MACHINE );
-        std::string str_temp; str_temp.assign( 
+        std::string str_temp; str_temp.assign(
             qvReg2->ReadRegistryString( "Software\\VideoLAN\\VLC", "", "" ) );
-        
+
         if( str_temp.size() )
         {
             qvReg->WriteRegistryString( s_path.append( "\\Play\\command" ).c_str(),
                 "", str_temp.append(" --started-from-file \"%1\"" ).c_str() );
 
-            qvReg->WriteRegistryString( s_path2.append( "\\DefaultIcon" ).c_str(), 
+            qvReg->WriteRegistryString( s_path2.append( "\\DefaultIcon" ).c_str(),
                         "", str_temp.append(",0").c_str() );
         }
         delete qvReg2;