From 3cc882829aab0014456f8451cc4454bf158f12c1 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Sat, 19 Dec 2020 04:26:43 -0800
Subject: [PATCH] fix PR #1601 (#1610)

* fix PR #1601

* use mono icon on macOS
---
 src/core/coreconfig.cpp                      |  15 --
 src/core/coreconfig.h                        |   9 --
 src/core/global.h                            |   2 +
 src/core/iconfig.h                           |  11 +-
 src/core/sessionconfig.cpp                   |  19 ++-
 src/core/sessionconfig.h                     |   9 ++
 src/core/singleinstanceguard.cpp             |   2 -
 src/data/core/core.qrc                       |   2 +
 src/data/core/logo/vnote_mono.png            | Bin 0 -> 10438 bytes
 src/main.cpp                                 |   8 +-
 src/widgets/dialogs/settings/editorpage.cpp  |   2 +-
 src/widgets/dialogs/settings/editorpage.h    |   1 +
 src/widgets/dialogs/settings/generalpage.cpp |  25 ++--
 src/widgets/dialogs/settings/generalpage.h   |   1 -
 src/widgets/mainwindow.cpp                   | 138 +++++++++----------
 src/widgets/mainwindow.h                     |  25 ++--
 src/widgets/systemtrayhelper.cpp             |  50 +++++++
 src/widgets/systemtrayhelper.h               |  19 +++
 src/widgets/toolbarhelper.cpp                |   5 +
 src/widgets/viewarea.h                       |   1 -
 src/widgets/widgets.pri                      |   2 +
 21 files changed, 214 insertions(+), 132 deletions(-)
 create mode 100644 src/data/core/logo/vnote_mono.png
 create mode 100644 src/widgets/systemtrayhelper.cpp
 create mode 100644 src/widgets/systemtrayhelper.h

diff --git a/src/core/coreconfig.cpp b/src/core/coreconfig.cpp
index 7c2d7cc6..56c44289 100644
--- a/src/core/coreconfig.cpp
+++ b/src/core/coreconfig.cpp
@@ -41,10 +41,6 @@ void CoreConfig::init(const QJsonObject &p_app,
     if (m_toolBarIconSize <= 0) {
         m_toolBarIconSize = 16;
     }
-
-    if (!isUndefinedKey(appObj, userObj, "minimize_to_system_tray")) {
-        m_minimizeToSystemTray = READBOOL(QStringLiteral("minimize_to_system_tray")) ? 1 : 0;
-    }
 }
 
 QJsonObject CoreConfig::toJson() const
@@ -54,9 +50,6 @@ QJsonObject CoreConfig::toJson() const
     obj[QStringLiteral("locale")] = m_locale;
     obj[QStringLiteral("shortcuts")] = saveShortcuts();
     obj[QStringLiteral("toolbar_icon_size")] = m_toolBarIconSize;
-    if (m_minimizeToSystemTray != -1) {
-        obj[QStringLiteral("minimize_to_system_tray")] = m_minimizeToSystemTray > 0;
-    }
     return obj;
 }
 
@@ -130,11 +123,3 @@ void CoreConfig::setToolBarIconSize(int p_size)
     Q_ASSERT(p_size > 0);
     updateConfig(m_toolBarIconSize, p_size, this);
 }
-
-int CoreConfig::getMinimizeToSystemTray() const {
-    return m_minimizeToSystemTray;
-}
-
-void CoreConfig::setMinimizeToSystemTray(bool state){
-    updateConfig(m_minimizeToSystemTray, int(state), this);
-}
diff --git a/src/core/coreconfig.h b/src/core/coreconfig.h
index 533a74d4..71d61806 100644
--- a/src/core/coreconfig.h
+++ b/src/core/coreconfig.h
@@ -48,9 +48,6 @@ namespace vnotex
         int getToolBarIconSize() const;
         void setToolBarIconSize(int p_size);
 
