Commit 2dc29d7d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - small changes and factorisations in CONNECTs

parent 84dd91ce
...@@ -124,21 +124,30 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf ) ...@@ -124,21 +124,30 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
/* Volume control */ /* Volume control */
CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) ); CONNECT( ui.volumeSlider, valueChanged(int), this, updateVolume(int) );
/* Connect the input manager to the GUI elements it manages */ /* Connect the input manager to the GUI elements it manages */
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
slider, setPosition( float,int, int ) ); slider, setPosition( float,int, int ) );
CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ), CONNECT( THEMIM->getIM(), positionUpdated( float, int, int ),
this, setDisplay( float, int, int ) ); this, setDisplay( float, int, int ) );
/* Naming in the controller */
CONNECT( THEMIM->getIM(), nameChanged( QString ), this, CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setName( QString ) ); setName( QString ) );
if( config_GetInt( p_intf, "qt-name-in-title" ) )
{
CONNECT( THEMIM->getIM(), nameChanged( QString ), this,
setVLCWindowsTitle( QString ) );
}
/* PLAY_STATUS */
CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) ); CONNECT( THEMIM->getIM(), statusChanged( int ), this, setStatus( int ) );
CONNECT( THEMIM->getIM(), statusChanged( int ), this,
updateSystrayMenu( int ) );
CONNECT( THEMIM->getIM(), navigationChanged( int ), CONNECT( THEMIM->getIM(), navigationChanged( int ),
this, setNavigation(int) ); this, setNavigation(int) );
CONNECT( slider, sliderDragged( float ), CONNECT( slider, sliderDragged( float ),
THEMIM->getIM(), sliderUpdate( float ) ); THEMIM->getIM(), sliderUpdate( float ) );
/* Buttons */
CONNECT( ui.prevSectionButton, clicked(), THEMIM->getIM(), CONNECT( ui.prevSectionButton, clicked(), THEMIM->getIM(),
sectionPrev() ); sectionPrev() );
CONNECT( ui.nextSectionButton, clicked(), THEMIM->getIM(), CONNECT( ui.nextSectionButton, clicked(), THEMIM->getIM(),
...@@ -723,11 +732,7 @@ void MainInterface::setDisplay( float pos, int time, int length ) ...@@ -723,11 +732,7 @@ void MainInterface::setDisplay( float pos, int time, int length )
void MainInterface::setName( QString name ) void MainInterface::setName( QString name )
{ {
nameLabel->setText( " " + name+" " ); nameLabel->setText( " " + name+" " );
if( config_GetInt( p_intf, "qt-name-in-title" ) )
{
setVLCWindowsTitle( name );
}
} }
void MainInterface::setStatus( int status ) void MainInterface::setStatus( int status )
...@@ -736,6 +741,7 @@ void MainInterface::setStatus( int status ) ...@@ -736,6 +741,7 @@ void MainInterface::setStatus( int status )
ui.playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) ); ui.playButton->setIcon( QIcon( ":/pixmaps/pause.png" ) );
else else
ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) ); ui.playButton->setIcon( QIcon( ":/pixmaps/play.png" ) );
updateSystrayMenu( status );
} }
#define HELP_MENU N_("Menu") #define HELP_MENU N_("Menu")
......
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