Changeset 695:c33fc35b99a1

Timestamp:

10/25/15 06:23:05 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Phase:

public

Message:

Moved the initialization of the SimBrief browser into the Selenium handler (re #279).

File:

• src/mlx/gui/cef.py (modified) (4 diffs)

src/mlx/gui/cef.py

@@ -110 +110 @@
         self._driver = None
 
+        self._simBriefBrowser = None
+
         self._toQuit = False
 
@@ -116 +118 @@
         """Get the program directory."""
         return self._programDirectory
+
+    @property
+    def simBriefInitURL(self):
+        """Get the initial URL for the SimBrief browser."""
+        return "file://" + os.path.join(self.programDirectory, "simbrief.html")
 
     def run(self):
@@ -147 +154 @@
 
         driver.quit()
+
+    def initializeSimBrief(self):
+        """Create and initialize the browser used for Simbrief."""
+        windowInfo = cefpython.WindowInfo()
+        windowInfo.SetAsOffscreen(int(0))
+
+        url = self.simBriefInitURL
+        self._simBriefBrowser = \
+          cefpython.CreateBrowserSync(windowInfo, browserSettings = {},
+                                      navigateUrl = self.simBriefInitURL)
+        self._simBriefBrowser.SetClientHandler(OffscreenRenderHandler())
+        self._simBriefBrowser.SetFocus(True)
 
     def callSimBrief(self, plan, getCredentials, updateProgress,
@@ -345 +364 @@
 def initializeSimBrief():
     """Initialize the (hidden) browser window for SimBrief."""
-    windowInfo = cefpython.WindowInfo()
-    windowInfo.SetAsOffscreen(int(0))
-
-    url = "file://" + os.path.join(_seleniumHandler.programDirectory,
-                                   "simbrief.html")
-    simBriefBrowser = cefpython.CreateBrowserSync(windowInfo,
-                                                  browserSettings = {},
-                                                  navigateUrl = url)
-    simBriefBrowser.SetClientHandler(OffscreenRenderHandler())
-
-    simBriefBrowser.SetFocus(True)
+    _seleniumHandler.initializeSimBrief()
 
 #------------------------------------------------------------------------------