Merge remote-tracking branch 'chiiph/bug/update_hideshow_text' into develop

2 files changed, 18 insertions, 7 deletions

diff --git a/changes/bug_update_hideshow b/changes/bug_update_hideshow
new file mode 100644
index 00000000..6ebbaaf1
--- /dev/null
+++ b/changes/bug_update_hideshow
@@ -0,0 +1,2 @@
+  o Update text from the tray menu based on the visibility of the
+    window. Fixes #3400.
\ No newline at end of file
diff --git a/src/leap/gui/mainwindow.py b/src/leap/gui/mainwindow.py
index 39160db9..a1ba4df4 100644
--- a/src/leap/gui/mainwindow.py
+++ b/src/leap/gui/mainwindow.py
@@ -580,13 +580,7 @@ class MainWindow(QtGui.QMainWindow):
 
         Displays the context menu from the tray icon
         """
-        get_action = lambda visible: (
-            self.tr("Show Main Window"),
-            self.tr("Hide Main Window"))[int(visible)]
-
-        # set labels
-        visible = self.isVisible()
-        self._action_visible.setText(get_action(visible))
+        self._update_hideshow_menu()
 
         context_menu = self._systray.contextMenu()
         if not IS_MAC:
@@ -596,6 +590,19 @@ class MainWindow(QtGui.QMainWindow):
             # this works however.
             context_menu.exec_(self._systray.geometry().center())
 
+    def _update_hideshow_menu(self):
+        """
+        Updates the Hide/Show main window menu text based on the
+        visibility of the window.
+        """
+        get_action = lambda visible: (
+            self.tr("Show Main Window"),
+            self.tr("Hide Main Window"))[int(visible)]
+
+        # set labels
+        visible = self.isVisible()
+        self._action_visible.setText(get_action(visible))
+
     def _toggle_visible(self):
         """
         SLOT
@@ -609,6 +616,8 @@ class MainWindow(QtGui.QMainWindow):
         else:
             self.hide()
 
+        self._update_hideshow_menu()
+
     def _center_window(self):
         """
         Centers the mainwindow based on the desktop geometry