1235 if "Tabs" in sessionData: |
1235 if "Tabs" in sessionData: |
1236 loadTabOnActivate = \ |
1236 loadTabOnActivate = \ |
1237 Preferences.getWebBrowser("LoadTabOnActivation") |
1237 Preferences.getWebBrowser("LoadTabOnActivation") |
1238 for data in sessionData["Tabs"]: |
1238 for data in sessionData["Tabs"]: |
1239 browser = self.newBrowser(restoreSession=True) |
1239 browser = self.newBrowser(restoreSession=True) |
1240 QApplication.processEvents() |
|
1241 if loadTabOnActivate: |
1240 if loadTabOnActivate: |
1242 browser.storeSessionData(data) |
1241 browser.storeSessionData(data) |
1243 title, urlStr, icon = browser.extractSessionMetaData(data) |
1242 title, urlStr, icon = browser.extractSessionMetaData(data) |
1244 index = self.indexOf(browser) |
1243 index = self.indexOf(browser) |
1245 self.setTabText(index, title) |
1244 self.setTabText(index, title) |
1246 self.setTabIcon(index, icon) |
1245 self.setTabIcon(index, icon) |
1247 else: |
1246 else: |
1248 browser.loadFromSessionData(data) |
1247 browser.loadFromSessionData(data) |
1249 |
1248 |
1250 # 2. set tab index |
1249 # 2. set tab index |
1251 if "CurrentTabIndex" in sessionData: |
1250 if "CurrentTabIndex" in sessionData and \ |
|
1251 sessionData["CurrentTabIndex"] >= 0: |
1252 index = tabCount + sessionData["CurrentTabIndex"] |
1252 index = tabCount + sessionData["CurrentTabIndex"] |
1253 self.setCurrentIndex(index) |
1253 self.setCurrentIndex(index) |
1254 self.browserAt(index).activateSession() |
1254 self.browserAt(index).activateSession() |