-        int getMinimizeToSystemTray() const;
-        void setMinimizeToSystemTray(bool state);
-
         static const QStringList &getAvailableLocales();
 
     private:
@@ -70,12 +67,6 @@ namespace vnotex
         // Icon size of MainWindow tool bar.
         int m_toolBarIconSize = 16;
 
-        // Whether to minimize to tray.
-        // -1 for prompting for user;
-        // 0 for disabling minimizing to system tray;
-        // 1 for enabling minimizing to system tray;
-        int m_minimizeToSystemTray = -1;
-
         static QStringList s_availableLocales;
     };
 } // ns vnotex
diff --git a/src/core/global.h b/src/core/global.h
index 1c9962a3..88a727c9 100644
--- a/src/core/global.h
+++ b/src/core/global.h
@@ -73,6 +73,8 @@ namespace vnotex
     };
     Q_DECLARE_FLAGS(FindOptions, FindOption);
 
+    enum { RESTART_EXIT_CODE = 1000 };
+
 } // ns vnotex
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(vnotex::FindOptions);
diff --git a/src/core/iconfig.h b/src/core/iconfig.h
index daf0db78..27412734 100644
--- a/src/core/iconfig.h
+++ b/src/core/iconfig.h
@@ -130,10 +130,13 @@ namespace vnotex
                                    const QJsonObject &p_user,
                                    const QString &p_key)
         {
-            if (p_user.find(p_key) == p_user.end() && p_default.find(p_key) == p_default.end()) {
-                return true;
-            }
-            return false;
+            return !p_default.contains(p_key) && !p_user.contains(p_key);
+        }
+
+        static bool isUndefinedKey(const QJsonObject &p_obj,
+                                   const QString &p_key)
+        {
+            return !p_obj.contains(p_key);
         }
 
         template <typename T>
diff --git a/src/core/sessionconfig.cpp b/src/core/sessionconfig.cpp
index 29c6df46..4a0273d3 100644
--- a/src/core/sessionconfig.cpp
+++ b/src/core/sessionconfig.cpp
@@ -72,7 +72,7 @@ void SessionConfig::loadCore(const QJsonObject &p_session)
         m_openGL = stringToOpenGL(option);
     }
 
-    if (coreObj.contains(QStringLiteral("system_title_bar"))) {
+    if (!isUndefinedKey(coreObj, QStringLiteral("system_title_bar"))) {
         m_systemTitleBarEnabled = readBool(coreObj, QStringLiteral("system_title_bar"));
     } else {
         // Enable system title bar on macOS by default.
@@ -82,6 +82,10 @@ void SessionConfig::loadCore(const QJsonObject &p_session)
         m_systemTitleBarEnabled = false;
 #endif
     }
+
+    if (!isUndefinedKey(coreObj, QStringLiteral("minimize_to_system_tray"))) {
+        m_minimizeToSystemTray = readBool(coreObj, QStringLiteral("minimize_to_system_tray")) ? 1 : 0;
+    }
 }
 
 QJsonObject SessionConfig::saveCore() const
@@ -91,6 +95,9 @@ QJsonObject SessionConfig::saveCore() const
     coreObj[QStringLiteral("current_notebook_root_folder_path")] = m_currentNotebookRootFolderPath;
     coreObj[QStringLiteral("opengl")] = openGLToString(m_openGL);
     coreObj[QStringLiteral("system_title_bar")] = m_systemTitleBarEnabled;
+    if (m_minimizeToSystemTray != -1) {
+        coreObj[QStringLiteral("minimize_to_system_tray")] = m_minimizeToSystemTray > 0;
+    }
     return coreObj;
 }
 
@@ -260,3 +267,13 @@ void SessionConfig::setSystemTitleBarEnabled(bool p_enabled)
 {
     updateConfig(m_systemTitleBarEnabled, p_enabled, this);
 }
