Changes in / [680:965523af85d4:681:6d454f3c68c8]

Files:

• makeinst.bat (modified) (1 diff)
• setup.py (modified) (3 diffs)
• src/mlx/common.py (modified) (1 diff)
• src/mlx/config.py (modified) (1 diff)
• src/mlx/gui/acars.py (added)
• src/mlx/gui/cef.py (added)
• src/mlx/gui/gui.py (modified) (6 diffs)
• src/mlx/update.py (modified) (1 diff)

makeinst.bat

@@ -1 +1 @@
 set MSVCRDIR=c:\windows\winsxs\x86_Microsoft.VC90.CRT*9.0.21022.8*
 set GTKRTDIR=c:\Python27\Lib\site-packages\gtk-2.0\runtime
+set CEFDIR=c:\Python27\Lib\site-packages\cefpython3
 set NSISDIR=C:\Program Files\NSIS
 

setup.py

@@ -28 +28 @@
     msvcrDir = os.environ["MSVCRDIR"] if "MSVCRDIR" in os.environ else None
     if msvcrDir:
-        data_files.append(("Microsoft.VC90.CRT",  glob(os.path.join(msvcrDir, "*.*"))))
+        data_files.append(("Microsoft.VC90.CRT", glob(os.path.join(msvcrDir, "*.*"))))
+        os.environ["PATH"] = os.environ["PATH"] + ";" + glob(os.path.join(msvcrDir))[0]
 
     gtkRuntimeDir = os.environ["GTKRTDIR"] if "GTKRTDIR" in os.environ else None
@@ -46 +47 @@
         data_files.append((os.path.join("library", path),
                            glob(os.path.join(gtkRuntimeDir, path, "*"))))
+
+    cefDir = os.environ.get("CEFDIR")
+    if cefDir:
+        for fileName in ["icudt.dll", "subprocess.exe"]:
+            data_files.append(("", [os.path.join(cefDir, fileName)]))
+
+        data_files.append(("locales",
+                           glob(os.path.join(cefDir, "locales", "*"))))
+
+    print data_files
 
     with open("mlx-common.nsh", "wt") as f:
@@ -80 +91 @@
 
 if os.name=="nt":
+    os.rename(os.path.join(scriptdir, "dist", "library", "libcef.dll"),
+              os.path.join(scriptdir, "dist", "libcef.dll"))
     mlx.update.buildManifest(os.path.join(scriptdir, "dist"))
     with open(os.path.join(scriptdir, "dist", "Uninstall.conf"), "wt") as f:

src/mlx/common.py

@@ -18 +18 @@
 #-------------------------------------------------------------------------------
 
-if os.name=="nt" or "FORCE_PYGTK" in os.environ:
+# Due to CEF, PyGTK is the default
+if "FORCE_PYGOBJECT" not in os.environ:
     print "Using PyGTK"
     pygobject = False

src/mlx/config.py

@@ -211 +211 @@
 class Config(object):
     """Our configuration."""
-    DEFAULT_UPDATE_URL = "http://mlx.varadiistvan.hu/update"
+    DEFAULT_UPDATE_URL = "http://mlx.varadiistvan.hu/update/cef"
 
     _messageTypesSection = "messageTypes"

src/mlx/gui/gui.py

@@ -15 +15 @@
 from mlx.gui.pirep import PIREPViewer
 from mlx.gui.bugreport import BugReportDialog
+from mlx.gui.acars import ACARS
+import cef
 
 import mlx.const as const
@@ -102 +104 @@
         window.connect("delete-event", self.deleteMainWindow)
         window.connect("window-state-event", self._handleMainWindowState)
+        if os.name=="nt":
+            window.connect("leave-notify-event", self._handleLeaveNotify)
         accelGroup = gtk.AccelGroup()
         window.add_accel_group(accelGroup)
+        window.realize()
 
         mainVBox = gtk.VBox()
@@ -151 +156 @@
         self._notebook.append_page(self._fleetGateStatus, label)
 
+        self._acars = ACARS(self)
+        label = gtk.Label("ACARS")
+        label.set_use_underline(True)
+        self._notebook.append_page(self._acars, label)
+
         (self._debugLogWidget, self._debugLogView) = self._buildLogWidget()
         self._debugLogWidget.show_all()
@@ -170 +180 @@
 
         window.show_all()
+        if os.name=="nt":
+            window.get_window().focus()
 
         self._wizard.grabDefault()
@@ -427 +439 @@
             self._updater = Updater(self,
                                     self._programDirectory,
-                                    self.config.updateURL,
+                                    self.config.DEFAULT_UPDATE_URL,
                                     self._mainWindow)
             self._updater.start()
+
+        cef.initialize()
+        self._acars.start()
 
         singleton.raiseCallback = self.raiseCallback
         gtk.main()
         singleton.raiseCallback = None
+
+        cef.finalize()
 
         self._disconnect()
@@ -687 +704 @@
              (event.new_window_state&WINDOW_STATE_ICONIFIED)==0:
             self._mainWindow.present()
+
+    def _handleLeaveNotify(self, widget, event):
+        """Handle the leave-notify event.
+
+        Here we reset the focus to the main window as CEF might have acquired
+        it earlier."""
+        self._mainWindow.get_window().focus()
 
     def raiseCallback(self):

src/mlx/update.py

@@ -525 +525 @@
         return
 
-    print "update: result:", result
-
     (manifest, updateManifest, modifiedAndNew, removed) = result        
     localRemoved = getToremoveFiles(directory)