Changeset 49

Timestamp:

01/09/08 20:44:08 (4 years ago)

Author:

roeland

Message:

Playback interaction trough trayIcon possible

Location:

gui

Files:

• main_window.cpp (modified) (5 diffs)
• main_window.h (modified) (1 diff)

gui/main_window.cpp

@@ -80 +80 @@
     mpd.listAllInfo();
 
+    // Set trayIcon statuses
+    switch (mpd_status.state) {
+        case MPDStatus::State_Playing:
+            playPauseAction->setText("&Pause");
+            break;
+        case MPDStatus::State_Paused:
+            playPauseAction->setText("&Play");
+            break;
+        case MPDStatus::State_Stopped:
+            stopAction->setEnabled(false);
+            playPauseAction->setText("&Play");
+            break;
+        default:
+            break;
+    }
+
     statusTimer.start(1000);
 }
@@ -102 +118 @@
 
     //Setup Actions
-    minimizeAction = new QAction(tr("Mi&nimize"), trayIconMenu);
-    connect(minimizeAction, SIGNAL(triggered()), this, SLOT(hide()));
-
-    maximizeAction = new QAction(tr("Ma&ximize"), trayIconMenu);
-    connect(maximizeAction, SIGNAL(triggered()), this, SLOT(showMaximized()));
-
-    restoreAction = new QAction(tr("&Restore"), trayIconMenu);
-    connect(restoreAction, SIGNAL(triggered()), this, SLOT(showNormal()));
+    playPauseAction = new QAction(tr("&Play"), trayIconMenu);
+    connect(playPauseAction, SIGNAL(triggered()), this, SLOT(playPauseTrack()));
+
+    stopAction = new QAction(tr("&Stop"), trayIconMenu);
+    connect(stopAction, SIGNAL(triggered()), this, SLOT(stopTrack()));
+
+    prevAction = new QAction(tr("P&rev"), trayIconMenu);
+    connect(prevAction, SIGNAL(triggered()), this, SLOT(previousTrack()));
+
+    nextAction = new QAction(tr("&Next"), trayIconMenu);
+    connect(nextAction, SIGNAL(triggered()), this, SLOT(nextTrack()));
 
     quitAction = new QAction(tr("&Quit"), trayIconMenu);
@@ -117 +136 @@
 
     //Setup Menu
-    trayIconMenu->addAction(minimizeAction);
-    trayIconMenu->addAction(maximizeAction);
-    trayIconMenu->addAction(restoreAction);
+    trayIconMenu->addAction(prevAction);
+    trayIconMenu->addAction(nextAction);
+    trayIconMenu->addAction(stopAction);
+    trayIconMenu->addAction(playPauseAction);
     trayIconMenu->addSeparator();
     trayIconMenu->addAction(quitAction);
@@ -174 +194 @@
     mpd.stopPlaying();
     mpd.getStatus();
+    
+    stopAction->setEnabled(false);
+    playPauseAction->setText("&Play");
 }
 
@@ -180 +203 @@
     if(mpd_status.state == MPDStatus::State_Playing) {
         mpd.setPause(true);
+        playPauseAction->setText("&Play");
     } else if(mpd_status.state == MPDStatus::State_Paused) {
         mpd.setPause(false);
+        playPauseAction->setText("&Plause");
     } else {
         mpd.startPlayingSong();
+        stopAction->setEnabled(true);
+        playPauseAction->setText("&Plause");
     }
     mpd.getStatus();

gui/main_window.h

@@ -38 +38 @@
 
         bool setupTrayIcon();
-        QAction *minimizeAction;
-        QAction *maximizeAction;
-        QAction *restoreAction;
+        QAction *playPauseAction;
+        QAction *stopAction;
+        QAction *nextAction;
+        QAction *prevAction;
         QAction *quitAction;
         QSystemTrayIcon *trayIcon;