summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2018-08-15 10:19:43 +0200
committerArno <arno@disconnect.de>2018-08-15 10:19:43 +0200
commit63f968ae97dc70b7ad436eab2adfaa1e983005f7 (patch)
tree8cdfb63e5dc484035df5fa1357ef2df884e45a24
parent8243c41ee9c3f0b59f8d36cd74113b49b139ddce (diff)
downloadBeetPlayer-63f968ae97dc70b7ad436eab2adfaa1e983005f7.tar.gz
BeetPlayer-63f968ae97dc70b7ad436eab2adfaa1e983005f7.tar.bz2
BeetPlayer-63f968ae97dc70b7ad436eab2adfaa1e983005f7.zip
Fix tray icon behavior
Make it display the right icon when shortcuts are used.
-rw-r--r--playerwidget.cpp19
-rw-r--r--playerwidget.h1
2 files changed, 13 insertions, 7 deletions
diff --git a/playerwidget.cpp b/playerwidget.cpp
index 5dcae99..30efedc 100644
--- a/playerwidget.cpp
+++ b/playerwidget.cpp
@@ -485,12 +485,6 @@ void PlayerWidget::doPlay(){
return;
}
- if(mPlayer->state() == QMediaPlayer::PausedState){
- mPlayer->play();
- mPlayA->setChecked(true);
- emit playModeChanged(tr("Playing"));
- return;
- }
QModelIndexList sel = mSongView->selectionModel()->selectedRows();
if(mPlayer->state() == QMediaPlayer::StoppedState){
if(sel.isEmpty()){
@@ -524,11 +518,22 @@ void PlayerWidget::doPause(){
void PlayerWidget::doPlayOrPause(){
if(mPlayA->isChecked()){
doPause();
- }else if(mPauseA->isChecked() || mStopA->isChecked()){
+ }else if(mPauseA->isChecked()){
+ doContinue();
+
+ }else if (mStopA->isChecked()){
doPlay();
}
}
+void PlayerWidget::doContinue(){
+ mPlayer->play();
+ mPlayA->setChecked(true);
+ emit playModeChanged(tr("Playing"));
+ mTrayIcon->setIcon(QIcon(":/play.png"));
+ mTrayIcon->setToolTip(tr("[Playing]"));
+}
+
void PlayerWidget::volumeUp(){
adjustVolume(2);
}
diff --git a/playerwidget.h b/playerwidget.h
index 5859cb1..da13747 100644
--- a/playerwidget.h
+++ b/playerwidget.h
@@ -42,6 +42,7 @@ class PlayerWidget : public QWidget {
void doStop();
void doPause();
void doPlayOrPause();
+ void doContinue();
void volumeUp();
void volumeDown();
void showVolume();