Sat, 22 May 2021 18:51:46 +0200
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
7923
91e843545d9a
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7836
diff
changeset
|
3 | # Copyright (c) 2017 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the session manager. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | import os |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
11 | import json |
7937
181d1160f617
Fixed some 'lambda' related issues by converting them to 'functools.partial'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
12 | import functools |
8243
cc717c2ae956
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
13 | import contextlib |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
8318
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
15 | from PyQt6.QtCore import ( |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
16 | pyqtSlot, pyqtSignal, Qt, QObject, QTimer, QDir, QFile, QFileInfo, |
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
17 | QFileSystemWatcher, QByteArray, QDateTime |
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
18 | ) |
8318
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
19 | from PyQt6.QtGui import QActionGroup |
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
20 | from PyQt6.QtWidgets import ( |
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
21 | QApplication, QInputDialog, QLineEdit, QDialog, QDialogButtonBox, QLabel, |
962bce857696
Replaced all imports of PyQt5 to PyQt6 and started to replace code using obsoleted methods and adapt to the PyQt6 enum usage.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8312
diff
changeset
|
22 | QComboBox, QVBoxLayout |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
23 | ) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
24 | |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
25 | from E5Gui import EricMessageBox |
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
26 | from E5Gui.EricOverrideCursor import EricOverrideCursor |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | import Utilities |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | import Preferences |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | |
8205
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
32 | class SessionMetaData: |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
33 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
34 | Class implementing a data structure to store meta data for a session. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
35 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
36 | def __init__(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
37 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
38 | Constructor |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
39 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
40 | self.name = "" |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
41 | self.filePath = "" |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
42 | self.isActive = False |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
43 | self.isDefault = False |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
44 | self.isBackup = False |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
45 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
46 | |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
47 | class SessionManager(QObject): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
48 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | Class implementing the session manager. |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
50 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
51 | @signal sessionsMetaDataChanged() emitted to indicate a change of the |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
52 | list of session meta data |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | """ |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
54 | sessionsMetaDataChanged = pyqtSignal() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
55 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
56 | SwitchSession = 1 |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
57 | CloneSession = 2 |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
58 | ReplaceSession = SwitchSession | 4 |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
59 | RestoreSession = 8 |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
60 | |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | def __init__(self, parent=None): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | Constructor |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | @param parent reference to the parent object |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | @type QObject |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | """ |
8218
7c09585bd960
Applied some more code simplifications suggested by the new Simplify checker (super(Foo, self) => super()).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8205
diff
changeset
|
68 | super().__init__(parent) |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
70 | sessionsDirName = self.getSessionsDirectory() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
71 | sessionsDir = QDir(sessionsDirName) |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
72 | if not sessionsDir.exists(): |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
73 | sessionsDir.mkpath(sessionsDirName) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
74 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
75 | self.__sessionMetaData = [] |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
76 | # list containing meta data about saved sessions |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
77 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
78 | self.__sessionDefault = os.path.join(sessionsDirName, "session.json") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
79 | self.__sessionBackup1 = os.path.join(sessionsDirName, |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
80 | "session.json.old") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
81 | self.__sessionBackup2 = os.path.join(sessionsDirName, |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
82 | "session.json.old1") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
83 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
84 | self.__lastActiveSession = Preferences.getWebBrowser( |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
85 | "SessionLastActivePath") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
86 | if not QFile.exists(self.__lastActiveSession): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
87 | self.__lastActiveSession = self.__sessionDefault |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
88 | |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
89 | self.__sessionsDirectoryWatcher = QFileSystemWatcher( |
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
90 | [self.getSessionsDirectory()], self) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
91 | self.__sessionsDirectoryWatcher.directoryChanged.connect( |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
92 | self.__sessionDirectoryChanged) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
93 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
94 | self.__backupSavedSession() |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
96 | self.__autoSaveTimer = None |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
97 | self.__shutdown = False |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
98 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
99 | def activateTimer(self): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
100 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
101 | Public method to activate the session save timer. |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
102 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
103 | if self.__autoSaveTimer is None: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
104 | self.__autoSaveTimer = QTimer() |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
105 | self.__autoSaveTimer.setSingleShot(True) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
106 | self.__autoSaveTimer.timeout.connect(self.__autoSaveSession) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
107 | self.__initSessionSaveTimer() |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
108 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
109 | def preferencesChanged(self): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
110 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
111 | Public slot to react upon changes of the settings. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
112 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
113 | self.__initSessionSaveTimer() |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
114 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | def getSessionsDirectory(self): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
116 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
117 | Public method to get the directory sessions are stored in. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
118 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
119 | @return name of the sessions directory |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
120 | @rtype str |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
121 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
122 | return os.path.join(Utilities.getConfigDir(), |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
123 | "web_browser", "sessions") |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
124 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
125 | def defaultSessionFile(self): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
126 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
127 | Public method to get the name of the default session file. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
128 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
129 | @return name of the default session file |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
130 | @rtype str |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
131 | """ |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
132 | return self.__sessionDefault |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
133 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
134 | def lastActiveSessionFile(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
135 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
136 | Public method to get the name of the last active session file. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
137 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
138 | @return name of the last active session file |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
139 | @rtype str |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
140 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
141 | return self.__lastActiveSession |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
142 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
143 | def shutdown(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
144 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
145 | Public method to perform any shutdown actions. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
146 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
147 | self.__autoSaveTimer.stop() |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
148 | if not self.__shutdown: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
149 | self.__autoSaveSession(startTimer=False) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
150 | self.__shutdown = True |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
151 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
152 | def autoSaveSession(self): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
153 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
154 | Public method to save the current session state. |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
155 | """ |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
156 | self.__autoSaveSession(startTimer=False) |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
157 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
158 | def __initSessionSaveTimer(self): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
159 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
160 | Private slot to initialize the auto save timer. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
161 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
162 | self.__autoSaveInterval = Preferences.getWebBrowser( |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
163 | "SessionAutoSaveInterval") * 1000 |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
164 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
165 | if Preferences.getWebBrowser("SessionAutoSave"): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
166 | if not self.__autoSaveTimer.isActive(): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
167 | self.__autoSaveTimer.start(self.__autoSaveInterval) |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
168 | else: |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
169 | self.__autoSaveTimer.stop() |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
170 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
171 | @pyqtSlot() |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
172 | def __autoSaveSession(self, startTimer=True): |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
173 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
174 | Private slot to save the current session state. |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
175 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
176 | @param startTimer flag indicating to restart the timer |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
177 | @type bool |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
178 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
179 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
180 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
181 | if not WebBrowserWindow.isPrivate(): |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
182 | Preferences.setWebBrowser("SessionLastActivePath", |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
183 | self.__lastActiveSession) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
184 | self.writeCurrentSession(self.__lastActiveSession) |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
185 | |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
186 | if startTimer: |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
187 | self.__autoSaveTimer.start(self.__autoSaveInterval) |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
188 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
189 | def writeCurrentSession(self, sessionFileName): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
190 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | Public method to write the current session to the given file name. |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
192 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | @param sessionFileName file name of the session |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | @type str |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | """ |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
197 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
198 | sessionData = {"Windows": []} |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
200 | activeWindow = WebBrowserWindow.getWindow() |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
201 | for window in WebBrowserWindow.mainWindows(): |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
202 | data = window.tabWidget().getSessionData() |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
203 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
204 | # add window geometry |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
205 | geometry = window.saveGeometry() |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
206 | data["WindowGeometry"] = bytes(geometry.toBase64()).decode("ascii") |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | |
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | sessionData["Windows"].append(data) |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
209 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
210 | if window is activeWindow: |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
211 | sessionData["CurrentWindowIndex"] = ( |
5785
7c7c5f9e4fad
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5783
diff
changeset
|
212 | len(sessionData["Windows"]) - 1 |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
213 | ) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
214 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
215 | if sessionData["Windows"]: |
7785
9978016560ec
Changed code to use context manager 'open()' for file operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7781
diff
changeset
|
216 | with open(sessionFileName, "w") as sessionFile: |
9978016560ec
Changed code to use context manager 'open()' for file operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7781
diff
changeset
|
217 | json.dump(sessionData, sessionFile, indent=2) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
218 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
219 | @classmethod |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
220 | def readSessionFromFile(cls, sessionFileName): |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
221 | """ |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
222 | Class method to read the session data from a file. |
5777
2c4441d65ee3
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
224 | @param sessionFileName file name of the session file |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
225 | @type str |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
226 | @return dictionary containing the session data |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
227 | @rtype dict |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
228 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
229 | try: |
7785
9978016560ec
Changed code to use context manager 'open()' for file operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7781
diff
changeset
|
230 | with open(sessionFileName, "r") as sessionFile: |
9978016560ec
Changed code to use context manager 'open()' for file operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7781
diff
changeset
|
231 | sessionData = json.load(sessionFile) |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
232 | if not cls.isValidSession(sessionData): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
233 | sessionData = {} |
7836
2f0d208b8137
Changed code to not use the OSError aliases (IOError, EnvironmentError, socket.error and select.error) anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7785
diff
changeset
|
234 | except OSError: |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
235 | sessionData = {} |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
236 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
237 | return sessionData |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
238 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
239 | @classmethod |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
240 | def isValidSession(cls, session): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
241 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
242 | Class method to check the validity of a session. |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
243 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
244 | @param session dictionary containing the session data |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
245 | @type dict |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
246 | @return flag indicating validity |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
247 | @rtype bool |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
248 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
249 | if not session: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
250 | return False |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
251 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
252 | if "Windows" not in session: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
253 | return False |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
254 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
255 | if not session["Windows"]: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
256 | return False |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
257 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
258 | return True |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
259 | |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
260 | def __backupSavedSession(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
261 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
262 | Private method to backup the most recently saved session. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
263 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
264 | if QFile.exists(self.__lastActiveSession): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
265 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
266 | if QFile.exists(self.__sessionBackup1): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
267 | QFile.remove(self.__sessionBackup2) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
268 | QFile.copy(self.__sessionBackup1, self.__sessionBackup2) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
269 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
270 | QFile.remove(self.__sessionBackup1) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
271 | QFile.copy(self.__lastActiveSession, self.__sessionBackup1) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
272 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
273 | def sessionMetaData(self, includeBackups=False): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
274 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
275 | Public method to get the sessions meta data. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
276 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
277 | @param includeBackups flag indicating to include backup sessions |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
278 | @type bool |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
279 | @return list of session meta data |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
280 | @rtype list of SessionMetaData |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
281 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
282 | self.__fillMetaDataList() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
283 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
284 | metaDataList = self.__sessionMetaData[:] |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
285 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
286 | if includeBackups and QFile.exists(self.__sessionBackup1): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
287 | data = SessionMetaData() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
288 | data.name = self.tr("Backup 1") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
289 | data.filePath = self.__sessionBackup1 |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
290 | data.isBackup = True |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
291 | metaDataList.append(data) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
292 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
293 | if includeBackups and QFile.exists(self.__sessionBackup2): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
294 | data = SessionMetaData() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
295 | data.name = self.tr("Backup 2") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
296 | data.filePath = self.__sessionBackup2 |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
297 | data.isBackup = True |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
298 | metaDataList.append(data) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
299 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
300 | return metaDataList |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
301 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
302 | def __fillMetaDataList(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
303 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
304 | Private method to fill the sessions meta data list. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
305 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
306 | The sessions meta data list is only populated, if the variable holding |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
307 | it is empty (i.e. it is populated on demand). |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
308 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
309 | if self.__sessionMetaData: |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
310 | return |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
311 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
312 | sessionFilesInfoList = QDir(self.getSessionsDirectory()).entryInfoList( |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
313 | ["*.json"], QDir.Filter.Files, QDir.SortFlag.Time) |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
314 | |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
315 | for sessionFileInfo in sessionFilesInfoList: |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
316 | sessionData = self.readSessionFromFile( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
317 | sessionFileInfo.absoluteFilePath()) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
318 | if not sessionData or not sessionData["Windows"]: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
319 | continue |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
320 | |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
321 | data = SessionMetaData() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
322 | data.name = sessionFileInfo.baseName() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
323 | data.filePath = sessionFileInfo.canonicalFilePath() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
324 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
325 | if sessionFileInfo == QFileInfo(self.defaultSessionFile()): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
326 | data.name = self.tr("Default Session") |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
327 | data.isDefault = True |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
328 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
329 | if self.__isActive(sessionFileInfo): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
330 | data.isActive = True |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
331 | |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
332 | if data.isDefault: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
333 | # default session is always first |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
334 | self.__sessionMetaData.insert(0, data) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
335 | else: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
336 | self.__sessionMetaData.append(data) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
337 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
338 | def __isActive(self, filePath): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
339 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
340 | Private method to check, if a given file is the active one. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
341 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
342 | @param filePath path of the session file to be checked |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
343 | @type str or QFileInfo |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
344 | @return flag indicating the active file |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
345 | @rtype bool |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
346 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
347 | return QFileInfo(filePath) == QFileInfo(self.__lastActiveSession) |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
348 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
349 | @pyqtSlot() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
350 | def __sessionDirectoryChanged(self): |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
351 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
352 | Private slot handling changes of the sessions directory. |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
353 | """ |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
354 | self.__sessionMetaData = [] |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
355 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
356 | self.sessionsMetaDataChanged.emit() |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
357 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
358 | @pyqtSlot() |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
359 | def aboutToShowSessionsMenu(self, menu): |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
360 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
361 | Public slot to populate the sessions selection menu. |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
362 | |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
363 | @param menu reference to the menu about to be shown |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
364 | @type QMenu |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
365 | """ |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
366 | menu.clear() |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
367 | |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
368 | actionGroup = QActionGroup(menu) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
369 | sessions = self.sessionMetaData(includeBackups=False) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
370 | for session in sessions: |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
371 | act = menu.addAction(session.name) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
372 | act.setCheckable(True) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
373 | act.setChecked(session.isActive) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
374 | act.setData(session.filePath) |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
375 | actionGroup.addAction(act) |
7937
181d1160f617
Fixed some 'lambda' related issues by converting them to 'functools.partial'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
376 | act.triggered.connect( |
181d1160f617
Fixed some 'lambda' related issues by converting them to 'functools.partial'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7923
diff
changeset
|
377 | functools.partial(self.__sessionActTriggered, act)) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
378 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
379 | @pyqtSlot() |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
380 | def __sessionActTriggered(self, act): |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
381 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
382 | Private slot to handle the menu selection of a session. |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
383 | |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
384 | @param act reference to the action that triggered |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
385 | @type QAction |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
386 | """ |
6121
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
387 | path = act.data() |
d3d64f3128b3
Continued removing the use of QObject.sender().
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
388 | self.switchToSession(path) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
389 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
390 | def openSession(self, sessionFilePath, flags=0): |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
391 | """ |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
392 | Public method to open a session from a given session file. |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
393 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
394 | @param sessionFilePath name of the session file to get session from |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
395 | @type str |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
396 | @param flags flags determining the open mode |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
397 | @type int |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
398 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
399 | if self.__isActive(sessionFilePath): |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
400 | return |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
401 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
402 | sessionData = self.readSessionFromFile(sessionFilePath) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
403 | if not sessionData or not sessionData["Windows"]: |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
404 | return |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
405 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
406 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
407 | window = WebBrowserWindow.mainWindow() |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
408 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
409 | if ((flags & SessionManager.SwitchSession) == |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
410 | SessionManager.SwitchSession): |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
411 | # save the current session |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
412 | self.writeCurrentSession(self.__lastActiveSession) |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
413 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
414 | # create new window for the new session |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
415 | window = window.newWindow(restoreSession=True) |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
416 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
417 | # close all existing windows |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
418 | for win in WebBrowserWindow.mainWindows()[:]: |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
419 | if win is not window: |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
420 | win.forceClose() |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
421 | |
8205
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
422 | if ( |
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
423 | (flags & SessionManager.ReplaceSession) != |
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
424 | SessionManager.ReplaceSession |
4a0f1f896341
Applied some code simplifications suggested by the new Simplify checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8143
diff
changeset
|
425 | ): |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
426 | self.__lastActiveSession = ( |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
427 | QFileInfo(sessionFilePath).canonicalFilePath() |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
428 | ) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
429 | self.__sessionMetaData = [] |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
430 | |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
431 | self.restoreSessionFromData(window, sessionData) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
432 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
433 | @classmethod |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
434 | def restoreSessionFromData(cls, window=None, sessionData=None): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
435 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
436 | Class method to restore a session from a session data dictionary. |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
437 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
438 | @param window reference to main window to restore to |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
439 | @type WebBrowserWindow |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
440 | @param sessionData dictionary containing the session data |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
441 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
442 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
443 | if window is None: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
444 | window = WebBrowserWindow.mainWindow() |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
445 | |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
446 | with EricOverrideCursor(): |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
447 | # restore session for first window |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
448 | data = sessionData["Windows"].pop(0) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
449 | window.tabWidget().loadFromSessionData(data) |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
450 | if "WindowGeometry" in data: |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
451 | geometry = QByteArray.fromBase64( |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
452 | data["WindowGeometry"].encode("ascii")) |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
453 | window.restoreGeometry(geometry) |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
454 | QApplication.processEvents() |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
455 | |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
456 | # restore additional windows |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
457 | for data in sessionData["Windows"]: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
458 | window = ( |
7775
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
459 | WebBrowserWindow.mainWindow().newWindow( |
4a1db75550bd
Changed code to not use deprecated 'QRegExp' anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7771
diff
changeset
|
460 | restoreSession=True) |
7771
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
461 | ) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
462 | window.tabWidget().loadFromSessionData(data) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
463 | if "WindowGeometry" in data: |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
464 | geometry = QByteArray.fromBase64( |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
465 | data["WindowGeometry"].encode("ascii")) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
466 | window.restoreGeometry(geometry) |
787a6b3f8c9f
Optimized the use of Waiting Cursors by using a specialized context manager class.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7759
diff
changeset
|
467 | QApplication.processEvents() |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
468 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
469 | if "CurrentWindowIndex" in sessionData: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
470 | currentWindowIndex = sessionData["CurrentWindowIndex"] |
8243
cc717c2ae956
Applied some more code simplifications suggested by the new Simplify checker (Y105: use contextlib.suppress) (batch 2).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8218
diff
changeset
|
471 | with contextlib.suppress(IndexError): |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
472 | currentWindow = ( |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
473 | WebBrowserWindow.mainWindows()[currentWindowIndex] |
7269
0c63ea7f94bd
Continued to resolve code style issue M841.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7229
diff
changeset
|
474 | ) |
5793
4ff73b969ab1
Some fixes and adjustments for the session support of the Web Browser NG.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5785
diff
changeset
|
475 | QTimer.singleShot(0, lambda: currentWindow.raise_()) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
476 | |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
477 | def renameSession(self, sessionFilePath, flags=0): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
478 | """ |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
479 | Public method to rename or clone a session. |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
480 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
481 | @param sessionFilePath name of the session file |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
482 | @type str |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
483 | @param flags flags determining a rename or clone operation |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
484 | @type int |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
485 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
486 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
487 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
488 | suggestedName = QFileInfo(sessionFilePath).baseName() |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
489 | if flags & SessionManager.CloneSession: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
490 | suggestedName += "_cloned" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
491 | title = self.tr("Clone Session") |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
492 | else: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
493 | suggestedName += "_renamed" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
494 | title = self.tr("Rename Session") |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
495 | newName, ok = QInputDialog.getText( |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
496 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
497 | title, |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
498 | self.tr("Please enter a new name:"), |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
499 | QLineEdit.EchoMode.Normal, |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
500 | suggestedName) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
501 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
502 | if not ok: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
503 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
504 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
505 | if not newName.endswith(".json"): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
506 | newName += ".json" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
507 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
508 | newSessionPath = os.path.join(self.getSessionsDirectory(), newName) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
509 | if os.path.exists(newSessionPath): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
510 | EricMessageBox.information( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
511 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
512 | title, |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
513 | self.tr("""The session file "{0}" exists already. Please""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
514 | """ enter another name.""").format(newName)) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
515 | self.renameSession(sessionFilePath, flags) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
516 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
517 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
518 | if flags & SessionManager.CloneSession: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
519 | if not QFile.copy(sessionFilePath, newSessionPath): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
520 | EricMessageBox.critical( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
521 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
522 | title, |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
523 | self.tr("""An error occurred while cloning the session""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
524 | """ file.""")) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
525 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
526 | else: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
527 | if not QFile.rename(sessionFilePath, newSessionPath): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
528 | EricMessageBox.critical( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
529 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
530 | title, |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
531 | self.tr("""An error occurred while renaming the session""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
532 | """ file.""")) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
533 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
534 | if self.__isActive(sessionFilePath): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
535 | self.__lastActiveSession = newSessionPath |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
536 | self.__sessionMetaData = [] |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
537 | |
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
538 | def saveSession(self): |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
539 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
540 | Public method to save the current session. |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
541 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
542 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
543 | newName, ok = QInputDialog.getText( |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
544 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
545 | self.tr("Save Session"), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
546 | self.tr("Please enter a name for the session:"), |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
547 | QLineEdit.EchoMode.Normal, |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
548 | self.tr("Saved Session ({0})").format( |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
549 | QDateTime.currentDateTime().toString("yyyy-MM-dd HH-mm-ss"))) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
550 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
551 | if not ok: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
552 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
553 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
554 | if not newName.endswith(".json"): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
555 | newName += ".json" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
556 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
557 | newSessionPath = os.path.join(self.getSessionsDirectory(), newName) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
558 | if os.path.exists(newSessionPath): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
559 | EricMessageBox.information( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
560 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
561 | self.tr("Save Session"), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
562 | self.tr("""The session file "{0}" exists already. Please""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
563 | """ enter another name.""").format(newName)) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
564 | self.saveSession() |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
565 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
566 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
567 | self.writeCurrentSession(newSessionPath) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
568 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
569 | def replaceSession(self, sessionFilePath): |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
570 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
571 | Public method to replace the current session with the given one. |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
572 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
573 | @param sessionFilePath file name of the session file to replace with |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
574 | @type str |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
575 | @return flag indicating success |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
576 | @rtype bool |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
577 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
578 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
579 | res = EricMessageBox.yesNo( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
580 | WebBrowserWindow.getWindow(), |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
581 | self.tr("Restore Backup"), |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
582 | self.tr("""Are you sure you want to replace the current""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
583 | """ session?""")) |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
584 | if res: |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
585 | self.openSession(sessionFilePath, SessionManager.ReplaceSession) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
586 | return True |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
587 | else: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
588 | return False |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
589 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
590 | def switchToSession(self, sessionFilePath): |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
591 | """ |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
592 | Public method to switch the current session to the given one. |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
593 | |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
594 | @param sessionFilePath file name of the session file to switch to |
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
595 | @type str |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
596 | @return flag indicating success |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
597 | @rtype bool |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
598 | """ |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
599 | self.openSession(sessionFilePath, SessionManager.SwitchSession) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
600 | return True |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
601 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
602 | def cloneSession(self, sessionFilePath): |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
603 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
604 | Public method to clone a session. |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
605 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
606 | @param sessionFilePath file name of the session file to be cloned |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
607 | @type str |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
608 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
609 | self.renameSession(sessionFilePath, SessionManager.CloneSession) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
610 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
611 | def deleteSession(self, sessionFilePath): |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
612 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
613 | Public method to delete a session. |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
614 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
615 | @param sessionFilePath file name of the session file to be deleted |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
616 | @type str |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
617 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
618 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
619 | res = EricMessageBox.yesNo( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
620 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
621 | self.tr("Delete Session"), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
622 | self.tr("""Are you sure you want to delete session "{0}"?""") |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
623 | .format(QFileInfo(sessionFilePath).baseName())) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
624 | if res: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
625 | QFile.remove(sessionFilePath) |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
626 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
627 | def newSession(self): |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
628 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
629 | Public method to start a new session. |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
630 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
631 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
632 | newName, ok = QInputDialog.getText( |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
633 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
634 | self.tr("New Session"), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
635 | self.tr("Please enter a name for the new session:"), |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
636 | QLineEdit.EchoMode.Normal, |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
637 | self.tr("New Session ({0})").format( |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
638 | QDateTime.currentDateTime().toString("yyyy-MM-dd HH-mm-ss"))) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
639 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
640 | if not ok: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
641 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
642 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
643 | if not newName.endswith(".json"): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
644 | newName += ".json" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
645 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
646 | newSessionPath = os.path.join(self.getSessionsDirectory(), newName) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
647 | if os.path.exists(newSessionPath): |
8356
68ec9c3d4de5
Renamed the modules and classes of the E5Gui package to have the prefix 'Eric' instead of 'E5'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
8318
diff
changeset
|
648 | EricMessageBox.information( |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
649 | WebBrowserWindow.getWindow(), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
650 | self.tr("New Session"), |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
651 | self.tr("""The session file "{0}" exists already. Please""" |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
652 | """ enter another name.""").format(newName)) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
653 | self.newSession() |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
654 | return |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
655 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
656 | self.writeCurrentSession(self.__lastActiveSession) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
657 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
658 | # create new window for the new session and close all existing windows |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
659 | window = WebBrowserWindow.mainWindow().newWindow() |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
660 | for win in WebBrowserWindow.mainWindows(): |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
661 | if win is not window: |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
662 | win.forceClose() |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
663 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
664 | self.__lastActiveSession = newSessionPath |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
665 | self.__autoSaveSession() |
5779
b53fabc86f3c
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5777
diff
changeset
|
666 | |
5780
79d06c98c5c9
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5779
diff
changeset
|
667 | def showSessionManagerDialog(self): |
5782
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
668 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
669 | Public method to show the session manager dialog. |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
670 | """ |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
671 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
672 | from .SessionManagerDialog import SessionManagerDialog |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
673 | |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
674 | dlg = SessionManagerDialog(WebBrowserWindow.getWindow()) |
60874802161b
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5780
diff
changeset
|
675 | dlg.open() |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
676 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
677 | def selectSession(self): |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
678 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
679 | Public method to select a session to be restored. |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
680 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
681 | @return name of the session file to be restored |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
682 | @rtype str |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
683 | """ |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
684 | from WebBrowser.WebBrowserWindow import WebBrowserWindow |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
685 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
686 | self.__fillMetaDataList() |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
687 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
688 | if self.__sessionMetaData: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
689 | # skip, if no session file available |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
690 | dlg = QDialog(WebBrowserWindow.getWindow(), |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
691 | Qt.WindowType.WindowStaysOnTopHint) |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
692 | lbl = QLabel(self.tr("Please select the startup session:")) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
693 | combo = QComboBox(dlg) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
694 | buttonBox = QDialogButtonBox( |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
695 | QDialogButtonBox.StandardButton.Ok | |
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
696 | QDialogButtonBox.StandardButton.Cancel, |
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
697 | dlg) |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
698 | buttonBox.accepted.connect(dlg.accept) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
699 | buttonBox.rejected.connect(dlg.reject) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
700 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
701 | layout = QVBoxLayout() |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
702 | layout.addWidget(lbl) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
703 | layout.addWidget(combo) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
704 | layout.addWidget(buttonBox) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
705 | dlg.setLayout(layout) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
706 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
707 | lastActiveSessionFileInfo = QFileInfo(self.__lastActiveSession) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
708 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
709 | for metaData in self.__sessionMetaData: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
710 | if QFileInfo(metaData.filePath) != lastActiveSessionFileInfo: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
711 | combo.addItem(metaData.name, metaData.filePath) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
712 | else: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
713 | combo.insertItem( |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
714 | 0, |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
715 | self.tr("{0} (last session)").format(metaData.name), |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
716 | metaData.filePath |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
717 | ) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
718 | combo.setCurrentIndex(0) |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
719 | |
8143
2c730d5fd177
Changed the use of PyQt enums because the way they were used previously is deprecated since two years and replaced some deprecated Qt stuff.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
7937
diff
changeset
|
720 | if dlg.exec() == QDialog.DialogCode.Accepted: |
5783
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
721 | session = combo.currentData() |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
722 | if session is None: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
723 | self.__lastActiveSession = self.__sessionDefault |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
724 | else: |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
725 | self.__lastActiveSession = session |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
726 | |
44a9f08de394
Continued implementing session support for the new web browser.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5782
diff
changeset
|
727 | return self.__lastActiveSession |