From 4dd2d2ddb6418e581fae66482fe3f655b2990d74 Mon Sep 17 00:00:00 2001
From: Gres <gres@gres.biz>
Date: Wed, 1 Apr 2020 19:54:54 +0300
Subject: [PATCH] Add ability to show translator from menu and close it

---
 src/manager.cpp              |  6 ++++++
 src/manager.h                |  1 +
 src/settingseditor.cpp       |  2 ++
 src/translate/translator.cpp | 11 -----------
 src/translate/translator.h   |  1 -
 src/trayicon.cpp             |  6 ++++++
 6 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/manager.cpp b/src/manager.cpp
index ff2016a..9a45b30 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -278,6 +278,12 @@ void Manager::showLast()
   representer_->showLast();
 }
 
+void Manager::showTranslator()
+{
+  SOFT_ASSERT(translator_, return );
+  translator_->show();
+}
+
 void Manager::copyLastToClipboard()
 {
   SOFT_ASSERT(representer_, return );
diff --git a/src/manager.h b/src/manager.h
index e4309fc..cdb998d 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -22,6 +22,7 @@ public:
   void repeatCapture();
   void captureLocked();
   void showLast();
+  void showTranslator();
   void settings();
   void copyLastToClipboard();
   void about();
diff --git a/src/settingseditor.cpp b/src/settingseditor.cpp
index be1573a..65fcaec 100644
--- a/src/settingseditor.cpp
+++ b/src/settingseditor.cpp
@@ -20,6 +20,8 @@ SettingsEditor::SettingsEditor(Manager &manager, update::Loader &updater)
 {
   ui->setupUi(this);
 
+  ui->translatorDebugCheck->hide();
+
   connect(ui->buttonBox, &QDialogButtonBox::clicked,  //
           this, &SettingsEditor::handleButtonBoxClicked);
 
diff --git a/src/translate/translator.cpp b/src/translate/translator.cpp
index c61257b..56c2e46 100644
--- a/src/translate/translator.cpp
+++ b/src/translate/translator.cpp
@@ -138,12 +138,6 @@ void Translator::updateSettings()
   }
 
   for (const auto &script : loaded) createPage(script.first, script.second);
-
-  if (settings_.debugMode) {
-    show();
-  } else {
-    hide();
-  }
 }
 
 void Translator::createPage(const QString &scriptName,
@@ -311,8 +305,3 @@ void Translator::timerEvent(QTimerEvent * /*event*/)
 {
   processQueue();
 }
-
-void Translator::closeEvent(QCloseEvent *event)
-{
-  event->ignore();
-}
diff --git a/src/translate/translator.h b/src/translate/translator.h
index c1fda13..25a4f8f 100644
--- a/src/translate/translator.h
+++ b/src/translate/translator.h
@@ -26,7 +26,6 @@ public:
 
 protected:
   void timerEvent(QTimerEvent *event) override;
-  void closeEvent(QCloseEvent *event) override;
 
 private:
   WebPage *currentPage() const;
diff --git a/src/trayicon.cpp b/src/trayicon.cpp
index 5b8059b..d39c7dc 100644
--- a/src/trayicon.cpp
+++ b/src/trayicon.cpp
@@ -219,6 +219,12 @@ QMenu *TrayIcon::contextMenu()
     }
   }
 
+  {
+    auto action = menu->addAction(tr("Show translator"));
+    connect(action, &QAction::triggered,  //
+            this, [this] { manager_.showTranslator(); });
+  }
+
   {
     settingsAction_ = menu->addAction(tr("Settings"));
     connect(settingsAction_, &QAction::triggered,  //