summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-01-27 14:21:47 +0100
committerFlorian Bruhin <me@the-compiler.org>2021-01-27 14:21:47 +0100
commitb6d67062661ee515da35202aafc94b6c2924d52c (patch)
tree21fc9d96ccd073060ad866e2b7a8b6bea65be2c2
parent72bc00f7f50035905c4355a94c13258cb95a9f10 (diff)
downloadqutebrowser-b6d67062661ee515da35202aafc94b6c2924d52c.tar.gz
qutebrowser-b6d67062661ee515da35202aafc94b6c2924d52c.zip
Update Qt 5.15 session warning again
Also don't show it for new users - this doesn't really help much if someone just started using qutebrowser. See #5359
-rw-r--r--qutebrowser/app.py6
-rw-r--r--qutebrowser/html/warning-sessions.html2
2 files changed, 7 insertions, 1 deletions
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 05350bdb6..51a5db8b7 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -372,6 +372,12 @@ def _open_special_pages(args):
'qute://warning/sessions'),
]
+ if 'quickstart-done' not in general_sect:
+ # New users aren't going to be affected by the Qt 5.15 session change much, as
+ # they aren't used to qutebrowser saving the full back/forward history in
+ # sessions.
+ general_sect['session-warning-shown'] = '1'
+
for state, condition, url in pages:
if general_sect.get(state) != '1' and condition:
tabbed_browser.tabopen(QUrl(url), background=False)
diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html
index 82bc02aab..d297a2656 100644
--- a/qutebrowser/html/warning-sessions.html
+++ b/qutebrowser/html/warning-sessions.html
@@ -9,7 +9,7 @@ qute://warning/sessions</span> to show it again at a later time.</span>
<p>Since Qt doesn't provide an API to load the history of a tab, qutebrowser relies on a reverse-engineered binary serialization format to load tab history from session files. With Qt 5.15, unfortunately that format changed (due to the underlying Chromium upgrade), in a way which makes it impossible for qutebrowser to load tab history from existing session data.</p>
-<p>At the time of writing (October 2020), a new session format which stores part of the needed binary data in saved sessions is <a href="https://github.com/qutebrowser/qutebrowser/issues/5359">in development</a> and is expected to be released with qutebrowser v2.0.0 (planned to be released at the end of the year or early 2021).</p>
+<p>At the time of writing (January 2021), a new session format which stores part of the needed binary data in saved sessions is <a href="https://github.com/qutebrowser/qutebrowser/issues/5359">in development</a>. However, it unfortunately wasn't ready in time for qutebrowser v2.0.0, as it's a rather big refactoring. It's currently expected to be released as part of qutebrowser v2.1.0.</p>
<p>As a stop-gap measure:</p>