mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-02-24 11:53:09 +01:00
Code Issues Releases Wiki Activity

Merge pull request #37 from Horrendus/master

Browse Source 
Make a Play/Pause entry in Menu of the Trayicon
This commit is contained in:
Christian Muehlhaeuser 2011-08-21 17:25:09 -07:00
commit 4200975576
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tomahawktrayicon.cpp
View File

@ -42,8 +42,8 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
m_contextMenu = new QMenu();
setContextMenu( m_contextMenu );
m_playAction = m_contextMenu->addAction( tr( "Play" ) );
m_pauseAction = m_contextMenu->addAction( tr( "Pause" ) );
m_playPauseAction = m_contextMenu->addAction( tr( "Play" ) );
//m_pauseAction = m_contextMenu->addAction( tr( "Pause" ) );
m_stopAction = m_contextMenu->addAction( tr( "Stop" ) );
m_contextMenu->addSeparator();
m_prevAction = m_contextMenu->addAction( tr( "Previous Track" ) );
@ -62,13 +62,16 @@ TomahawkTrayIcon::TomahawkTrayIcon( QObject* parent )
connect( AudioEngine::instance(), SIGNAL( loading( Tomahawk::result_ptr ) ), SLOT( setResult( Tomahawk::result_ptr ) ) );
connect( m_playAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( play() ) );
connect( m_pauseAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( pause() ) );
connect( m_playPauseAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( playPause() ) );
connect( m_stopAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( stop() ) );
connect( m_prevAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( previous() ) );
connect( m_nextAction, SIGNAL( triggered() ), AudioEngine::instance(), SLOT( next() ) );
connect( m_quitAction, SIGNAL( triggered() ), (QObject*)APP, SLOT( quit() ) );
connect( AudioEngine::instance(), SIGNAL( paused() ), this, SLOT( onPause() ) );
connect( AudioEngine::instance(), SIGNAL( stopped()), this, SLOT( onPause() ) );
connect( AudioEngine::instance(), SIGNAL( resumed()), this, SLOT( onResume() ) );
connect( &m_animationTimer, SIGNAL( timeout() ), SLOT( onAnimationTimer() ) );
connect( this, SIGNAL( activated( QSystemTrayIcon::ActivationReason ) ), SLOT( onActivated( QSystemTrayIcon::ActivationReason ) ) );
@ -191,6 +194,17 @@ TomahawkTrayIcon::onActivated( QSystemTrayIcon::ActivationReason reason )
}
}
void
TomahawkTrayIcon::onPause()
{
m_playPauseAction->setText( tr( "Play" ) );
}
void
TomahawkTrayIcon::onResume()
{
m_playPauseAction->setText( tr( "Pause" ) );
}
bool
TomahawkTrayIcon::event( QEvent* e )

6
src/tomahawktrayicon.h
View File

@ -41,6 +41,8 @@ public slots:
private slots:
void onAnimationTimer();
void onActivated( QSystemTrayIcon::ActivationReason reason );
void onPause();
void onResume();
void showWindow();
private:
@ -54,8 +56,8 @@ private:
int m_currentAnimationFrame;
QMenu* m_contextMenu;
QAction* m_playAction;
QAction* m_pauseAction;
QAction* m_playPauseAction;
//QAction* m_pauseAction;
QAction* m_stopAction;
QAction* m_prevAction;
QAction* m_nextAction;