WebBrowser/WebBrowserTabWidget.py

changeset 5785
7c7c5f9e4fad
parent 5784
362bbcc49ac1
child 5793
4ff73b969ab1
diff -r 362bbcc49ac1 -r 7c7c5f9e4fad WebBrowser/WebBrowserTabWidget.py
--- a/WebBrowser/WebBrowserTabWidget.py	Tue Jul 04 19:44:30 2017 +0200
+++ b/WebBrowser/WebBrowserTabWidget.py	Wed Jul 05 19:38:06 2017 +0200
@@ -1233,11 +1233,17 @@
         
         # 1. load tab data
         if "Tabs" in sessionData:
-            loadTabOnActivate = True
+            loadTabOnActivate = \
+                Preferences.getWebBrowser("LoadTabOnActivation")
             for data in sessionData["Tabs"]:
-                browser = self.newBrowser(link="about:blank", restoreSession=True)
+                browser = self.newBrowser(restoreSession=True)
+                QApplication.processEvents()
                 if loadTabOnActivate:
                     browser.storeSessionData(data)
+                    title, urlStr, icon = browser.extractSessionMetaData(data)
+                    index = self.indexOf(browser)
+                    self.setTabText(index, title)
+                    self.setTabIcon(index, icon)
                 else:
                     browser.loadFromSessionData(data)
         
@@ -1245,4 +1251,4 @@
         if "CurrentTabIndex" in sessionData:
             index = tabCount + sessionData["CurrentTabIndex"]
             self.setCurrentIndex(index)
-            self.browserAt(index).show()
+            self.browserAt(index).activateSession()

eric ide

mercurial