+
+int SessionConfig::getMinimizeToSystemTray() const
+{
+    return m_minimizeToSystemTray;
+}
+
+void SessionConfig::setMinimizeToSystemTray(bool p_enabled)
+{
+    updateConfig(m_minimizeToSystemTray, p_enabled ? 1 : 0, this);
+}
diff --git a/src/core/sessionconfig.h b/src/core/sessionconfig.h
index d91d9a26..5b6dcf22 100644
--- a/src/core/sessionconfig.h
+++ b/src/core/sessionconfig.h
@@ -79,6 +79,9 @@ namespace vnotex
         static QString openGLToString(OpenGL p_option);
         static OpenGL stringToOpenGL(const QString &p_str);
 
+        int getMinimizeToSystemTray() const;
+        void setMinimizeToSystemTray(bool p_enabled);
+
     private:
         void loadCore(const QJsonObject &p_session);
 
@@ -105,6 +108,12 @@ namespace vnotex
 
         // Whether use system's title bar or not.
         bool m_systemTitleBarEnabled = false;
+
+        // Whether to minimize to tray.
+        // -1 for prompting for user;
+        // 0 for disabling minimizing to system tray;
+        // 1 for enabling minimizing to system tray.
+        int m_minimizeToSystemTray = -1;
     };
 } // ns vnotex
 
diff --git a/src/core/singleinstanceguard.cpp b/src/core/singleinstanceguard.cpp
index f16e6029..daeaeed6 100644
--- a/src/core/singleinstanceguard.cpp
+++ b/src/core/singleinstanceguard.cpp
@@ -23,8 +23,6 @@ bool SingleInstanceGuard::tryRun()
     // this will attach to the old segment, then exit, freeing the old segment.
     if (m_sharedMemory.attach()) {
         qInfo() << "another instance is running";
-        // So try to show it?
-        showInstance();
         return false;
     }
 
diff --git a/src/data/core/core.qrc b/src/data/core/core.qrc
index e348781a..46ba2be0 100644
--- a/src/data/core/core.qrc
+++ b/src/data/core/core.qrc
@@ -74,5 +74,7 @@
         <file>icons/find_replace_editor.svg</file>
         <file>logo/vnote.svg</file>
         <file>logo/vnote.png</file>
+        <file>logo/256x256/vnote.png</file>
+        <file>logo/vnote_mono.png</file>
     </qresource>
 </RCC>
