[vlc-devel] commit: Fix #1808 on AVI fixing. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Aug  3 17:23:55 2008 -0700| [d8f50ad69409a3f8d1c5a06e810dbaf669d6b41a] | committer: Jean-Baptiste Kempf 

Fix #1808 on AVI fixing.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8f50ad69409a3f8d1c5a06e810dbaf669d6b41a
---

 modules/gui/qt4/dialogs/interaction.cpp |   16 ++++++++++++++--
 modules/gui/qt4/main_interface.cpp      |    2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 45e3351..a8d55f7 100644
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -20,6 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -58,7 +59,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
             ErrorsDialog::getInstance( p_intf )->addError(
                  qfu( p_dialog->psz_title ), qfu( p_dialog->psz_description ) );
         i_ret = 0;
-        //  QApplication::style()->standardPixmap(QStyle::SP_MessageBoxCritical)
     }
     else if( p_dialog->i_flags & DIALOG_WARNING )
     {
@@ -119,6 +119,7 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
     {
         progressBar = p_intf->p_sys->p_mi->pgBar;
         progressBar->show();
+        i_ret = 2;
     }
     else if( p_dialog->i_flags & DIALOG_PSZ_INPUT_OK_CANCEL )
     {
@@ -131,18 +132,24 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
         layout->addWidget( inputEdit );
     }
     else
-        msg_Err( p_intf, "unknown dialog type %i", p_dialog->i_flags );
+    {
+        msg_Err( p_intf, "Unknown dialog type %i", p_dialog->i_flags );
+        return;
+    }
 
     /* We used a message box */
     if( i_ret != -1 )
     {
         if( i_ret == 0 ) Finish( DIALOG_OK_YES );
         else if ( i_ret == 1 ) Finish( DIALOG_NO );
+        else if ( i_ret == 2 ) return ;
         else Finish( DIALOG_CANCELLED );
     }
     else
     /* Custom box, finish it */
     {
+        assert( dialog );
+        /* Start the DialogButtonBox config */
         QDialogButtonBox *buttonBox = new QDialogButtonBox;
 
         if( p_dialog->psz_default_button )
@@ -165,12 +172,17 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
             buttonBox->addButton( otherButton, QDialogButtonBox::ActionRole );
         }
         layout->addWidget( buttonBox );
+        /* End the DialogButtonBox */
+
+        /* CONNECTs */
         if( p_dialog->psz_default_button )
             BUTTONACT( defaultButton, defaultB() );
         if( p_dialog->psz_alternate_button )
             BUTTONACT( altButton, altB() );
         if( p_dialog->psz_other_button )
             BUTTONACT( otherButton, otherB() );
+
+        /* set the layouts and thte title */
         dialog->setLayout( layout );
         dialog->setWindowTitle( qfu( p_dialog->psz_title ) );
     }
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 69be9a8..38b6feb 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -900,7 +900,7 @@ void MainInterface::setName( QString name )
 
 void MainInterface::setStatus( int status )
 {
-    msg_Dbg( p_intf, "I was here, updating your status" );
+    msg_Dbg( p_intf, "Updating the stream status: %i", status );
 
     /* Forward the status to the controls to toggle Play/Pause */
     controls->setStatus( status );