[vlc-commits] Qt: hide update check preference when !UPDATE_CHECK
Jean-Baptiste Kempf
git at videolan.org
Tue May 15 15:22:15 CEST 2012
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May 15 15:21:02 2012 +0200| [b3354a635282d80945645158f18b4701a36a21c0] | committer: Jean-Baptiste Kempf
Qt: hide update check preference when !UPDATE_CHECK
Close #6813
(cherry picked from commit 88a69655ae94b045d84fd9d45daf155e1728a65a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b3354a635282d80945645158f18b4701a36a21c0
---
modules/gui/qt4/components/simple_preferences.cpp | 3 +-
modules/gui/qt4/ui/sprefs_interface.ui | 115 ++++++++++-----------
2 files changed, 55 insertions(+), 63 deletions(-)
diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index cb314e9..9d67382 100644
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -612,7 +612,8 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
CONNECT( ui.updatesBox, toggled( bool ),
ui.updatesDays, setEnabled( bool ) );
#else
- ui.updateNotifierZone->hide();
+ ui.updatesBox->hide();
+ ui.updatesDays->hide();
#endif
/* ONE INSTANCE options */
#if defined( WIN32 ) || defined( HAVE_DBUS ) || defined(__APPLE__)
diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index dacf55a..ea5da97 100644
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -71,39 +71,45 @@
<string>Privacy / Network Interaction</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <widget class="QLabel" name="artFetchLabel">
- <property name="minimumSize">
+ <item row="2" column="1">
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Preferred</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
<size>
- <width>220</width>
- <height>0</height>
+ <width>40</width>
+ <height>20</height>
</size>
</property>
- <property name="text">
- <string>Album art download policy:</string>
+ </spacer>
+ </item>
+ <item row="1" column="3">
+ <widget class="QSpinBox" name="updatesDays">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="buddy">
- <cstring>artFetcher</cstring>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="suffix">
+ <string> days</string>
+ </property>
+ <property name="prefix">
+ <string>Every </string>
</property>
</widget>
</item>
<item row="0" column="3" colspan="2">
<widget class="QComboBox" name="artFetcher"/>
</item>
- <item row="3" column="0">
- <widget class="QCheckBox" name="saveRecentlyPlayed">
- <property name="minimumSize">
- <size>
- <width>220</width>
- <height>0</height>
- </size>
- </property>
- <property name="text">
- <string>Save recently played items</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
+ <item row="2" column="2">
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>Filter:</string>
@@ -119,7 +125,7 @@
</property>
</widget>
</item>
- <item row="3" column="3" colspan="2">
+ <item row="2" column="3" colspan="2">
<widget class="QLineEdit" name="recentlyPlayedFilters">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -132,17 +138,8 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="5">
- <widget class="QWidget" name="updateNotifierZone" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="margin">
- <number>0</number>
- </property>
- </layout>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="updatesBox">
+ <item row="2" column="0">
+ <widget class="QCheckBox" name="saveRecentlyPlayed">
<property name="minimumSize">
<size>
<width>220</width>
@@ -150,44 +147,38 @@
</size>
</property>
<property name="text">
- <string>Activate updates notifier</string>
+ <string>Save recently played items</string>
</property>
</widget>
</item>
- <item row="1" column="3">
- <widget class="QSpinBox" name="updatesDays">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <item row="0" column="0">
+ <widget class="QLabel" name="artFetchLabel">
+ <property name="minimumSize">
+ <size>
+ <width>220</width>
+ <height>0</height>
+ </size>
</property>
- <property name="suffix">
- <string> days</string>
+ <property name="text">
+ <string>Album art download policy:</string>
</property>
- <property name="prefix">
- <string>Every </string>
+ <property name="buddy">
+ <cstring>artFetcher</cstring>
</property>
</widget>
</item>
- <item row="3" column="1">
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Preferred</enum>
- </property>
- <property name="sizeHint" stdset="0">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="updatesBox">
+ <property name="minimumSize">
<size>
- <width>40</width>
- <height>20</height>
+ <width>220</width>
+ <height>0</height>
</size>
</property>
- </spacer>
+ <property name="text">
+ <string>Activate updates notifier</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
More information about the vlc-commits
mailing list