diff --git a/src/data/core/logo/vnote_mono.png b/src/data/core/logo/vnote_mono.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcea9434a3f8c0c326956abb5d1c10608b428590
GIT binary patch
literal 10438
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
N5Vs6(R%kj${~rqT&&&V-

literal 0
HcmV?d00001

diff --git a/src/main.cpp b/src/main.cpp
index b0156529..a4c5e13e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,6 +8,7 @@
 #include <QOpenGLContext>
 #include <QDateTime>
 #include <QSysInfo>
+#include <QProcess>
 
 #include <core/configmgr.h>
 #include <core/mainconfig.h>
@@ -16,13 +17,12 @@
 #include <core/singleinstanceguard.h>
 #include <core/vnotex.h>
 #include <core/logger.h>
+#include <core/global.h>
 #include <widgets/mainwindow.h>
 #include <QWebEngineSettings>
 #include <core/exception.h>
 #include <widgets/messageboxhelper.h>
 
-#include <QProcess>
-
 using namespace vnotex;
 
 void loadTranslators(QApplication &p_app);
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
 
     loadTranslators(app);
 
-    MainWindow window(nullptr);
+    MainWindow window;
 
     window.show();
     VNoteX::getInst().getThemeMgr().setBaseBackground(window.palette().color(QPalette::Base));
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
     int ret = app.exec();
     if (ret == RESTART_EXIT_CODE) {
-        // Ask to restart VNote.
+        // Asked to restart VNote.
         guard.exit();
         QProcess::startDetached(qApp->applicationFilePath(), QStringList());
         return 0;
diff --git a/src/widgets/dialogs/settings/editorpage.cpp b/src/widgets/dialogs/settings/editorpage.cpp
index 49d8958b..9624f928 100644
--- a/src/widgets/dialogs/settings/editorpage.cpp
+++ b/src/widgets/dialogs/settings/editorpage.cpp
@@ -43,7 +43,7 @@ void EditorPage::setupUI()
         m_toolBarIconSizeSpinBox->setRange(1, 48);
         m_toolBarIconSizeSpinBox->setSingleStep(1);
 
-        const QString label(tr("Toolbar icon size:"));
+        const QString label(tr("Tool bar icon size:"));
         mainLayout->addRow(label, m_toolBarIconSizeSpinBox);
         addSearchItem(label, m_toolBarIconSizeSpinBox->toolTip(), m_toolBarIconSizeSpinBox);
         connect(m_toolBarIconSizeSpinBox, QOverload<int>::of(&QSpinBox::valueChanged),
diff --git a/src/widgets/dialogs/settings/editorpage.h b/src/widgets/dialogs/settings/editorpage.h
index 8e39e791..5f53b22f 100644
--- a/src/widgets/dialogs/settings/editorpage.h
+++ b/src/widgets/dialogs/settings/editorpage.h
@@ -28,6 +28,7 @@ namespace vnotex
         void setupUI();
 
         QComboBox *m_autoSavePolicyComboBox = nullptr;
+
         QSpinBox *m_toolBarIconSizeSpinBox = nullptr;
     };
 }
diff --git a/src/widgets/dialogs/settings/generalpage.cpp b/src/widgets/dialogs/settings/generalpage.cpp
index d44e2e16..74b0ddee 100644
--- a/src/widgets/dialogs/settings/generalpage.cpp
+++ b/src/widgets/dialogs/settings/generalpage.cpp
@@ -57,21 +57,23 @@ void GeneralPage::setupUI()
     }
 #endif
 
-#if not defined(Q_OS_MACOS)
+#if !defined(Q_OS_MACOS)
     {
-        m_systemTrayCheckBox = WidgetsFactory::createCheckBox("System tray");
+        const QString label(tr("Minimize to system tray"));
+        m_systemTrayCheckBox = WidgetsFactory::createCheckBox(label, this);
+        m_systemTrayCheckBox->setToolTip(tr("Minimize to system tray when closing"));
         mainLayout->addRow(m_systemTrayCheckBox);
-
+        addSearchItem(label, m_systemTrayCheckBox->toolTip(), m_systemTrayCheckBox);
         connect(m_systemTrayCheckBox, &QCheckBox::stateChanged,
                 this, &GeneralPage::pageIsChanged);
     }
 #endif
-
 }
 
 void GeneralPage::loadInternal()
 {
     const auto &coreConfig = ConfigMgr::getInst().getCoreConfig();
+    const auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
 
     {
         int idx = m_localeComboBox->findData(coreConfig.getLocale());
@@ -80,22 +82,21 @@ void GeneralPage::loadInternal()
     }
 
     if (m_openGLComboBox) {
-        const auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
         int idx = m_openGLComboBox->findData(sessionConfig.getOpenGL());
         Q_ASSERT(idx != -1);
         m_openGLComboBox->setCurrentIndex(idx);
     }
 
-    if(m_systemTrayCheckBox){
-        auto toTray = coreConfig.getMinimizeToSystemTray();
-        if(toTray)
-            m_systemTrayCheckBox->setChecked(true);
+    if (m_systemTrayCheckBox) {
+        int toTray = sessionConfig.getMinimizeToSystemTray();
+        m_systemTrayCheckBox->setChecked(toTray > 0);
     }
 }
 
 void GeneralPage::saveInternal()
 {
     auto &coreConfig = ConfigMgr::getInst().getCoreConfig();
+    auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
 
     {
         auto locale = m_localeComboBox->currentData().toString();
@@ -103,13 +104,13 @@ void GeneralPage::saveInternal()
     }
 
     if (m_openGLComboBox) {
-        auto &sessionConfig = ConfigMgr::getInst().getSessionConfig();
         int opt = m_openGLComboBox->currentData().toInt();
         sessionConfig.setOpenGL(static_cast<SessionConfig::OpenGL>(opt));
     }
 
-    if(m_systemTrayCheckBox) {
-        coreConfig.setMinimizeToSystemTray(m_systemTrayCheckBox->isChecked());
+    if (m_systemTrayCheckBox) {
+        // This will override the -1 state. That is fine.
+        sessionConfig.setMinimizeToSystemTray(m_systemTrayCheckBox->isChecked());
     }
 }
 
diff --git a/src/widgets/dialogs/settings/generalpage.h b/src/widgets/dialogs/settings/generalpage.h
index 90717e6d..af4e580e 100644
--- a/src/widgets/dialogs/settings/generalpage.h
+++ b/src/widgets/dialogs/settings/generalpage.h
@@ -29,7 +29,6 @@ namespace vnotex
         QComboBox *m_openGLComboBox = nullptr;
 
         QCheckBox *m_systemTrayCheckBox = nullptr;
-
     };
 }
 
