From e033388de62713a6ca424be46550f20f3561715b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 20 Jan 2008 19:35:03 +0000 Subject: [PATCH] Disable "qt-updates-notif" when update checking is not enabled --- modules/gui/qt4/components/simple_preferences.cpp | 2 ++ modules/gui/qt4/main_interface.cpp | 3 ++- modules/gui/qt4/qt4.cpp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp index a7827c0126..8c6eaba677 100644 --- a/modules/gui/qt4/components/simple_preferences.cpp +++ b/modules/gui/qt4/components/simple_preferences.cpp @@ -421,7 +421,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent, CONFIG_GENERIC( "album-art", IntegerList, ui.artFetchLabel, artFetcher ); CONFIG_GENERIC( "fetch-meta", Bool, NULL, metaFetcher ); +#ifdef UPDATE_CHECK CONFIG_GENERIC( "qt-updates-notif", Bool, NULL, qtUpdates ); +#endif CONFIG_GENERIC( "qt-always-video", Bool, NULL, qtAlwaysVideo ); CONFIG_GENERIC( "embeded-video", Bool, NULL, embedVideo ); CONFIG_GENERIC_FILE( "skins2-last", File, NULL, fileSkin, diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp index 6be82ff133..0c8022d086 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -514,8 +514,9 @@ int MainInterface::privacyDialog( QList controls ) CONFIG_GENERIC( "album-art", IntegerList ); line++; CONFIG_GENERIC_NOBOOL( "fetch-meta", Bool ); line++; +#ifdef UPDATE_CHECK CONFIG_GENERIC_NOBOOL( "qt-updates-notif", Bool ); - +#endif QPushButton *ok = new QPushButton( qtr( "Ok" ) ); gLayout->addWidget( ok, 2, 2 ); diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index 4db396fdf3..6d87172bcc 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -104,7 +104,7 @@ 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_TEXT N_( "Activate the updates availability notification" ) #define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \ "versions of the software. It runs once a week." ) @@ -165,8 +165,10 @@ vlc_module_begin(); ADVANCED_PREFS_LONGTEXT, VLC_FALSE ); add_bool( "qt-error-dialogs", VLC_TRUE, NULL, ERROR_TEXT, ERROR_TEXT, VLC_FALSE ); +#ifdef UPDATE_CHECK add_bool( "qt-updates-notif", VLC_TRUE, NULL, UPDATER_TEXT, UPDATER_LONGTEXT, VLC_FALSE ); +#endif add_integer( "qt-pl-showflags", VLC_META_ENGINE_ARTIST|VLC_META_ENGINE_TITLE| -- 2.39.2