[vlc-commits] Qt: hide update check preference when !UPDATE_CHECK
vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf | 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 > 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 @@ Privacy / Network Interaction - - - + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + - 220 - 0 + 40 + 20 - - Album art download policy: + + + + + + + 0 + 0 + - - artFetcher + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + days + + + Every - - - - - 220 - 0 - - - - Save recently played items - - - - + Filter: @@ -119,7 +125,7 @@ - + @@ -132,17 +138,8 @@ - - - - - 0 - - - - - - + + 220 @@ -150,44 +147,38 @@ - Activate updates notifier + Save recently played items - - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 220 + 0 + - - days + + Album art download policy: - - Every + + artFetcher - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - + + + - 40 - 20 + 220 + 0 - + + Activate updates notifier + + ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: hide update check preference when !UPDATE_CHECK
vlc | branch: master | Jean-Baptiste Kempf | Tue May 15 15:21:02 2012 +0200| [88a69655ae94b045d84fd9d45daf155e1728a65a] | committer: Jean-Baptiste Kempf Qt: hide update check preference when !UPDATE_CHECK Close #6813 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=88a69655ae94b045d84fd9d45daf155e1728a65a --- 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 c2e44ce..c3bf298 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -613,7 +613,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 903df95..c0fcb91 100644 --- a/modules/gui/qt4/ui/sprefs_interface.ui +++ b/modules/gui/qt4/ui/sprefs_interface.ui @@ -71,39 +71,45 @@ Privacy / Network Interaction - - - + + + + Qt::Horizontal + + + QSizePolicy::Preferred + + - 220 - 0 + 40 + 20 - - Album art download policy: + + + + + + + 0 + 0 + - - artFetcher + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + days + + + Every - - - - - 220 - 0 - - - - Save recently played items - - - - + Filter: @@ -119,7 +125,7 @@ - + @@ -132,17 +138,8 @@ - - - - - 0 - - - - - - + + 220 @@ -150,44 +147,38 @@ - Activate updates notifier + Save recently played items - - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + 220 + 0 + - - days + + Album art download policy: - - Every + + artFetcher - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - + + + - 40 - 20 + 220 + 0 - + + Activate updates notifier + + ___ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