diff --git a/src/widgets/mainwindow.cpp b/src/widgets/mainwindow.cpp
index f15af38e..18a939ea 100644
--- a/src/widgets/mainwindow.cpp
+++ b/src/widgets/mainwindow.cpp
@@ -16,8 +16,7 @@
 #include <QApplication>
 #include <QShortcut>
 #include <QSystemTrayIcon>
-#include <QMenu>
-#include <QIcon>
+#include <QWindowStateChangeEvent>
 
 #include "toolbox.h"
 #include "notebookexplorer.h"
@@ -30,12 +29,14 @@
 #include <core/coreconfig.h>
 #include <core/events.h>
 #include <core/fileopenparameters.h>
+#include <core/global.h>
 #include <widgets/dialogs/scrolldialog.h>
 #include "viewwindow.h"
 #include "outlineviewer.h"
 #include <utils/widgetutils.h>
 #include "navigationmodemgr.h"
-#include <widgets/messageboxhelper.h>
+#include "messageboxhelper.h"
+#include "systemtrayhelper.h"
 
 #include <vtoolbar.h>
 
@@ -50,18 +51,11 @@ MainWindow::MainWindow(QWidget *p_parent)
 
     setupUI();
 
-    initSystemTrayIcon();
-
     setupShortcuts();
 
     loadStateAndGeometry();
 
-#if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
-    QApplication::setQuitOnLastWindowClosed(false);
-#endif
-
-    // The signal is particularly useful if your application has
-    // to do some last-second cleanup.
+    // The signal is particularly useful if your application has to do some last-second cleanup.
     // Note that no user interaction is possible in this state.
     connect(qApp, &QCoreApplication::aboutToQuit,
             this, &MainWindow::closeOnQuit);
@@ -91,6 +85,7 @@ void MainWindow::setupUI()
     setupDocks();
     setupToolBar();
     setupStatusBar();
+    setupSystemTray();
 
     activateDock(m_docks[DockIndex::NavigationDock]);
 }
