optimize tray menu

jansorg · Jan 16, 2019 · 7684237 · 7684237
1 parent c218891
commit 7684237
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 33 deletions.
diff --git a/resources/images/start.svg b/resources/images/start.svg
diff --git a/resources/images/stop.svg b/resources/images/stop.svg
diff --git a/source/gotime/startStop_project_action.cpp b/source/gotime/startStop_project_action.cpp
@@ -18,22 +18,21 @@ StartProjectAction::StartProjectAction(Project &project, GotimeControl *control,
 
     connect(control, SIGNAL(projectStarted(const Project &)),
             this, SLOT(projectStarted(const Project &)));
+
     connect(control, SIGNAL(projectStopped(const Project &)),
             this, SLOT(projectStopped(const Project &)));
-//    connect(control, SIGNAL(projectCancelled(const Project &)),
-//            this, SLOT(projectStopped(const Project &)));
 }
 
 void StartProjectAction::projectStarted(const Project &project) {
     if (project.getID() == _project.getID()) {
-        this->setText("Stop: " + project.getName());
+        this->setText(project.getName());
         this->setIcon(QIcon(":/images/stop.svg"));
     }
 }
 
 void StartProjectAction::projectStopped(const Project &project) {
     if (project.getID() == _project.getID()) {
-        this->setText("Start: " + project.getName());
+        this->setText(project.getName());
         this->setIcon(QIcon(":/images/start.svg"));
     }
 }

diff --git a/source/gotime_tray_icon.cpp b/source/gotime_tray_icon.cpp
@@ -13,20 +13,21 @@ GotimeTrayIcon::GotimeTrayIcon(GotimeControl *control, QMainWindow *mainWindow)
     loadIcons();
 
     _menu = new QMenu();
-    _menu->addSection(tr("Projects"));
 
-    _separatorAction = _menu->addSeparator();
-    _separatorAction->setText("Actions");
+    _stopTaskAction = new QAction("Stop active project...");
+    _stopTaskAction->setToolTip("Stop the current project and record data.");
+    connect(_stopTaskAction, SIGNAL(triggered()), control, SLOT(stopActivity()));
+    _menu->addAction(_stopTaskAction);
 
-    QAction *stopAction = new QAction("Stop timer...");
-    connect(stopAction, SIGNAL(triggered()), control, SLOT(stopActivity()));
-    _menu->addAction(stopAction);
+    _cancelTaskAction = new QAction("Cancel active project...");
+    _cancelTaskAction->setToolTip("Stop the active project without recording new data.");
+    connect(_cancelTaskAction, SIGNAL(triggered()), control, SLOT(cancelActivity()));
+    _menu->addAction(_cancelTaskAction);
 
-    QAction *cancelAction = new QAction("Cancel timer...");
-    connect(cancelAction, SIGNAL(triggered()), control, SLOT(cancelActivity()));
-    _menu->addAction(cancelAction);
+    _menu->addSection(tr("Projects"));
 
-    _menu->addSeparator();
+    _separatorAction = _menu->addSeparator();
+    _separatorAction->setText("Actions");
     QAction *showWindowAction = new QAction("&Show window", this);
     connect(showWindowAction, &QAction::triggered, mainWindow, &QMainWindow::show);
     _menu->addAction(showWindowAction);
@@ -57,7 +58,6 @@ GotimeTrayIcon::GotimeTrayIcon(GotimeControl *control, QMainWindow *mainWindow)
 
             projectStarted(project);
         } else {
-
             projectStopped(project);
         }
     }
@@ -90,7 +90,6 @@ void GotimeTrayIcon::updateStatus() {
 
 void GotimeTrayIcon::loadIcons() {
     _stoppedIcon = QPixmap(":/images/trayicon-stopped.svg");
-
     _activeIcons << QPixmap(":/images/trayicon-1.svg");
     _activeIcons << QPixmap(":/images/trayicon-2.svg");
     _activeIcons << QPixmap(":/images/trayicon-3.svg");
@@ -108,13 +107,25 @@ void GotimeTrayIcon::projectStarted(const Project &) {
     if (!_statusUpdateTimer->isActive()) {
         _statusUpdateTimer->start(2500);
     }
+
+    _stopTaskAction->setEnabled(true);
+    _cancelTaskAction->setEnabled(true);
+
+    updateStatus();
+    updateProjects();
 }
 
 void GotimeTrayIcon::projectStopped(const Project &) {
     _trayIcon->setIcon(_stoppedIcon);
 
     _iconTimer->stop();
     _statusUpdateTimer->stop();
+
+    _stopTaskAction->setEnabled(false);
+    _cancelTaskAction->setEnabled(false);
+
+    updateStatus();
+    updateProjects();
 }
 
 void GotimeTrayIcon::updateIcon() {

diff --git a/source/gotime_tray_icon.h b/source/gotime_tray_icon.h
@@ -34,6 +34,8 @@ private slots:
     GotimeControl *_control;
     QSystemTrayIcon *_trayIcon;
     QList<QAction *> _projectActions;
+    QAction *_stopTaskAction;
+    QAction *_cancelTaskAction;
     QAction *_separatorAction;
 
     int _activeIconIndex;