#include <QToolBar>
#include <QGroupBox>
#include <QDate>
+#include <QProgressBar>
#include <assert.h>
#include <vlc_keys.h>
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:
move( settings->value( "pos", QPoint( 0, 0 ) ).toPoint() );
- resize( settings->value( "size", QSize( 350, 60 ) ).toSize() );
+ QSize newSize = settings->value( "size", QSize( 350, 60 ) ).toSize();
+ if( newSize.isValid() )
+ {
+ resize( newSize );
+ }
+ else
+ {
+ msg_Warn( p_intf, "Invalid size in constructor" );
+ }
int tgPlay = settings->value( "playlist-visible", 0 ).toInt();
settings->endGroup();
MainInterface::~MainInterface()
{
+ msg_Dbg( p_intf, "Destroying the main interface" );
+
if( playlistWidget ) playlistWidget->savingSettings( settings );
if( ExtendedDialog::exists() )
ExtendedDialog::getInstance( p_intf )->savingSettings();
p_intf->pf_request_window = NULL;
p_intf->pf_release_window = NULL;
p_intf->pf_control_window = NULL;
+ p_intf->p_sys->p_mi = NULL;
}
/*****************************
QSize MainInterface::sizeHint() const
{
int nwidth = controls->sizeHint().width();
- int nheight = controls->size().height()
- + menuBar()->size().height()
- + statusBar()->size().height();
+ int nheight = controls->isVisible() ?
+ controls->size().height()
+ + menuBar()->size().height()
+ + statusBar()->size().height()
+ : 0 ;
msg_Dbg( p_intf, "1 %i %i", nheight, nwidth );
if( VISIBLE( bgWidget ) )
if( !dockPL->isFloating() && dockPL->isVisible() && dockPL->widget() )
{
nheight += dockPL->size().height();
- nwidth = MAX( nwidth, dockPL->size().width() );
+ nwidth = __MAX( nwidth, dockPL->size().width() );
msg_Dbg( p_intf, "3 %i %i", nheight, nwidth );
}
msg_Dbg( p_intf, "4 %i %i", nheight, nwidth );
settings->endGroup();
settings->beginGroup( "playlist" );
dockPL->move( settings->value( "pos", QPoint( 0,0 ) ).toPoint() );
- dockPL->resize( settings->value( "size", QSize( 400, 300 ) ).toSize() );
+ QSize newSize = settings->value( "size", QSize( 400, 300 ) ).toSize();
+ if( newSize.isValid() )
+ dockPL->resize( newSize );
settings->endGroup();
+
dockPL->show();
playlistVisible = true;
}
TOGGLEV( menuBar() );
TOGGLEV( controls );
TOGGLEV( statusBar() );
- updateGeometry();
+ doComponentsUpdate();
}
/* Video widget cannot do this synchronously as it runs in another thread */
need_components_update = false;
}
#endif
-
- controls->updateOnTimer();
}
/*****************************************************************************