Changeset 36:f79362793664

Timestamp:

03/04/12 06:27:05 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

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

Message:

Update seems to work

Files:

• MANIFEST.in (modified) (1 diff)
• mlxupdate (added)
• mlxupdate.py (added)
• runmlx.py (modified) (1 diff)
• runmlx.sh (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/mlx/config.py (added)
• src/mlx/const.py (modified) (1 diff)
• src/mlx/gui/gui.py (modified) (6 diffs)
• src/mlx/gui/update.py (added)
• src/mlx/mlx.py (modified) (1 diff)
• src/mlx/update.py (added)

MANIFEST.in

@@ -3 +3 @@
 include license.txt
 include runmlx.py
+include mlxupdate.py
 include logo.ico
 include logo_uninst.ico

runmlx.py

@@ -1 +1 @@
 # Script to run the logger
-
-import os
-import sys
 
 if __name__ == "__main__":
     import mlx.mlx
-    mlx.mlx.main(os.path.dirname(sys.argv[0]))
+    mlx.mlx.main()

runmlx.sh

@@ -3 +3 @@
 scriptdir=`dirname $0`
 
-PYTHONPATH="${scriptdir}/src:${PYTHONPATH}"
+PYTHONPATH="${scriptdir}/src:${scriptdir}:${PYTHONPATH}"
 export PYTHONPATH
 

setup.py

@@ -49 +49 @@
       requires = ["pyuipc"],
       windows = [{ "script" : "runmlx.py",
-                   "icon_resources" : [(1, "logo.ico")]}],
+                   "icon_resources" : [(1, "logo.ico")]},
+                 { "script" : "mlxupdate.py",
+                   "uac_info" : "requireAdministrator"}],
       options = { "py2exe" : { "includes": "gio, pango, atk, pangocairo"} },
       data_files = data_files,

src/mlx/const.py

@@ -4 +4 @@
 
 # The version of the program
-VERSION="0.003"
+VERSION="0.004"
 
 #-------------------------------------------------------------------------------

src/mlx/gui/gui.py

@@ -3 +3 @@
 from statusicon import StatusIcon
 from statusbar import Statusbar
+from update import Updater
 from mlx.gui.common import *
 
@@ -31 +32 @@
 class GUI(fs.ConnectionListener):
     """The main GUI class."""
-    def __init__(self):
+    def __init__(self, programDirectory, config):
         """Construct the GUI."""
         gobject.threads_init()
 
+        self._programDirectory = programDirectory
+        self._config = config
         self._connecting = False
         self._connected = False
@@ -40 +43 @@
         self._flight = None
         self._simulator = None
+        self._stdioAfterNewLine = True
 
     def build(self, iconDirectory):
         """Build the GUI."""
         
-        win = gtk.Window()
-        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("window-state-event", self._handleMainWindowState)
+        window = gtk.Window()
+        window.set_title("MAVA Logger X " + const.VERSION)
+        window.set_icon_from_file(os.path.join(iconDirectory, "logo.ico"))
+        window.connect("delete-event",
+                       lambda a, b: self.hideMainWindow())
+        window.connect("window-state-event", self._handleMainWindowState)
 
         mainVBox = gtk.VBox()
-        win.add(mainVBox)
+        window.add(mainVBox)
 
         setupFrame = self._buildSetupFrame()
@@ -71 +75 @@
         mainVBox.pack_start(self._statusbar, False, False, 0)
 
-        win.show_all()        
-
-        self._mainWindow = win
+        window.show_all()        
+
+        self._mainWindow = window
 
         self._statusIcon = StatusIcon(iconDirectory, self)
@@ -79 +83 @@
     def run(self):
         """Run the GUI."""
+        if self._config.autoUpdate:
+            self._updater = Updater(self._programDirectory,
+                                    self._config.updateURL,
+                                    self._mainWindow)
+            self._updater.start()
+
         gtk.main()
+
         if self._flight is not None:
             simulator = self._flight.simulator
@@ -173 +184 @@
         else:
             self.showMainWindow()
+
+    def writeStdIO(self, text):
+        """Write the given text into standard I/O log."""
+        gobject.idle_add(self._writeStdIO, text)
+
+    def _writeStdIO(self, text):
+        """Perform the real writing."""
+        lines = text.splitlines()
+        if text[-1]=="\n":
+            text = ""
+        else:
+            text = lines[-1]
+            lines = lines[:-1]
+            
+        for line in lines:
+            if self._stdioAfterNewLine:
+                line = "[STDIO] " + line
+            self._writeLog(line + "\n")
+            self._stdioAfterNewLine = True
+
+        if text:
+            if self._stdioAfterNewLine:
+                text = "[STDIO] " + text
+            self._writeLog(text)
+            self._stdioAfterNewLine = False
             
     def _connectToggled(self, button):

src/mlx/mlx.py

@@ -2 +2 @@
 
 from .gui.gui import GUI
-from .gui.common import *
+
+from config import Config
 
 import os
+import sys
 
-def main(iconDirectory):
+#--------------------------------------------------------------------------------------
+
+class StdIOHandler(object):
+    """Handler for the standard I/O messages."""
+    def __init__(self, gui):
+        """Construct the handler."""
+        self._gui = gui
+
+    def write(self, text):
+        """Write the given text into the log."""
+        self._gui.writeStdIO(text)
+
+#--------------------------------------------------------------------------------------
+
+def main():
     """The main operation of the program."""
-    gui = GUI()
+    programDirectory = os.path.dirname(sys.argv[0])
 
-    gui.build(iconDirectory)
+    config = Config()
+    gui = GUI(programDirectory, config)
+
+    sys.stdout = StdIOHandler(gui)
+    sys.stderr = StdIOHandler(gui)
+
+    gui.build(programDirectory)
 
     gui.run()
 
+#--------------------------------------------------------------------------------------
+
 if __name__ == "__main__":
-    main(os.path.dirname(__file__))
-
-
+    main()