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

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 2ee8f3f0c82fa34a0e4a3b0213c041a67f986bdc..792db1d903808375adc414b02c7b73cd34646162 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -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;

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 5048f7483513857411c6660a87a03475d19b80c1..a9d9b3a00bc9b17e479ebeb0c6451b535d4f1208 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -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();