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

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 9e25a52dd7c2bb79025e914ce253a115d8d4be42..31936d5ee55ba04226b1792757b75ad399b99292 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -435,8 +435,11 @@ 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, updatesBox );
             CONFIG_GENERIC_NO_BOOL( "qt-updates-days", Integer, NULL,

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 620fc5420030f2934b1c1d3aa3176291fb2ca42f..63fbe6f133485e0efdafd63b83675d72bf8726e4 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -537,6 +537,8 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
     CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); line++;
     CONFIG_GENERIC_NOBOOL( "qt-updates-days", Integer ); line++;
 #endif
+    CONFIG_GENERIC( "security-policy", IntegerList ); line++;
+
     QPushButton *ok = new QPushButton( qtr( "Ok" ) );
 
     gLayout->addWidget( ok, 2, 2 );

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index bf5864d2b3fc170fa65e9575216cbe2c8063c932..5bf9650a5d80c482dbeed6d55d788628afc5e285 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>483</width>
-    <height>583</height>
+    <height>617</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -239,6 +239,16 @@
         </property>
        </widget>
       </item>
+      <item row="3" column="0" >
+       <widget class="QLabel" name="netPolicyLabel" >
+        <property name="text" >
+         <string>_("Network policy")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2" >
+       <widget class="QComboBox" name="netPolicyBox" />
+      </item>
      </layout>
     </widget>
    </item>