From e21b2201ab6e93d62cba3488fc0d8be69f15c7ad Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Sun, 24 Aug 2014 13:00:50 +0400
Subject: [PATCH] small tray fixes

---
 sources/gui/src/trayicon.cpp         | 7 +++++--
 sources/resources/translations/ru.ts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sources/gui/src/trayicon.cpp b/sources/gui/src/trayicon.cpp
index 1155edc..da2bbbd 100644
--- a/sources/gui/src/trayicon.cpp
+++ b/sources/gui/src/trayicon.cpp
@@ -165,6 +165,8 @@ void TrayIcon::updateMenu()
         contextMenu[QString("gui")]->setText(QApplication::translate("TrayIcon", "Show"));
     else
         contextMenu[QString("gui")]->setText(QApplication::translate("TrayIcon", "Hide"));
+
+    setContextMenu(menuActions);
 }
 
 
@@ -176,6 +178,7 @@ void TrayIcon::createActions()
 
     contextMenu[QString("title")] = new QAction(QIcon(":icon"), QApplication::translate("TrayIcon", "Status"), this);
     menuActions->addAction(contextMenu[QString("title")]);
+    connect(contextMenu[QString("title")], SIGNAL(triggered(bool)), this, SLOT(showInformationInWindow()));
 
     menuActions->addSeparator();
 
@@ -233,9 +236,7 @@ void TrayIcon::init()
     setToolTip(QString("netctl-gui"));
 
     createActions();
-    setContextMenu(menuActions);
 
-    connect(this, SIGNAL(messageClicked()), this, SLOT(showInformationInWindow()));
     connect(this, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(itemActivated(QSystemTrayIcon::ActivationReason)));
 }
@@ -254,6 +255,8 @@ void TrayIcon::itemActivated(const QSystemTrayIcon::ActivationReason reason)
         mainWindow->showMainWindow();
         break;
     case QSystemTrayIcon::Context:
+        // clear menu before update
+        setContextMenu(0);
         updateMenu();
         break;
     default:
diff --git a/sources/resources/translations/ru.ts b/sources/resources/translations/ru.ts
index d0d6f00..3db178d 100644
--- a/sources/resources/translations/ru.ts
+++ b/sources/resources/translations/ru.ts
@@ -1935,7 +1935,7 @@
     </message>
     <message>
         <source>Restart %1</source>
-        <translation>Перезапустит %1</translation>
+        <translation>Перезапустить %1</translation>
     </message>
     <message>
         <source>Disable %1</source>