1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
|
diff --git a/app/profile.py b/app/profile.py
index 2fa0773..e99a56a 100644
--- a/app/profile.py
+++ b/app/profile.py
@@ -1,4 +1,4 @@
-from PySide6.QtWebEngineCore import QWebEngineProfile
+from PySide6.QtWebEngineCore import QWebEngineProfile, QWebEngineSettings
from pathlib import Path
@@ -9,6 +9,9 @@ def create_profile(incognito: bool = False, parent=None):
profile.setPersistentCookiesPolicy(
QWebEngineProfile.NoPersistentCookies
)
+ profile.settings().setAttribute(
+ QWebEngineSettings.WebAttribute.PdfViewerEnabled, True
+ )
return profile
data_path = Path.home() / ".config" / "horaizan"
@@ -20,5 +23,8 @@ def create_profile(incognito: bool = False, parent=None):
profile.setPersistentCookiesPolicy(
QWebEngineProfile.ForcePersistentCookies
)
+ profile.settings().setAttribute(
+ QWebEngineSettings.WebAttribute.PdfViewerEnabled, True
+ )
return profile
diff --git a/app/settings.py b/app/settings.py
index 3d17832..bd83030 100644
--- a/app/settings.py
+++ b/app/settings.py
@@ -11,6 +11,7 @@ class Settings:
DEFAULT_CONFIRM_CLEAR_DATA = True
DEFAULT_SHORTCUTS = {
"new_tab": "Ctrl+T",
+ "reopen_closed_tab": "Ctrl+Shift+T",
"open_incognito": "Ctrl+Shift+N",
"close_tab": "Ctrl+W",
"reload": "Ctrl+R",
@@ -147,6 +148,20 @@ class Settings:
self.SEARCH_ENGINE_HOME[self.DEFAULT_SEARCH_ENGINE]
)
+ # ======================
+ # SESSION
+ # ======================
+
+ def session_tabs(self) -> list[str]:
+ raw = self._settings.value("session/tabs", [], type=list)
+ if not raw:
+ return []
+ return [str(value) for value in raw if str(value).strip()]
+
+ def set_session_tabs(self, tabs: list[str]):
+ normalized = [str(tab) for tab in tabs if str(tab).strip()]
+ self._settings.setValue("session/tabs", normalized)
+
# ======================
# RESET
# ======================
diff --git a/app/window.py b/app/window.py
index e7ddafc..c3444f7 100644
--- a/app/window.py
+++ b/app/window.py
@@ -2,7 +2,7 @@ from pathlib import Path
import sys
from PySide6.QtCore import Qt, QUrl, QSize, QStandardPaths
-from PySide6.QtGui import QKeySequence, QShortcut, QIcon
+from PySide6.QtGui import QKeySequence, QShortcut, QIcon, QCloseEvent
from PySide6.QtWidgets import QMainWindow, QTabWidget, QWidget, QVBoxLayout, QToolButton, QApplication
from PySide6.QtWebEngineCore import QWebEnginePage
from PySide6.QtWebEngineWidgets import QWebEngineView
@@ -59,6 +59,7 @@ class BrowserWindow(QMainWindow):
self.tabs.setIconSize(QSize(18, 18))
self.tabs.tabCloseRequested.connect(self.on_tab_close_requested)
self.tabs.currentChanged.connect(self._update_window_title)
+ self.tabs.currentChanged.connect(lambda _index: self._save_session_tabs())
tab_bar = self.tabs.tabBar()
tab_bar.setExpanding(False)
@@ -74,7 +75,11 @@ class BrowserWindow(QMainWindow):
self.tabs.setCornerWidget(add, Qt.TopRightCorner)
self._shortcuts: dict[str, QShortcut] = {}
+ self._reopen_tab_shortcut = QShortcut(QKeySequence("Ctrl+Shift+T"), self)
+ self._reopen_tab_shortcut.setContext(Qt.WindowShortcut)
+ self._reopen_tab_shortcut.activated.connect(self.reopen_last_closed_tab)
self._devtools_windows: dict[WebView, QMainWindow] = {}
+ self._closed_tabs_stack: list[QUrl] = []
self.download_manager = DownloadManagerDialog(self)
self.history_manager = HistoryManagerDialog(self)
self.cookie_manager = CookieManagerDialog(self.profile.cookieStore(), self)
@@ -83,7 +88,8 @@ class BrowserWindow(QMainWindow):
self.profile.downloadRequested.connect(self._on_download_requested)
- self.add_tab()
+ if self.incognito or not self._restore_session_tabs():
+ self.add_tab()
self.set_theme(self.settings.theme())
self.apply_shortcuts()
self._bind_system_theme_change()
@@ -208,7 +214,7 @@ class BrowserWindow(QMainWindow):
title += " [Инкогнито]"
self.setWindowTitle(title)
- def add_tab(self):
+ def add_tab(self, url: QUrl | None = None):
container = QWidget()
layout = QVBoxLayout(container)
layout.setContentsMargins(0, 0, 0, 0)
@@ -229,14 +235,19 @@ class BrowserWindow(QMainWindow):
view.titleChanged.connect(lambda text, v=view: self._update_tab_title(v, text))
view.iconChanged.connect(lambda icon, v=view: self._update_tab_icon(v, icon))
view.urlChanged.connect(lambda _url, v=view: self._update_tab_title(v))
+ view.urlChanged.connect(lambda _url: self._save_session_tabs())
view.loadFinished.connect(lambda ok, v=view: self._record_history_for_view(v, ok))
- mode = self.settings.new_tab_mode()
- if mode == "blank":
- view.setUrl(QUrl("about:blank"))
+ if url is not None and url.isValid() and not url.isEmpty():
+ view.setUrl(url)
else:
- home_url = self.settings.search_engine_home_url()
- view.setUrl(QUrl(home_url))
+ mode = self.settings.new_tab_mode()
+ if mode == "blank":
+ view.setUrl(QUrl("about:blank"))
+ else:
+ home_url = self.settings.search_engine_home_url()
+ view.setUrl(QUrl(home_url))
+ self._save_session_tabs()
def on_tab_close_requested(self, index: int):
if index < 0:
@@ -246,13 +257,22 @@ class BrowserWindow(QMainWindow):
if container is not None:
webview = getattr(container, "webview", None)
if webview:
+ closed_url = webview.url()
+ if (
+ closed_url.isValid()
+ and not closed_url.isEmpty()
+ and closed_url.scheme() not in ("about", "horaizan")
+ ):
+ self._closed_tabs_stack.append(closed_url)
self._close_devtools_for_view(webview)
if self.tabs.count() <= 1:
+ self._save_session_tabs()
self.close()
return
self.tabs.removeTab(index)
+ self._save_session_tabs()
self._update_window_title()
def close_current_tab(self):
@@ -275,6 +295,49 @@ class BrowserWindow(QMainWindow):
view = self.current_webview()
if view:
view.setUrl(url)
+ self._save_session_tabs()
+
+ def reopen_last_closed_tab(self):
+ while self._closed_tabs_stack:
+ url = self._closed_tabs_stack.pop()
+ if not url.isValid() or url.isEmpty():
+ continue
+ self.add_tab(url=url)
+ return
+
+ def _session_urls(self) -> list[str]:
+ urls: list[str] = []
+ for idx in range(self.tabs.count()):
+ container = self.tabs.widget(idx)
+ view = getattr(container, "webview", None)
+ if view is None:
+ continue
+ url = view.url()
+ if not url.isValid() or url.isEmpty():
+ continue
+ if url.scheme() in ("about", "horaizan"):
+ continue
+ urls.append(url.toString())
+ return urls
+
+ def _restore_session_tabs(self) -> bool:
+ session_tabs = self.settings.session_tabs()
+ if not session_tabs:
+ return False
+
+ restored = 0
+ for tab_url in session_tabs:
+ url = QUrl.fromUserInput(tab_url)
+ if not url.isValid() or url.isEmpty():
+ continue
+ self.add_tab(url=url)
+ restored += 1
+ return restored > 0
+
+ def _save_session_tabs(self):
+ if self.incognito:
+ return
+ self.settings.set_session_tabs(self._session_urls())
def open_incognito_window(self):
window = BrowserWindow(incognito=True)
@@ -409,6 +472,10 @@ class BrowserWindow(QMainWindow):
self.profile.clearHttpCache()
self.profile.cookieStore().deleteAllCookies()
+ def closeEvent(self, event: QCloseEvent):
+ self._save_session_tabs()
+ super().closeEvent(event)
+
def set_shortcut(self, action: str, sequence: str) -> bool:
if action not in self.settings.DEFAULT_SHORTCUTS:
return False
@@ -429,6 +496,7 @@ class BrowserWindow(QMainWindow):
actions = {
"new_tab": self.add_tab,
+ "reopen_closed_tab": self.reopen_last_closed_tab,
"open_incognito": self.open_incognito_window,
"close_tab": self.close_current_tab,
"reload": self.reload_current_page,
|