@@ -289,36 +284,27 @@ void MainWindow::setupNotebookExplorer(QWidget *p_parent)
 
 void MainWindow::closeEvent(QCloseEvent *p_event)
 {
-    // TODO: support minimized to system tray.
+    const int toTray = ConfigMgr::getInst().getSessionConfig().getMinimizeToSystemTray();
+    bool isExit = m_requestQuit > -1 || toTray == 0;
+    const int exitCode = m_requestQuit;
+    m_requestQuit = -1;
 
-    auto toTray = ConfigMgr::getInst().getCoreConfig().getMinimizeToSystemTray();
-    bool isExit = m_requestQuit;
-    m_requestQuit = 0;
-
-    if (isVisible()) {
-        saveStateAndGeometry();
-    }
-
-#if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
     // Do not support minimized to tray on macOS.
-    if (!isExit) {
-        p_event->accept();
-        return;
-    }
+    isExit = true;
 #endif
 
     if(!isExit && toTray == -1){
         int ret =  MessageBoxHelper::questionYesNo(MessageBoxHelper::Question,
-                                                   tr("Close VNote"),
-                                                   tr("Do you want to minimize VNote to system tray "
-                                                      "instead of quitting it when closing VNote?"),
+                                                   tr("Close %1").arg(qApp->applicationName()),
+                                                   tr("Do you want to minimize %1 to system tray "
+                                                      "instead of quitting when closing %1?").arg(qApp->applicationName()),
                                                    tr("You could change the option in Settings later."),
                                                    this);
         if (ret == QMessageBox::Yes) {
-            ConfigMgr::getInst().getCoreConfig().setMinimizeToSystemTray(true);
-            hide();
+            ConfigMgr::getInst().getSessionConfig().setMinimizeToSystemTray(true);
         } else if (ret == QMessageBox::No) {
-            ConfigMgr::getInst().getCoreConfig().setMinimizeToSystemTray(false);
+            ConfigMgr::getInst().getSessionConfig().setMinimizeToSystemTray(false);
             isExit = true;
         } else {
             p_event->ignore();
@@ -326,10 +312,11 @@ void MainWindow::closeEvent(QCloseEvent *p_event)
         }
     }
 
-    if(isExit || toTray == 0 || !m_trayIcon->isVisible()){
-        // really to quit, process workspace
-        // TODO: process workspace
+    if (isVisible()) {
+        saveStateAndGeometry();
+    }
 
+    if (isExit || !m_trayIcon->isVisible()) {
         // Signal out the close event.
         auto event = QSharedPointer<Event>::create();
         event->m_response = true;
@@ -341,8 +328,8 @@ void MainWindow::closeEvent(QCloseEvent *p_event)
         }
 
         QMainWindow::closeEvent(p_event);
-        qApp->quit();
-    }else {
+        qApp->exit(exitCode > -1 ? exitCode : 0);
+    } else {
         hide();
         p_event->ignore();
     }
@@ -523,7 +510,7 @@ void MainWindow::setStayOnTop(bool p_enabled)
     bool shown = isVisible();
     Qt::WindowFlags flags = windowFlags();
 
-    Qt::WindowFlags magicFlag = Qt::WindowStaysOnTopHint;
+    const Qt::WindowFlags magicFlag = Qt::WindowStaysOnTopHint;
     if (p_enabled) {
         setWindowFlags(flags | magicFlag);
     } else {
@@ -535,42 +522,49 @@ void MainWindow::setStayOnTop(bool p_enabled)
     }
 }
 
