Merge pull request #5 from MeshAndrey/Notification

Notification

Author: MeshAndrey

src/MainWindow.cpp

@@ -91,6 +91,16 @@ void MainWindow::showMessageBox(QString message)
     msg.exec();
 }
 
+void MainWindow::showNotification(QString title, QString message)
+{
+    trayIcon->showMessage(title, message, QSystemTrayIcon::Information, 5000);
+}
+
+void MainWindow::showErrorNotification(QString title, QString message)
+{
+    trayIcon->showMessage(title, message, QSystemTrayIcon::Critical, 5000);
+}
+
 void MainWindow::showHideWindow()
 {
     setVisible(!isVisible());

src/MainWindow.h

@@ -16,14 +16,15 @@ class MainWindow : public QMainWindow
     QSystemTrayIcon* trayIcon;
     QMenu*           trayIconMenu;
 
-    void showEvent(QShowEvent* event);
-    void hideEvent(QHideEvent* event);
-    void closeEvent(QCloseEvent* event);
-
 private slots:
     void addButtonClicked();
     void showHideWindow();
 
+protected:
+    void showEvent(QShowEvent* event);
+    void hideEvent(QHideEvent* event);
+    void closeEvent(QCloseEvent* event);
+
 public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
@@ -32,5 +33,7 @@ private slots:
                        QWidget* newWidget);
 
     void showMessageBox(QString message);
+    void showNotification(QString title, QString message);
+    void showErrorNotification(QString title, QString message);
 };
 #endif // MAINWINDOW_H

src/widgets/TimerWidget.cpp

@@ -1,7 +1,7 @@
 #include "TimerWidget.h"
 #include "AlarmWidget.h"
 #include "InputWidget.h"
-#include "../MainWindow.h"
+
 #include "../TimeUtils.h"
 
 TimerWidget::TimerWidget(QString name, int timerValue,
@@ -105,16 +105,37 @@ void TimerWidget::stopButtonClicked()
     updateTimer->stop();
     timer->stop();
 
-    auto mainWindow = static_cast<MainWindow*>(this->parent()->parent()->parent()->parent());
+    auto mainWindow = getMainWindow();
+    if (mainWindow == nullptr)
+    {
+        showMessageBox("MainWindow is nullptr");
+        return;
+    }
+
     mainWindow->replaceWidget(this, new InputWidget(static_cast<QWidget*>(this->parent())));
 }
 
 void TimerWidget::timerTimeout()
 {
-    if (!shellCommand.isEmpty())
-        executeProcess(shellCommand);
+    auto mainWindow = getMainWindow();
+    if (mainWindow == nullptr)
+    {
+        showMessageBox("MainWindow is nullptr");
+        return;
+    }
 
-    auto mainWindow = static_cast<MainWindow*>(this->parent()->parent()->parent()->parent());
+    if (!shellCommand.isEmpty())
+    {
+        if (!executeProcess(shellCommand))
+        {
+            const QString message = QString("Process \"%1\" not started")
+                                        .arg(shellCommand);
+            showMessageBox(message);
+            mainWindow->showErrorNotification(name, message);
+        }
+        else
+            mainWindow->showNotification(name, QString("\"%1\" was executed").arg(shellCommand));
+    }
 
     if (autoStopAlarm)
     {
@@ -130,12 +151,12 @@ void TimerWidget::timerTimeout()
     }
 }
 
-void TimerWidget::executeProcess(const QString program)
+bool TimerWidget::executeProcess(const QString program)
 {
     if (program == "")
     {
         showMessageBox("Empty program param");
-        return;
+        return false;
     }
 
     QStringList splitedProgramCommand = program.split(" ");
@@ -153,11 +174,10 @@ void TimerWidget::executeProcess(const QString program)
         process->start(appName, appArgs);
 
     if (process->waitForStarted(3000)) // if ok
-        return;
+        return true;
 
-    showMessageBox(QString("Process %1 %2 not started")
-                      .arg(program, splitedProgramCommand.join(" ")));
     delete process;
+    return false;
 }
 
 void TimerWidget::updateTimerTimeout()
@@ -176,3 +196,8 @@ void TimerWidget::showMessageBox(const QString message)
     msg.setText(message);
     msg.exec();
 }
+
+MainWindow* TimerWidget::getMainWindow()
+{
+    return static_cast<MainWindow*>(this->parent()->parent()->parent()->parent());
+}

src/widgets/TimerWidget.h

@@ -5,6 +5,8 @@
 #include <QWidget>
 #include <QtWidgets>
 
+#include "../MainWindow.h"
+
 class TimerWidget : public QWidget
 {
     Q_OBJECT
@@ -24,7 +26,9 @@ class TimerWidget : public QWidget
     void initLayout();
     void initConnections();
     void showMessageBox(const QString message);
-    void executeProcess(const QString program);
+    bool executeProcess(const QString program);
+
+    MainWindow* getMainWindow();
 
 private slots:
     void pauseResumeButtonCLicked();