Commit f509b90d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: deinline createStatusBar() and explicit statusBar creation.

No feature change.
parent 0ee99df5
......@@ -148,7 +148,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
QVLCMenu::createMenuBar( this, p_intf, visualSelectorEnabled );
/* StatusBar Creation */
createStatusBar();
setStatusBar( createStatusBar() );
/********************
* Input Manager *
......@@ -311,8 +311,10 @@ MainInterface::~MainInterface()
* Main UI handling *
*****************************/
inline void MainInterface::createStatusBar()
QStatusBar * MainInterface::createStatusBar()
{
QStatusBar *statusBar = new QStatusBar;
/****************
* Status Bar *
****************/
......@@ -329,15 +331,16 @@ inline void MainInterface::createStatusBar()
nameLabel->setFrameStyle( QFrame::Sunken | QFrame::StyledPanel);
/* and adding those */
statusBar()->addWidget( nameLabel, 8 );
statusBar()->addPermanentWidget( speedLabel, 0 );
statusBar()->addPermanentWidget( timeLabel, 0 );
statusBar->addWidget( nameLabel, 8 );
statusBar->addPermanentWidget( speedLabel, 0 );
statusBar->addPermanentWidget( timeLabel, 0 );
/* timeLabel behaviour:
- double clicking opens the goto time dialog
- right-clicking and clicking just toggle between remaining and
elapsed time.*/
CONNECT( timeLabel, timeLabelDoubleClicked(), THEDP, gotoTimeDialog() );
return statusBar;
}
inline void MainInterface::initSystray()
......
......@@ -49,6 +49,7 @@ class FullscreenControllerWidget;
class SpeedControlWidget;
class QMenu;
class QSize;
class QStatusBar;
enum {
CONTROLS_HIDDEN = 0x0,
......@@ -117,7 +118,7 @@ private:
void createSystray();
void initSystray();
void createStatusBar();
QStatusBar * createStatusBar();
/* Video */
VideoWidget *videoWidget;
......
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