Changeset 712:b46a773d4b9e

Timestamp:

10/25/15 14:37:06 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Phase:

public

Message:

Added a life-span handler for the SimBrief browser page as the browser is closed on Windows when navigating to another page in the flight wizard (re #279).

File:

• src/mlx/gui/flight.py (modified) (3 diffs)

src/mlx/gui/flight.py

@@ -2139 +2139 @@
 class SimBriefingPage(Page):
     """Page to display the SimBrief HTML briefing."""
+    class BrowserLifeSpanHandler(object):
+        """The life-span handler of a browser."""
+        def __init__(self, simBriefingPage):
+            """Construct the life-span handler for the given page."""
+            self._simBriefingPage = simBriefingPage
+
+        def OnBeforeClose(self, browser):
+            """Called before closing the browser."""
+            self._simBriefingPage._invalidateBrowser()
+
     def __init__(self, wizard):
         """Construct the setup page."""
@@ -2167 +2177 @@
         """Activate the SimBrief flight plan page"""
         if self._browser is None:
-            url = "file://" + SimBriefSetupPage.getHTMLFilePath()
-            self._browser = cef.startInContainer(self._container, url)
+            self._startBrowser()
         else:
             self._browser.Reload()
+
+    def grabDefault(self):
+        """If the page has a default button, make it the default one."""
+        super(SimBriefingPage, self).grabDefault()
+
+        if self._browser is None:
+            self._startBrowser()
 
     def _backClicked(self, button):
@@ -2185 +2201 @@
 
         self._wizard.nextPage()
+
+    def _startBrowser(self):
+        """Start the browser.
+
+        If a container is needed, create one."""
+        if self._container is None:
+            self._container = cef.getContainer()
+            self._alignment.add(self._container)
+
+        url = "file://" + SimBriefSetupPage.getHTMLFilePath()
+        self._browser = cef.startInContainer(self._container, url)
+
+        lifeSpanHandler = SimBriefingPage.BrowserLifeSpanHandler(self)
+        self._browser.SetClientHandler(lifeSpanHandler)
+
+    def _invalidateBrowser(self):
+        """Invalidate the browser (and associated stuff)."""
+        self._alignment.remove(self._container)
+        self._container = None
+        self._browser = None
 
 #-----------------------------------------------------------------------------