Remove the progressBar in the interface to show more clearly the bug in AVI fixing...

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index fab65696abda0d65a5dd3459602e32aebcee498f..cf18662b3f9ded6aa44f48d91ec591c933bcc9f3 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -104,18 +104,8 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
         panel->setLayout( grid );
         layout->addWidget( panel );
     }
-    else if( p_dialog->i_flags & DIALOG_INTF_PROGRESS )
-    {
-        if( p_intf->p_sys->p_mi )
-        {
-            progressBar = p_intf->p_sys->p_mi->pgBar;
-            progressBar->show();
-            i_ret = 2;
-        }
-        else
-            p_dialog->i_flags = DIALOG_USER_PROGRESS;
-    }
-    else if( p_dialog->i_flags & DIALOG_USER_PROGRESS )
+    else if( (p_dialog->i_flags & DIALOG_INTF_PROGRESS ) ||
+             ( p_dialog->i_flags & DIALOG_USER_PROGRESS ) )
     {
         dialog = new QWidget( 0 );layout = new QVBoxLayout( dialog );
         layout->setMargin( 2 );

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 93bfe8cfae911c006f74c74a2e0237d62dd3128a..d296beffb2053f83be72e779f498843a50a32eb9 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -580,12 +580,14 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
         }
         break;
     case INTERACT_HIDE:
+        msg_Dbg( p_intf, "Hide the Interaction Dialog" );
         qdialog = (InteractionDialog*)(p_dialog->p_private);
         if( qdialog )
             qdialog->hide();
         p_dialog->i_status = HIDDEN_DIALOG;
         break;
     case INTERACT_DESTROY:
+        msg_Dbg( p_intf, "Destroy the Interaction Dialog" );
         qdialog = (InteractionDialog*)(p_dialog->p_private);
         if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
             delete qdialog;

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index d413dae74ed0f16602bf540a4011ce854b288e57..718b61b09693e94ad67f918ca67e76a4992bae0e 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -57,7 +57,6 @@
 #include <QToolBar>
 #include <QGroupBox>
 #include <QDate>
-#include <QProgressBar>
 
 #include <assert.h>
 #include <vlc_keys.h>
@@ -306,13 +305,10 @@ inline void MainInterface::createStatusBar()
     speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
     nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
 
-    pgBar = new QProgressBar;
-    pgBar->hide();
 
     /* and adding those */
     statusBar()->addWidget( nameLabel, 8 );
     statusBar()->addPermanentWidget( speedLabel, 0 );
-    statusBar()->addPermanentWidget( pgBar, 0 );
     statusBar()->addPermanentWidget( timeLabel, 0 );
 
     /* timeLabel behaviour:

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index d4acacc78202dadd4be8b88fcf4051000c226193..3a1ff9b9a704b00fe7ef2b032e0ed7f09069e3f4 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -50,7 +50,6 @@ class SpeedControlWidget;
 class QMenu;
 class QSize;
 //class QDockWidet;
-class QProgressBar;
 
 enum{
     CONTROLS_HIDDEN = 0x0,
@@ -104,7 +103,6 @@ private:
     FullscreenControllerWidget *fullscreenControls;
     QMenu               *speedControlMenu;
     SpeedControlWidget  *speedControl;
-    QProgressBar        *pgBar;
 
     void handleMainUi( QSettings* );
     void askForPrivacy();