Mercurial Repositories > eric / file comparison
comparison: WebBrowser/Session/SessionManager.py
WebBrowser/Session/SessionManager.py
- changeset 5793
- 4ff73b969ab1
- parent 5785
- 7c7c5f9e4fad
- child 6048
- 82ad8ec9548c
equal
deleted
inserted
replaced
| 5792:519a193a19d7 | 5793:4ff73b969ab1 |
|---|---|
| 439 window.tabWidget().loadFromSessionData(data) | 439 window.tabWidget().loadFromSessionData(data) |
| 440 if "WindowGeometry" in data: | 440 if "WindowGeometry" in data: |
| 441 geometry = QByteArray.fromBase64( | 441 geometry = QByteArray.fromBase64( |
| 442 data["WindowGeometry"].encode("ascii")) | 442 data["WindowGeometry"].encode("ascii")) |
| 443 window.restoreGeometry(geometry) | 443 window.restoreGeometry(geometry) |
| 444 if Utilities.isWindowsPlatform(): | |
| 445 window.hide() | |
| 446 window.show() | |
| 447 QApplication.processEvents() | 444 QApplication.processEvents() |
| 448 | 445 |
| 449 # restore additional windows | 446 # restore additional windows |
| 450 for data in sessionData["Windows"]: | 447 for data in sessionData["Windows"]: |
| 451 window = WebBrowserWindow.mainWindow()\ | 448 window = WebBrowserWindow.mainWindow()\ |
| 453 window.tabWidget().loadFromSessionData(data) | 450 window.tabWidget().loadFromSessionData(data) |
| 454 if "WindowGeometry" in data: | 451 if "WindowGeometry" in data: |
| 455 geometry = QByteArray.fromBase64( | 452 geometry = QByteArray.fromBase64( |
| 456 data["WindowGeometry"].encode("ascii")) | 453 data["WindowGeometry"].encode("ascii")) |
| 457 window.restoreGeometry(geometry) | 454 window.restoreGeometry(geometry) |
| 458 if Utilities.isWindowsPlatform(): | |
| 459 window.hide() | |
| 460 window.show() | |
| 461 QApplication.processEvents() | 455 QApplication.processEvents() |
| 462 QApplication.restoreOverrideCursor() | 456 QApplication.restoreOverrideCursor() |
| 463 | 457 |
| 464 if "CurrentWindowIndex" in sessionData: | 458 if "CurrentWindowIndex" in sessionData: |
| 465 currentWindowIndex = sessionData["CurrentWindowIndex"] | 459 currentWindowIndex = sessionData["CurrentWindowIndex"] |
| 466 try: | 460 try: |
| 467 currentWindow = \ | 461 currentWindow = \ |
| 468 WebBrowserWindow.mainWindows()[currentWindowIndex] | 462 WebBrowserWindow.mainWindows()[currentWindowIndex] |
| 469 currentWindow.raise_() | 463 QTimer.singleShot(0, lambda: currentWindow.raise_()) |
| 470 except IndexError: | 464 except IndexError: |
| 471 # ignore it | 465 # ignore it |
| 472 pass | 466 pass |
| 473 | 467 |
| 474 def renameSession(self, sessionFilePath, flags=0): | 468 def renameSession(self, sessionFilePath, flags=0): |
