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

Qt: fix systrayIcon menu status to show correct tooltip and status.

Noticed by fenrir.
parent 44022166
...@@ -161,6 +161,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -161,6 +161,11 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
********************/ ********************/
MainInputManager::getInstance( p_intf ); MainInputManager::getInstance( p_intf );
/*********************************
* Create the Systray Management *
*********************************/
initSystray();
/************************** /**************************
* Various CONNECTs on IM * * Various CONNECTs on IM *
**************************/ **************************/
...@@ -197,6 +202,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -197,6 +202,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
this, updateSystrayTooltipStatus( int ) ); this, updateSystrayTooltipStatus( int ) );
} }
/* END CONNECTS ON IM */ /* END CONNECTS ON IM */
dialogHandler = new DialogHandler (p_intf); dialogHandler = new DialogHandler (p_intf);
...@@ -271,10 +277,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -271,10 +277,6 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
updateGeometry(); updateGeometry();
resize( sizeHint() ); resize( sizeHint() );
/*****************************************************
* End everything by creating the Systray Management *
*****************************************************/
initSystray();
} }
MainInterface::~MainInterface() MainInterface::~MainInterface()
...@@ -1094,6 +1096,7 @@ void MainInterface::updateSystrayTooltipStatus( int i_status ) ...@@ -1094,6 +1096,7 @@ void MainInterface::updateSystrayTooltipStatus( int i_status )
break; break;
} }
} }
QVLCMenu::updateSystrayMenu( this, p_intf );
} }
/************************************************************************ /************************************************************************
......
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