Changeset 35:d32890325137

Timestamp:

02/26/12 13:11:33 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

Hiding after minimizing seems to work now

Location:

src/mlx/gui

Files:

• gui.py (modified) (3 diffs)
• statusicon.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -47 +47 @@
         win.set_title("MAVA Logger X " + const.VERSION)
         win.set_icon_from_file("logo.ico")
-        win.connect("delete-event", lambda a, b: self.hideMainWindow())
+        win.connect("delete-event",
+                    lambda a, b: self.hideMainWindow())
         win.connect("window-state-event", self._handleMainWindowState)
 
@@ -143 +144 @@
                     else gdk.WINDOW_STATE_ICONIFIED
         if (event.changed_mask&iconified)!=0 and (event.new_window_state&iconified)!=0:
-            self.hideMainWindow()
-
-    def hideMainWindow(self):
+            self.hideMainWindow(savePosition = False)
+
+    def hideMainWindow(self, savePosition = True):
         """Hide the main window and save its position."""
-        (self._mainWindowX, self._mainWindowY) = \
-            self._mainWindow.get_window().get_root_origin()
+        if savePosition:
+            (self._mainWindowX, self._mainWindowY) = \
+                 self._mainWindow.get_window().get_root_origin()
+        else:
+            self._mainWindowX = self._mainWindowY = None
         self._mainWindow.hide()
         self._statusIcon.mainWindowHidden()
@@ -155 +159 @@
     def showMainWindow(self):
         """Show the main window at its former position."""
-        self._mainWindow.move(self._mainWindowX, self._mainWindowY)
+        if self._mainWindowX is not None and self._mainWindowY is not None:
+            self._mainWindow.move(self._mainWindowX, self._mainWindowY)
+
+        self._mainWindow.show()
         self._mainWindow.deiconify()
-        self._mainWindow.show()
+            
         self._statusIcon.mainWindowShown()
 

src/mlx/gui/statusicon.py

@@ -16 +16 @@
 
         self._gui = gui
+        self._selfToggling = False
 
         menu = gtk.Menu()
@@ -72 +73 @@
     def mainWindowHidden(self):
         """Called when the main window is hidden."""
-        self._showHideMenuItem.set_active(False)
+        if self._showHideMenuItem.get_active():
+            self._selfToggling = True
+            self._showHideMenuItem.set_active(False)
 
     def mainWindowShown(self):
         """Called when the main window is shown."""
-        self._showHideMenuItem.set_active(True)
+        if not self._showHideMenuItem.get_active():
+            self._selfToggling = True
+            self._showHideMenuItem.set_active(True)
 
     def _showHideToggled(self, menuitem):
         """Called when the show/hide menu item is toggled."""
-        if self._showHideMenuItem.get_active():
+        if self._selfToggling:
+            self._selfToggling = False
+        elif self._showHideMenuItem.get_active():
             self._gui.showMainWindow()
         else: