Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
e033388d
Commit
e033388d
authored
Jan 20, 2008
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable "qt-updates-notif" when update checking is not enabled
parent
81220127
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+2
-0
modules/gui/qt4/main_interface.cpp
modules/gui/qt4/main_interface.cpp
+2
-1
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+3
-1
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
e033388d
...
@@ -421,7 +421,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
...
@@ -421,7 +421,9 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
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
(
"fetch-meta"
,
Bool
,
NULL
,
metaFetcher
);
#ifdef UPDATE_CHECK
CONFIG_GENERIC
(
"qt-updates-notif"
,
Bool
,
NULL
,
qtUpdates
);
CONFIG_GENERIC
(
"qt-updates-notif"
,
Bool
,
NULL
,
qtUpdates
);
#endif
CONFIG_GENERIC
(
"qt-always-video"
,
Bool
,
NULL
,
qtAlwaysVideo
);
CONFIG_GENERIC
(
"qt-always-video"
,
Bool
,
NULL
,
qtAlwaysVideo
);
CONFIG_GENERIC
(
"embeded-video"
,
Bool
,
NULL
,
embedVideo
);
CONFIG_GENERIC
(
"embeded-video"
,
Bool
,
NULL
,
embedVideo
);
CONFIG_GENERIC_FILE
(
"skins2-last"
,
File
,
NULL
,
fileSkin
,
CONFIG_GENERIC_FILE
(
"skins2-last"
,
File
,
NULL
,
fileSkin
,
...
...
modules/gui/qt4/main_interface.cpp
View file @
e033388d
...
@@ -514,8 +514,9 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
...
@@ -514,8 +514,9 @@ int MainInterface::privacyDialog( QList<ConfigControl *> controls )
CONFIG_GENERIC
(
"album-art"
,
IntegerList
);
line
++
;
CONFIG_GENERIC
(
"album-art"
,
IntegerList
);
line
++
;
CONFIG_GENERIC_NOBOOL
(
"fetch-meta"
,
Bool
);
line
++
;
CONFIG_GENERIC_NOBOOL
(
"fetch-meta"
,
Bool
);
line
++
;
#ifdef UPDATE_CHECK
CONFIG_GENERIC_NOBOOL
(
"qt-updates-notif"
,
Bool
);
CONFIG_GENERIC_NOBOOL
(
"qt-updates-notif"
,
Bool
);
#endif
QPushButton
*
ok
=
new
QPushButton
(
qtr
(
"Ok"
)
);
QPushButton
*
ok
=
new
QPushButton
(
qtr
(
"Ok"
)
);
gLayout
->
addWidget
(
ok
,
2
,
2
);
gLayout
->
addWidget
(
ok
,
2
,
2
);
...
...
modules/gui/qt4/qt4.cpp
View file @
e033388d
...
@@ -104,7 +104,7 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
...
@@ -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 ERROR_TEXT N_( "Show unimportant error and warnings dialogs" )
#define MINIMAL_TEXT N_( "Start in minimal view (menus hidden)." )
#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 " \
#define UPDATER_LONGTEXT N_( "Activate the automatic notification of new " \
"versions of the software. It runs once a week." )
"versions of the software. It runs once a week." )
...
@@ -165,8 +165,10 @@ vlc_module_begin();
...
@@ -165,8 +165,10 @@ vlc_module_begin();
ADVANCED_PREFS_LONGTEXT
,
VLC_FALSE
);
ADVANCED_PREFS_LONGTEXT
,
VLC_FALSE
);
add_bool
(
"qt-error-dialogs"
,
VLC_TRUE
,
NULL
,
ERROR_TEXT
,
add_bool
(
"qt-error-dialogs"
,
VLC_TRUE
,
NULL
,
ERROR_TEXT
,
ERROR_TEXT
,
VLC_FALSE
);
ERROR_TEXT
,
VLC_FALSE
);
#ifdef UPDATE_CHECK
add_bool
(
"qt-updates-notif"
,
VLC_TRUE
,
NULL
,
UPDATER_TEXT
,
add_bool
(
"qt-updates-notif"
,
VLC_TRUE
,
NULL
,
UPDATER_TEXT
,
UPDATER_LONGTEXT
,
VLC_FALSE
);
UPDATER_LONGTEXT
,
VLC_FALSE
);
#endif
add_integer
(
"qt-pl-showflags"
,
add_integer
(
"qt-pl-showflags"
,
VLC_META_ENGINE_ARTIST
|
VLC_META_ENGINE_TITLE
|
VLC_META_ENGINE_ARTIST
|
VLC_META_ENGINE_TITLE
|
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment