Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
c7023526
Commit
c7023526
authored
Sep 08, 2007
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - add qt-error-dialogs option and fix interaction. Should fix part of #1229.
parent
4fc82e8a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/interaction.cpp
+2
-2
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+4
-0
No files found.
modules/gui/qt4/dialogs/interaction.cpp
View file @
c7023526
...
...
@@ -52,7 +52,7 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_NONBLOCKING_ERROR
)
{
if
(
config_GetInt
(
p_intf
,
"error
s
-dialog"
)
!=
0
)
if
(
config_GetInt
(
p_intf
,
"
qt-
error-dialog
s
"
)
!=
0
)
ErrorsDialog
::
getInstance
(
p_intf
)
->
addError
(
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
i_ret
=
0
;
...
...
@@ -60,7 +60,7 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_WARNING
)
{
if
(
config_GetInt
(
p_intf
,
"error
s
-dialog"
)
!=
0
)
if
(
config_GetInt
(
p_intf
,
"
qt-
error-dialog
s
"
)
!=
0
)
ErrorsDialog
::
getInstance
(
p_intf
)
->
addWarning
(
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
i_ret
=
0
;
...
...
modules/gui/qt4/qt4.cpp
View file @
c7023526
...
...
@@ -90,6 +90,8 @@ static void ShowDialog ( intf_thread_t *, int, int, intf_dialog_args_t * );
#define SHOWFLAGS_LONGTEXT N_("Enter the sum of the options that you want: \n" \
"Title: 1; Duration: 2; Artist: 4; Genre: 8; " \
"Copyright: 16; Collection/album: 32; Rating: 256." )
#define ERROR_TEXT N_("Show unimportant error and warnings dialogs" )
vlc_module_begin
();
set_shortname
(
(
char
*
)
"Qt"
);
...
...
@@ -115,6 +117,8 @@ vlc_module_begin();
MINIMIZED_LONGTEXT
,
VLC_TRUE
);
add_bool
(
"qt-name-in-title"
,
VLC_TRUE
,
NULL
,
TITLE_TEXT
,
TITLE_LONGTEXT
,
VLC_FALSE
);
add_bool
(
"qt-error-dialogs"
,
VLC_TRUE
,
NULL
,
ERROR_TEXT
,
ERROR_TEXT
,
VLC_FALSE
)
:
add_string
(
"qt-filedialog-path"
,
NULL
,
NULL
,
FILEDIALOG_PATH_TEXT
,
FILEDIALOG_PATH_LONGTEXT
,
VLC_TRUE
);
change_autosave
();
...
...
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