From e574279363ad205597d577f350984586066cc608 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Wed, 7 Nov 2007 17:59:24 +0000
Subject: [PATCH] Qt4 - Add some privacy options to Simple Preferences.
---
.../gui/qt4/components/simple_preferences.cpp | 2 +
modules/gui/qt4/qt4.cpp | 6 ++
modules/gui/qt4/ui/sprefs_interface.ui | 70 ++++++++++---------
3 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 408993f0bd43..e500b844b304 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -393,6 +393,8 @@ 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( "qt-updates-notif", Bool, NULL, qtUpdates );
CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo );
CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin,
skinBrowse );
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index b8079d05c50a..a51427c8dbb0 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -95,6 +95,10 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define ERROR_TEXT N_("Show unimportant error and warnings dialogs" )
#define MINIMAL_TEXT N_("Start in minimal view (menus hidden)." )
+#define UPDATER_TEXT N_("Activate the new updates notification")
+#define UPDATER_LONGTEXT N_("Activate the automatic notification of new " \
+ "versions of the software. It runs once a week." )
+
vlc_module_begin();
set_shortname( (char *)"Qt" );
set_description( (char*)_("Qt interface") );
@@ -137,6 +141,8 @@ vlc_module_begin();
ADVANCED_PREFS_LONGTEXT, VLC_FALSE );
add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT,
ERROR_TEXT, VLC_FALSE );
+ add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT,
+ UPDATER_LONGTEXT, VLC_FALSE );
add_integer( "qt-pl-showflags",
VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE|
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index 58e3e2a6f0c6..ea73709ddda7 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -6,31 +6,29 @@
<x>0</x>
<y>0</y>
<width>444</width>
- <height>362</height>
+ <height>520</height>
</rect>
</property>
<property name="windowTitle" >
<string>Form</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>10</number>
- </property>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="languageLabel" >
+ <property name="text" >
+ <string>_("Language")</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QComboBox" name="language" />
+ </item>
<item row="1" column="0" colspan="2" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>_("Default Interface")</string>
</property>
<layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item row="2" column="0" colspan="3" >
<widget class="Line" name="line" >
<property name="orientation" >
@@ -41,9 +39,7 @@
<item row="3" column="1" colspan="2" >
<widget class="QLabel" name="skinsLabel" >
<property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>3</vsizetype>
+ <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -128,28 +124,12 @@
</layout>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="language" />
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="languageLabel" >
- <property name="text" >
- <string>_("Language")</string>
- </property>
- </widget>
- </item>
<item row="2" column="0" colspan="2" >
<widget class="QGroupBox" name="OneInterfaceBox" >
<property name="title" >
<string>_("Instances")</string>
</property>
<layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
<item>
<widget class="QCheckBox" name="OneInterfaceMode" >
<property name="text" >
@@ -167,6 +147,32 @@
</layout>
</widget>
</item>
+ <item row="3" column="0" colspan="2" >
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>_("Interface / Network Interaction")</string>
+ </property>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="artFetchLabel" >
+ <property name="text" >
+ <string>_("Album art download policy")</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QComboBox" name="artFetcher" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QCheckBox" name="qtUpdates" >
+ <property name="text" >
+ <string>_("Activate update notifier")</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<tabstops>
--
GitLab