Commit 3f9a678b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

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

Remove the progressBar in the interface to show more clearly the bug in AVI fixing. Add debug too...
parent e0915e7b
...@@ -104,18 +104,8 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf, ...@@ -104,18 +104,8 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
panel->setLayout( grid ); panel->setLayout( grid );
layout->addWidget( panel ); layout->addWidget( panel );
} }
else if( p_dialog->i_flags & DIALOG_INTF_PROGRESS ) else if( (p_dialog->i_flags & DIALOG_INTF_PROGRESS ) ||
{ ( p_dialog->i_flags & DIALOG_USER_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 )
{ {
dialog = new QWidget( 0 );layout = new QVBoxLayout( dialog ); dialog = new QWidget( 0 );layout = new QVBoxLayout( dialog );
layout->setMargin( 2 ); layout->setMargin( 2 );
......
...@@ -580,12 +580,14 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg ) ...@@ -580,12 +580,14 @@ void DialogsProvider::doInteraction( intf_dialog_args_t *p_arg )
} }
break; break;
case INTERACT_HIDE: case INTERACT_HIDE:
msg_Dbg( p_intf, "Hide the Interaction Dialog" );
qdialog = (InteractionDialog*)(p_dialog->p_private); qdialog = (InteractionDialog*)(p_dialog->p_private);
if( qdialog ) if( qdialog )
qdialog->hide(); qdialog->hide();
p_dialog->i_status = HIDDEN_DIALOG; p_dialog->i_status = HIDDEN_DIALOG;
break; break;
case INTERACT_DESTROY: case INTERACT_DESTROY:
msg_Dbg( p_intf, "Destroy the Interaction Dialog" );
qdialog = (InteractionDialog*)(p_dialog->p_private); qdialog = (InteractionDialog*)(p_dialog->p_private);
if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR ) if( !p_dialog->i_flags & DIALOG_NONBLOCKING_ERROR )
delete qdialog; delete qdialog;
......
...@@ -57,7 +57,6 @@ ...@@ -57,7 +57,6 @@
#include <QToolBar> #include <QToolBar>
#include <QGroupBox> #include <QGroupBox>
#include <QDate> #include <QDate>
#include <QProgressBar>
#include <assert.h> #include <assert.h>
#include <vlc_keys.h> #include <vlc_keys.h>
...@@ -306,13 +305,10 @@ inline void MainInterface::createStatusBar() ...@@ -306,13 +305,10 @@ inline void MainInterface::createStatusBar()
speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel ); speedLabel->setFrameStyle( QFrame::Sunken | QFrame::Panel );
nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel); nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
pgBar = new QProgressBar;
pgBar->hide();
/* and adding those */ /* and adding those */
statusBar()->addWidget( nameLabel, 8 ); statusBar()->addWidget( nameLabel, 8 );
statusBar()->addPermanentWidget( speedLabel, 0 ); statusBar()->addPermanentWidget( speedLabel, 0 );
statusBar()->addPermanentWidget( pgBar, 0 );
statusBar()->addPermanentWidget( timeLabel, 0 ); statusBar()->addPermanentWidget( timeLabel, 0 );
/* timeLabel behaviour: /* timeLabel behaviour:
......
...@@ -50,7 +50,6 @@ class SpeedControlWidget; ...@@ -50,7 +50,6 @@ class SpeedControlWidget;
class QMenu; class QMenu;
class QSize; class QSize;
//class QDockWidet; //class QDockWidet;
class QProgressBar;
enum{ enum{
CONTROLS_HIDDEN = 0x0, CONTROLS_HIDDEN = 0x0,
...@@ -104,7 +103,6 @@ private: ...@@ -104,7 +103,6 @@ private:
FullscreenControllerWidget *fullscreenControls; FullscreenControllerWidget *fullscreenControls;
QMenu *speedControlMenu; QMenu *speedControlMenu;
SpeedControlWidget *speedControl; SpeedControlWidget *speedControl;
QProgressBar *pgBar;
void handleMainUi( QSettings* ); void handleMainUi( QSettings* );
void askForPrivacy(); void askForPrivacy();
......
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