mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

Changed text from after this Track to after current Track, connect started signal with additional slot, check if current track is null

Browse Source
This commit is contained in:
Stefan Derkits
2012-04-26 14:08:00 +02:00
parent 802fc1f39f
commit a191a7648b
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/TomahawkTrayIcon.cpp
View File

@@ -46,7 +46,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
m_contextMenu = new QMenu(); m_contextMenu = new QMenu();
setContextMenu( m_contextMenu ); setContextMenu( m_contextMenu );
m_stopContinueAfterTrackAction = new QAction( tr( "&Stop Playback after this Track" ), this ); m_stopContinueAfterTrackAction = new QAction( tr( "&Stop Playback after current Track" ), this );
ActionCollection *ac = ActionCollection::instance(); ActionCollection *ac = ActionCollection::instance();
m_contextMenu->addAction( ac->getAction( "playPause" ) ); m_contextMenu->addAction( ac->getAction( "playPause" ) );
@@ -75,6 +75,7 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) ); connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( enablePause() ) ); connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( enablePause() ) );
connect( AudioEngine::instance(), SIGNAL( started( Tomahawk::result_ptr ) ), SLOT( stopContinueAfterTrackStatusChanged()) );
connect( AudioEngine::instance(), SIGNAL( resumed() ), this, SLOT( enablePause() ) ); connect( AudioEngine::instance(), SIGNAL( resumed() ), this, SLOT( enablePause() ) );
connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( enablePlay() ) ); connect( AudioEngine::instance(), SIGNAL( stopped() ), this, SLOT( enablePlay() ) );
connect( AudioEngine::instance(), SIGNAL( paused() ), this, SLOT( enablePlay() ) ); connect( AudioEngine::instance(), SIGNAL( paused() ), this, SLOT( enablePlay() ) );
@@ -238,19 +239,25 @@ TomahawkTrayIcon::enablePause()
void void
TomahawkTrayIcon::stopContinueAfterTrackStatusChanged() TomahawkTrayIcon::stopContinueAfterTrackStatusChanged()
{ {
if ( AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) ) if ( !AudioEngine::instance()->currentTrack().isNull() )
m_stopContinueAfterTrackAction->setText( tr( "&Continue Playback after this Track" ) ); {
else if ( AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
m_stopContinueAfterTrackAction->setText( tr( "&Stop Playback after this Track" ) ); m_stopContinueAfterTrackAction->setText( tr( "&Continue Playback after current Track" ) );
else
m_stopContinueAfterTrackAction->setText( tr( "&Stop Playback after current Track" ) );
}
} }
void TomahawkTrayIcon::stopContinueAfterTrackActionTriggered() void TomahawkTrayIcon::stopContinueAfterTrackActionTriggered()
{ {
if ( !AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) ) if ( !AudioEngine::instance()->currentTrack().isNull() )
AudioEngine::instance()->setStopAfterTrack( AudioEngine::instance()->currentTrack()->toQuery() ); {
else if ( !AudioEngine::instance()->currentTrack()->toQuery()->equals( AudioEngine::instance()->stopAfterTrack() ) )
AudioEngine::instance()->setStopAfterTrack( Tomahawk::query_ptr() ); AudioEngine::instance()->setStopAfterTrack( AudioEngine::instance()->currentTrack()->toQuery() );
else
AudioEngine::instance()->setStopAfterTrack( Tomahawk::query_ptr() );
}
} }