Changeset 38:08f7e6592452 for src

Timestamp:

03/04/12 09:35:01 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The status icon is now hidden properly when the program quits, and made restarting nicer

Location:

src/mlx

Files:

• gui/gui.py (modified) (6 diffs)
• gui/statusicon.py (modified) (1 diff)
• gui/update.py (modified) (3 diffs)
• mlx.py (modified) (2 diffs)
• update.py (modified) (2 diffs)

src/mlx/gui/gui.py

@@ -13 +13 @@
 
 import time
+import threading
+import sys
 
 acftTypes = [ ("Boeing 737-600", const.AIRCRAFT_B736),
@@ -43 +45 @@
         self._flight = None
         self._simulator = None
+
+        self._stdioLock = threading.Lock()
+        self._stdioText = ""
         self._stdioAfterNewLine = True
+
+        self.toRestart = False
 
     def build(self, iconDirectory):
@@ -84 +91 @@
         """Run the GUI."""
         if self._config.autoUpdate:
-            self._updater = Updater(self._programDirectory,
+            self._updater = Updater(self,
+                                    self._programDirectory,
                                     self._config.updateURL,
                                     self._mainWindow)
@@ -185 +193 @@
             self.showMainWindow()
 
+    def restart(self):
+        """Quit and restart the application."""
+        self.toRestart = True
+        self._quit()
+
+    def flushStdIO(self):
+        """Flush any text to the standard error that could not be logged."""
+        if self._stdioText:
+            sys.__stderr__.write(self._stdioText)
+            
     def writeStdIO(self, text):
         """Write the given text into standard I/O log."""
-        gobject.idle_add(self._writeStdIO, text)
-
-    def _writeStdIO(self, text):
+        with self._stdioLock:
+            self._stdioText += text
+
+        gobject.idle_add(self._writeStdIO)
+
+    def _writeStdIO(self):
         """Perform the real writing."""
+        with self._stdioLock:
+            text = self._stdioText
+            self._stdioText = ""
+        if not text: return
+            
         lines = text.splitlines()
         if text[-1]=="\n":
@@ -335 +361 @@
         self._quitButton.set_tooltip_text("Quit the program.")
         
-        self._quitButton.connect("clicked", gtk.main_quit)
+        self._quitButton.connect("clicked", self._quit)
 
         setupBox.pack_start(self._quitButton, False, False, 0)
@@ -660 +686 @@
         self._logView.scroll_mark_onscreen(buffer.get_insert())
 
+    def _quit(self, what = None):
+        """Quit from the application."""
+        self._statusIcon.destroy()
+        return gtk.main_quit()
+
 class TrackerStatusIcon(gtk.StatusIcon):
         def __init__(self):

src/mlx/gui/statusicon.py

@@ -83 +83 @@
             self._showHideMenuItem.set_active(True)
 
+    def destroy(self):
+        """Hide and destroy the status icon."""
+        if appIndicator:
+            if pygobject:
+                self._indicator.set_status(appindicator.IndicatorStatus.PASSIVE)
+            else:
+                self._indicator.set_status(appindicator.STATUS_PASSIVE)
+        else:
+            self._statusIcon.set_visible(False)
+        
     def _showHideToggled(self, menuitem):
         """Called when the show/hide menu item is toggled."""

src/mlx/gui/update.py

@@ -5 +5 @@
 from mlx.gui.common import *
 
-from mlx.update import update, restart
+from mlx.update import update
 
 import mlx.const as const
@@ -96 +96 @@
                                 else gtk.WIN_POS_CENTER_ON_PARENT)
 
-    def __init__(self, programDirectory, updateURL, parentWindow):
+    def __init__(self, gui, programDirectory, updateURL, parentWindow):
         """Construct the updater. If not created yet, the windows used by the
         updater are also created."""
         super(Updater, self).__init__()
+
+        self._gui = gui
         
         self._programDirectory = programDirectory
@@ -280 +282 @@
         self._progressWindow.hide()
         if self._restart:
-            restart()
+            self._gui.restart()
 
 #-------------------------------------------------------------------------------

src/mlx/mlx.py

@@ -7 +7 @@
 import os
 import sys
+
+if os.name=="nt":
+    import win32api
 
 #--------------------------------------------------------------------------------------
@@ -28 +31 @@
     config = Config()
     gui = GUI(programDirectory, config)
-
+    
     sys.stdout = StdIOHandler(gui)
     sys.stderr = StdIOHandler(gui)
 
-    gui.build(programDirectory)
+    try:
+        gui.build(programDirectory)
+        
+        gui.run()
+    finally:
+        gui.flushStdIO()
+        sys.stdout = sys.__stdout__
+        sys.stderr = sys.__stderr__
 
-    gui.run()
+    if gui.toRestart:
+        programPath = os.path.join(os.path.dirname(sys.argv[0]),
+                                   "runmlx.exe" if os.name=="nt" else "runmlx.sh")
+        if os.name=="nt":
+            programPath = win32api.GetShortPathName(programPath)
+
+        os.execl(programPath, programPath)
 
 #--------------------------------------------------------------------------------------

src/mlx/update.py

@@ -12 +12 @@
 import subprocess
 import hashlib
-
-if os.name=="nt":
-    import win32api
 
 #------------------------------------------------------------------------------
@@ -501 +498 @@
 #------------------------------------------------------------------------------
 
-def restart():
-    """Restart the program."""
-    programPath = os.path.join(os.path.dirname(sys.argv[0]),
-                               "runmlx.exe" if os.name=="nt" else "runmlx.sh")
-    if os.name=="nt":
-        programPath = win32api.GetShortPathName(programPath)
-    os.execl(programPath, programPath)
-        
-#------------------------------------------------------------------------------
-
 def updateProcess():
     """This is called in the child process, when we need a child process."""