-void MainWindow::initSystemTrayIcon(){
-    QMenu *menu = new QMenu(this);
-    QAction *showMainWindowAct = menu->addAction(tr("Show VNote"));
-    connect(showMainWindowAct, &QAction::triggered,
-            this, &MainWindow::show);
-
-    QAction *exitAct = menu->addAction(tr("Quit"));
-    connect(exitAct, &QAction::triggered,
-            this, [this](){
-                this->m_requestQuit = 1;
-                this->close();
-                });
-
-    QIcon sysIcon(":/vnotex/data/core/logo/vnote.png");
-
-#if defined(Q_OS_MACOS) || defined(Q_OS_MAC)
-    sysIcon.setIsMask(true);
-#endif
-
-    m_trayIcon = new QSystemTrayIcon(sysIcon, this);
-    m_trayIcon->setToolTip(tr("VNote"));
-    m_trayIcon->setContextMenu(menu);
-
-    connect(m_trayIcon, &QSystemTrayIcon::activated,
-            this, [this](QSystemTrayIcon::ActivationReason p_reason){
-#if !defined(Q_OS_MACOS) && !defined(Q_OS_MAC)
-                if (p_reason == QSystemTrayIcon::Trigger) {
-                    this->show();
-                    this->activateWindow();
-                }
-#endif
-            });
-
+void MainWindow::setupSystemTray()
+{
+    m_trayIcon = SystemTrayHelper::setupSystemTray(this);
     m_trayIcon->show();
 }
 
-void MainWindow::restart(){
-    QCoreApplication::exit(RESTART_EXIT_CODE);
+void MainWindow::restart()
+{
+    m_requestQuit = RESTART_EXIT_CODE;
+    close();
+}
+
+void MainWindow::changeEvent(QEvent *p_event)
+{
+    if (p_event->type() == QEvent::WindowStateChange) {
+        QWindowStateChangeEvent *eve = static_cast<QWindowStateChangeEvent *>(p_event);
+        m_windowOldState = eve->oldState();
+    }
+
+    QMainWindow::changeEvent(p_event);
+}
+
+void MainWindow::showMainWindow()
+{
+    if (isMinimized()) {
+        if (m_windowOldState & Qt::WindowMaximized) {
+            showMaximized();
+        } else if (m_windowOldState & Qt::WindowFullScreen) {
+            showFullScreen();
+        } else {
+            showNormal();
+        }
+    } else {
+        show();
+        // Need to call raise() in macOS.
+        raise();
+    }
+
+    activateWindow();
+}
+
+void MainWindow::quitApp()
+{
+    m_requestQuit = 0;
+    close();
 }
diff --git a/src/widgets/mainwindow.h b/src/widgets/mainwindow.h
index 1b739eeb..3fd5bea2 100644
--- a/src/widgets/mainwindow.h
+++ b/src/widgets/mainwindow.h
@@ -7,8 +7,6 @@
 #include "toolbarhelper.h"
 #include "statusbarhelper.h"
 
-#define RESTART_EXIT_CODE   1000
-
 class QDockWidget;
 class QSystemTrayIcon;
 
@@ -47,6 +45,10 @@ namespace vnotex
 
         void restart();
 
+        void showMainWindow();
+
+        void quitApp();
+
     signals:
         void mainWindowStarted();
 
@@ -61,6 +63,8 @@ namespace vnotex
     protected:
         void closeEvent(QCloseEvent *p_event) Q_DECL_OVERRIDE;
 
+        void changeEvent(QEvent *p_event) Q_DECL_OVERRIDE;
+
     private slots:
         void closeOnQuit();
 
@@ -105,13 +109,7 @@ namespace vnotex
 
         void setupShortcuts();
 
-        // Init system tray and correspondign context menu.
-        void initSystemTrayIcon();
-
-        // Tray icon.
-        QSystemTrayIcon *m_trayIcon;
-
-        bool m_requestQuit = false;
+        void setupSystemTray();
 
         ToolBarHelper m_toolBarHelper;
 
@@ -130,7 +128,14 @@ namespace vnotex
         QVector<QDockWidget *> m_docks;
 
         bool m_layoutReset = false;
-        
+
+        // -1: do not request to quit;
+        // 0 and above: exit code.
+        int m_requestQuit = -1;
+
+        Qt::WindowStates m_windowOldState = Qt::WindowMinimized;
+
+        QSystemTrayIcon *m_trayIcon = nullptr;
     };
 } // ns vnotex
 
diff --git a/src/widgets/systemtrayhelper.cpp b/src/widgets/systemtrayhelper.cpp
new file mode 100644
index 00000000..1b97bc06
--- /dev/null
+++ b/src/widgets/systemtrayhelper.cpp
@@ -0,0 +1,50 @@
+#include "systemtrayhelper.h"
+
+#include <QMenu>
+#include <QIcon>
+#include <QSystemTrayIcon>
+#include <QApplication>
+
+#include "mainwindow.h"
+#include "widgetsfactory.h"
+
+using namespace vnotex;
+
+QSystemTrayIcon *SystemTrayHelper::setupSystemTray(MainWindow *p_win)
+{
+#if defined(Q_OS_MACOS)
+    QIcon icon(":/vnotex/data/core/logo/vnote_mono.png");
+    icon.setIsMask(true);
+#else
+    QIcon icon(":/vnotex/data/core/logo/256x256/vnote.png");
+#endif
+
+    auto trayIcon = new QSystemTrayIcon(icon, p_win);
+    trayIcon->setToolTip(qApp->applicationName());
+
+    MainWindow::connect(trayIcon, &QSystemTrayIcon::activated,
+                        p_win, [p_win](QSystemTrayIcon::ActivationReason p_reason) {
+#if !defined(Q_OS_MACOS)
+                            if (p_reason == QSystemTrayIcon::Trigger) {
+                                p_win->showMainWindow();
+                            }
+#endif
+                        });
+
+    auto menu = WidgetsFactory::createMenu(p_win);
+    trayIcon->setContextMenu(menu);
+
+    menu->addAction(MainWindow::tr("Show Main Window"),
+                    menu,
+                    [p_win]() {
+                        p_win->showMainWindow();
+                    });
+
+    menu->addAction(MainWindow::tr("Quit"),
+                    menu,
+                    [p_win]() {
+                        p_win->quitApp();
+                    });
+
+    return trayIcon;
+}
diff --git a/src/widgets/systemtrayhelper.h b/src/widgets/systemtrayhelper.h
new file mode 100644
index 00000000..b50666aa
--- /dev/null
+++ b/src/widgets/systemtrayhelper.h
@@ -0,0 +1,19 @@
+#ifndef SYSTEMTRAYHELPER_H
+#define SYSTEMTRAYHELPER_H
+
+class QSystemTrayIcon;
+
+namespace vnotex
+{
+    class MainWindow;
+
+    class SystemTrayHelper
+    {
+    public:
+        SystemTrayHelper() = delete;
+
+        static QSystemTrayIcon *setupSystemTray(MainWindow *p_win);
+    };
+}
+
+#endif // SYSTEMTRAYHELPER_H
diff --git a/src/widgets/toolbarhelper.cpp b/src/widgets/toolbarhelper.cpp
index 487492b2..6731dadc 100644
--- a/src/widgets/toolbarhelper.cpp
+++ b/src/widgets/toolbarhelper.cpp
@@ -308,6 +308,11 @@ QToolBar *ToolBarHelper::setupSettingsToolBar(MainWindow *p_win, QToolBar *p_too
 
         menu->addSeparator();
 
+        menu->addAction(MainWindow::tr("Quit"),
+                        menu,
+                        [p_win]() {
+                            p_win->quitApp();
+                        });
         menu->addAction(MainWindow::tr("Restart"),
                         menu,
                         [p_win]() {
diff --git a/src/widgets/viewarea.h b/src/widgets/viewarea.h
index 404c49a7..b4864c33 100644
--- a/src/widgets/viewarea.h
+++ b/src/widgets/viewarea.h
@@ -13,7 +13,6 @@
 
 class QLayout;
 class QSplitter;
-class QTimer;
 
 namespace vnotex
 {
diff --git a/src/widgets/widgets.pri b/src/widgets/widgets.pri
index 2bab2a94..634fefc9 100644
--- a/src/widgets/widgets.pri
+++ b/src/widgets/widgets.pri
@@ -43,6 +43,7 @@ SOURCES += \
     $$PWD/outlineprovider.cpp \
     $$PWD/outlineviewer.cpp \
     $$PWD/propertydefs.cpp \
+    $$PWD/systemtrayhelper.cpp \
     $$PWD/textviewwindow.cpp \
     $$PWD/toolbarhelper.cpp \
     $$PWD/treeview.cpp \
@@ -122,6 +123,7 @@ HEADERS += \
     $$PWD/outlineprovider.h \
     $$PWD/outlineviewer.h \
     $$PWD/propertydefs.h \
+    $$PWD/systemtrayhelper.h \
     $$PWD/textviewwindow.h \
     $$PWD/textviewwindowhelper.h \
     $$PWD/toolbarhelper.h \