Commit c7023526 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - add qt-error-dialogs option and fix interaction. Should fix part of #1229.

parent 4fc82e8a
......@@ -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, "errors-dialog" ) != 0 )
if( config_GetInt( p_intf, "qt-error-dialogs" ) != 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, "errors-dialog" ) != 0 )
if( config_GetInt( p_intf, "qt-error-dialogs" ) != 0 )
ErrorsDialog::getInstance( p_intf )->addWarning(
qfu( p_dialog->psz_title ),qfu( p_dialog->psz_description ) );
i_ret = 0;
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment