Changeset 182:dd806c3cc18d

Timestamp:

05/15/12 15:01:07 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

If the program is started in several instances, the ones after the first one just show the window of the running instance

Location:

src/mlx

Files:

• gui/gui.py (modified) (3 diffs)
• mlx.py (modified) (2 diffs)
• singleton.py (added)

src/mlx/gui/gui.py

@@ -19 +19 @@
 import mlx.acft as acft
 import mlx.web as web
+import mlx.singleton as singleton
 from  mlx.i18n import xstr
 from mlx.pirep import PIREP
@@ -306 +307 @@
                                     self._mainWindow)
             self._updater.start()
-
+        
+        singleton.raiseCallback = self.raiseCallback
         gtk.main()
+        singleton.raiseCallback = None
 
         self._disconnect()
@@ -499 +502 @@
            (event.new_window_state&iconified)!=0:
             self.hideMainWindow(savePosition = False)
+
+    def raiseCallback(self):
+        """Callback for the singleton handling code."""
+        gobject.idle_add(self.raiseMainWindow)
+
+    def raiseMainWindow(self):
+        """SHow the main window if invisible, and raise it."""
+        if not self._mainWindow.get_visible():
+            self.showMainWindow()
+        self._mainWindow.present()
 
     def hideMainWindow(self, savePosition = True):

src/mlx/mlx.py

@@ -44 +44 @@
 def main():
     """The main operation of the program."""
+    from singleton import SingleInstance, raiseCallbackWrapper
+
+    instance = SingleInstance("mlx", raiseCallbackWrapper)
+    if not instance: return
+
     programDirectory = os.path.dirname(sys.argv[0])
 
@@ -79 +84 @@
 
 if __name__ == "__main__":
-    main()
+    if instance:
+        main()