From fbdae71a2cef48e083d5240ed21d55a9f9ca2086 Mon Sep 17 00:00:00 2001
From: Hork <aliyuchang33@outlook.com>
Date: Wed, 17 Apr 2019 23:28:32 +0800
Subject: [PATCH] Implement system tray context menu.

---
 src/mainwindow.cpp | 54 ++++++++++++++++++++++++++++++++++++++--------
 src/mainwindow.h   |  4 ++++
 src/vinteract.cpp  |  3 +++
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a69c52b7..9bbe52dc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -23,9 +23,9 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->configTable, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showMenu(QPoint)));
     this->v2Inst = new v2Instance();
     hTray = new QSystemTrayIcon();
-    hTray->setToolTip("Hv2ray system tray");
+    hTray->setToolTip("Hv2ray");
     hTray->setIcon(QIcon("Himeki.ico"));
-    hTray->show();
+    connect(hTray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(on_activatedTray(QSystemTrayIcon::ActivationReason)));
     createTrayAction();
 }
 
@@ -133,6 +133,7 @@ void MainWindow::updateLog()
 
 void MainWindow::on_startButton_clicked()
 {
+    ui->logText->clear();
     this->v2Inst->start(this);
 }
 
@@ -173,21 +174,56 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::createTrayAction()
 {
-    QAction actionShow(this);
-    QAction actionQuit(this);
-    QAction actionStart(this);
-    QAction actionRestart(this);
-    QObject::connect(hTray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(on_activatedTray(QSystemTrayIcon::ActivationReason)));
+    QAction *actionShow = new QAction(this);
+    QAction *actionQuit = new QAction(this);
+    QAction *actionStart = new QAction(this);
+    QAction *actionRestart = new QAction(this);
+    QAction *actionStop = new QAction(this);
+    actionShow->setText("Show main widget");
+    actionQuit->setText("Quit");
+    actionStart->setText("Start v2ray");
+    actionRestart->setText("Restart v2ray");
+    actionStop->setText("Stop v2ray");
+    trayMenu->addAction(actionShow);
+    trayMenu->addAction(actionStart);
+    trayMenu->addAction(actionStop);
+    trayMenu->addAction(actionRestart);
+    trayMenu->addAction(actionQuit);
+    connect(actionShow, SIGNAL(triggered()), this, SLOT(showMainWindow()));
+    connect(actionStop, SIGNAL(triggered()), this, SLOT(on_stopButton_clicked()));
+    connect(actionQuit, SIGNAL(triggered()), this, SLOT(quit()));
+    connect(actionRestart, SIGNAL(triggered()), this, SLOT(on_restartButton_clicked()));
+    connect(actionStart, SIGNAL(triggered()), this, SLOT(on_startButton_clicked()));
+    hTray->setContextMenu(trayMenu);
+    hTray->show();
 }
 void MainWindow::on_activatedTray(QSystemTrayIcon::ActivationReason reason)
 {
     switch (reason) {
         case QSystemTrayIcon::Trigger:
-            this->show();
+            if(this->isHidden()) {
+                this->show();
+            }
             break;
         case QSystemTrayIcon::DoubleClick:
-            this->show();
+            if(this->isHidden()) {
+                this->show();
+            }
+            break;
+        case QSystemTrayIcon::MiddleClick:
+            break;
+        case QSystemTrayIcon::Unknown:
             break;
     }
 }
+void MainWindow::showMainWindow()
+{
+    if(this->isHidden()) {
+        this->show();
+    }
+}
 
+void MainWindow::quit()
+{
+    QCoreApplication::quit();
+}
diff --git a/src/mainwindow.h b/src/mainwindow.h
index e7de7924..6c860550 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -5,6 +5,7 @@
 #include <QMainWindow>
 #include "confedit.h"
 #include <QSystemTrayIcon>
+#include <QMenu>
 
 class v2Instance;
 namespace Ui
@@ -21,6 +22,7 @@ public:
     ConfEdit *e;
     v2Instance *v2Inst;
     QSystemTrayIcon *hTray;
+    QMenu *trayMenu = new QMenu(this);
     ~MainWindow();
 
 
@@ -40,6 +42,8 @@ private slots:
     void geneConf(int idIntable);
     void on_actionVmess_triggered();
     void on_activatedTray(QSystemTrayIcon::ActivationReason reason);
+    void showMainWindow();
+    void quit();
 
 private:
     Ui::MainWindow *ui;
diff --git a/src/vinteract.cpp b/src/vinteract.cpp
index c419756b..f5eeeebc 100644
--- a/src/vinteract.cpp
+++ b/src/vinteract.cpp
@@ -42,6 +42,9 @@ v2Instance::~v2Instance()
 
 void v2Instance::start(MainWindow *parent)
 {
+    if(this->v2Process->state() == QProcess::Running) {
+        this->v2Process->close();
+    }
     if (QFileInfo("v2ray").exists() && QFileInfo("geoip.dat").exists() && QFileInfo("geosite.dat").exists() ) {
         QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
         env.insert("V2RAY_LOCATION_ASSET", QDir::currentPath());