frontend: Tray launch improvements

* Hide running in tray notification if ran with `--tray`
* Keep running after last visible window is closed when hidden in tray

Fixes #446
Fixes #320
Signed-off-by: Mubashshir <ahmubashshir@gmail.com>

Author: ahmubashshir

src/engine/fcitx/openbangla.conf

@@ -1,7 +1,7 @@
 [InputMethod]
 Name=OpenBangla Keyboard
 Icon=openbangla-keyboard
-Label=বাং
+Label=বা
 LangCode=bn
 Addon=openbangla
 Configurable=True

src/frontend/TopBar.cpp

@@ -36,6 +36,20 @@
 #include "FileSystem.h"
 #include "ui_TopBar.h"
 
+#include <iostream>
+
+static void notifyTrayStart(QSystemTrayIcon* tray) {
+  if (qApp->property("invokedAsTray").toBool()) return;
+  uint count = gSettings->getTrayInfoCount();
+  if (count >= 4) return;
+  if (gSettings->getTopBarVisibility()) return;
+
+  tray->showMessage("OpenBangla Keyboard", "Currently running in the system tray.\n"
+                    "You can use the tray icon to change keyboard layouts and other "
+                    "settings and to show the TopBar again.");
+  // Update the counter to show only the message for the first three times
+  gSettings->setTrayInfoCount(count + 1);
+}
 
 TopBar::TopBar(bool darkIcon, QWidget *parent) :
   QMainWindow(parent),
@@ -74,17 +88,11 @@ TopBar::TopBar(bool darkIcon, QWidget *parent) :
   SetupPopupMenus();
   SetupTrayIcon();
   DataMigration();
-
-  uint count = gSettings->getTrayInfoCount();
-  if(count < 4 && !gSettings->getTopBarVisibility()) {
-    tray->showMessage("OpenBangla Keyboard", "Currently running in the system tray.\n"
-                      "You can use the tray icon to change keyboard layouts and other "
-                      "settings and to show the TopBar again.");
-    // Update the counter to show only the message for the first three times
-    gSettings->setTrayInfoCount(count + 1);
-  }
+  notifyTrayStart(tray);
 }
 
+
+
 TopBar::~TopBar() {
   /* Dialogs */
   delete layoutViewer;
@@ -140,7 +148,7 @@ void TopBar::SetupPopupMenus() {
   // Icon Button Popup Menu
   iconMenuHide = new QAction("Hide this TopBar", this);
   connect(iconMenuHide, &QAction::triggered, [&]() {
-    this->setVisible(false);
+    this->hide();
     trayTopBarVisibility->setText("Show the TopBar");
   });
 
@@ -184,16 +192,18 @@ void TopBar::SetupTrayIcon() {
   connect(traySettings, &QAction::triggered, this, &TopBar::on_buttonSettings_clicked);
 
   trayTopBarVisibility = new QAction(
-    gSettings->getTopBarVisibility() ? "Hide the TopBar" : "Show the TopBar",
+    (this->isVisible())
+      ? "Hide the TopBar"
+      : "Show the TopBar",
     this
   );
 
   connect(trayTopBarVisibility, &QAction::triggered, [&]() {
     if(this->isVisible()) {
-      this->setVisible(false);
+      this->hide();
       trayTopBarVisibility->setText("Show the TopBar");
     } else {
-      this->setVisible(true);
+      this->show();
       trayTopBarVisibility->setText("Hide the TopBar");
     }
   });
@@ -211,7 +221,7 @@ void TopBar::SetupTrayIcon() {
   trayMenu->addAction(trayQuit);
 
   tray->setContextMenu(trayMenu);
-  tray->setVisible(true);
+  tray->show();
 }
 
 void TopBar::RefreshLayouts() {
@@ -335,7 +345,8 @@ void TopBar::on_buttonIcon_clicked() {
 
 void TopBar::closeEvent(QCloseEvent *event) {
   gSettings->setTopBarWindowPosition(this->pos());
-  gSettings->setTopBarVisibility(this->isVisible());
+  if(! qApp->property("invokedAsTray").toBool())
+    gSettings->setTopBarVisibility(this->isVisible());
   event->accept();
 }
 
@@ -377,7 +388,8 @@ void TopBar::on_buttonSetLayout_clicked() {
 
 void TopBar::on_buttonShutdown_clicked() {
   gSettings->setTopBarWindowPosition(this->pos());
-  gSettings->setTopBarVisibility(this->isVisible());
+  if(! qApp->property("invokedAsTray").toBool())
+    gSettings->setTopBarVisibility(this->isVisible());
   QApplication::exit();
 }
 

src/frontend/main.cpp

@@ -65,9 +65,11 @@ int main(int argc, char *argv[]) {
   bool darkMode = (color == darker) || parser.isSet(darkIcon);
 
   TopBar w(darkMode);
-  w.show();
-  if (parser.isSet(startInTray) || !gSettings->getTopBarVisibility()) {
-    w.setVisible(false);
-  }
+  if (parser.isSet(startInTray))
+    app.setProperty("invokedAsTray", parser.isSet(startInTray));
+  else if(gSettings->getTopBarVisibility())
+    w.show();
+
+  app.setQuitOnLastWindowClosed(false);
   return app.exec();
 }