Add broken error pages
This commit is contained in:
Florian Bruhin
parent
203fa3eb34
commit
e56ed54102
2
TODO
2
TODO
@ -64,6 +64,8 @@ Other stuff
|
|||||||
make sure webview.page() and page.mainFrame() never change
|
make sure webview.page() and page.mainFrame() never change
|
||||||
http://agateau.com/article-series/pyqtwebkit-experiments/
|
http://agateau.com/article-series/pyqtwebkit-experiments/
|
||||||
https://code.google.com/p/devicenzo/source/browse/trunk/devicenzo.py
|
https://code.google.com/p/devicenzo/source/browse/trunk/devicenzo.py
|
||||||
|
http://die-offenbachs.homelinux.org:48888/hg/eric5/file/5d937eb378dd/Helpviewer
|
||||||
|
|
||||||
|
|
||||||
Keybinding stuff (from dwb)
|
Keybinding stuff (from dwb)
|
||||||
===========================
|
===========================
|
||||||
|
|||||||
63
qutebrowser/html/error.html
Normal file
63
qutebrowser/html/error.html
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
<!-- Based on html/error.html from dwb -->
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<title>{title}</title>
|
||||||
|
<!--<link rel='icon' type='image/png' href="{icon}">-->
|
||||||
|
<style type="text/css">
|
||||||
|
body {{
|
||||||
|
background-color: #fff;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
}}
|
||||||
|
|
||||||
|
#errorContainer {{
|
||||||
|
background: #fff;
|
||||||
|
min-width: 35em;
|
||||||
|
max-width: 35em;
|
||||||
|
position: absolute;
|
||||||
|
top: 2em;
|
||||||
|
left: 1em;
|
||||||
|
padding: 10px;
|
||||||
|
border: 2px solid #eee;
|
||||||
|
-webkit-border-radius: 5px;
|
||||||
|
}}
|
||||||
|
|
||||||
|
#errorTitleText {{
|
||||||
|
font-size: 118%;
|
||||||
|
font-weight: bold;
|
||||||
|
}}
|
||||||
|
|
||||||
|
#errorMessageText {{
|
||||||
|
font-size: 80%;
|
||||||
|
}}
|
||||||
|
</style>
|
||||||
|
<script type="text/javascript">
|
||||||
|
function tryagain()
|
||||||
|
{{
|
||||||
|
location.reload();
|
||||||
|
}}
|
||||||
|
function searchFor(uri) {{
|
||||||
|
location.href = uri;
|
||||||
|
}}
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div id="errorContainer">
|
||||||
|
<div id="errorTitle">
|
||||||
|
<p id="errorTitleText">Unable to load page</p>
|
||||||
|
</div>
|
||||||
|
<div id="errorMessage">
|
||||||
|
<p>Problem occurred while loading the URL {url}</p>
|
||||||
|
<p id="errorMessageText">{error}</a>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form name="bl">
|
||||||
|
<input type="button" value="Try again" onclick="javascript:tryagain()" />
|
||||||
|
<!--<input type="button" value="Search" style="visibility:%s" onclick="javascript:searchFor('%s')" />-->
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@ -17,6 +17,8 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
|
# along with qutebrowser. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import os.path
|
||||||
|
|
||||||
from PyQt5.QtCore import pyqtRemoveInputHook
|
from PyQt5.QtCore import pyqtRemoveInputHook
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -39,3 +41,12 @@ def set_trace():
|
|||||||
print("before executing c(ontinue).")
|
print("before executing c(ontinue).")
|
||||||
pyqtRemoveInputHook()
|
pyqtRemoveInputHook()
|
||||||
return pdb_set_trace()
|
return pdb_set_trace()
|
||||||
|
|
||||||
|
|
||||||
|
def read_file(filename):
|
||||||
|
"""Return the contents of a file contained with qutebrowser."""
|
||||||
|
fn = os.path.join(os.path.dirname(os.path.realpath(__file__)),
|
||||||
|
os.path.pardir, filename)
|
||||||
|
with open(fn, 'r') as f:
|
||||||
|
# FIXME is there a nicer way?
|
||||||
|
return '\n'.join(f.readlines())
|
||||||
|
|||||||
@ -25,16 +25,19 @@ containing BrowserTabs).
|
|||||||
import logging
|
import logging
|
||||||
import functools
|
import functools
|
||||||
|
|
||||||
|
import sip
|
||||||
from PyQt5.QtWidgets import QShortcut, QApplication, QSizePolicy
|
from PyQt5.QtWidgets import QShortcut, QApplication, QSizePolicy
|
||||||
from PyQt5.QtCore import pyqtSignal, Qt, QEvent
|
from PyQt5.QtCore import pyqtSignal, Qt, QEvent
|
||||||
from PyQt5.QtGui import QClipboard
|
from PyQt5.QtGui import QClipboard
|
||||||
from PyQt5.QtPrintSupport import QPrintPreviewDialog
|
from PyQt5.QtPrintSupport import QPrintPreviewDialog
|
||||||
|
from PyQt5.QtNetwork import QNetworkReply
|
||||||
from PyQt5.QtWebKitWidgets import QWebView, QWebPage
|
from PyQt5.QtWebKitWidgets import QWebView, QWebPage
|
||||||
|
|
||||||
import qutebrowser.utils.about as about
|
import qutebrowser.utils.about as about
|
||||||
import qutebrowser.utils.url as urlutils
|
import qutebrowser.utils.url as urlutils
|
||||||
from qutebrowser.widgets.tabbar import TabWidget
|
from qutebrowser.widgets.tabbar import TabWidget
|
||||||
from qutebrowser.utils.signals import dbg_signal, SignalCache
|
from qutebrowser.utils.signals import dbg_signal, SignalCache
|
||||||
|
from qutebrowser.utils.misc import read_file
|
||||||
|
|
||||||
|
|
||||||
class TabbedBrowser(TabWidget):
|
class TabbedBrowser(TabWidget):
|
||||||
@ -437,6 +440,7 @@ class BrowserTab(QWebView):
|
|||||||
|
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
|
self.setPage(BrowserPage())
|
||||||
self.signal_cache = SignalCache(uncached=['linkHovered'])
|
self.signal_cache = SignalCache(uncached=['linkHovered'])
|
||||||
self.loadProgress.connect(self.set_progress)
|
self.loadProgress.connect(self.set_progress)
|
||||||
self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
|
self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
|
||||||
@ -533,3 +537,47 @@ class BrowserTab(QWebView):
|
|||||||
self._open_new_tab = (e.button() == Qt.MidButton or
|
self._open_new_tab = (e.button() == Qt.MidButton or
|
||||||
e.modifiers() & Qt.ControlModifier)
|
e.modifiers() & Qt.ControlModifier)
|
||||||
return super().event(e)
|
return super().event(e)
|
||||||
|
|
||||||
|
|
||||||
|
class BrowserPage(QWebPage):
|
||||||
|
|
||||||
|
"""Our own QWebPage with advanced features."""
|
||||||
|
|
||||||
|
_extension_handlers = None
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
super().__init__()
|
||||||
|
self._extension_handlers = {
|
||||||
|
QWebPage.ErrorPageExtension: self._handle_errorpage,
|
||||||
|
}
|
||||||
|
|
||||||
|
def supportsExtension(self, ext):
|
||||||
|
"""Override QWebPage::supportsExtension to provide error pages."""
|
||||||
|
return ext in self._extension_handlers
|
||||||
|
|
||||||
|
def extension(self, ext, opt, out):
|
||||||
|
"""Override QWebPage::extension to provide error pages."""
|
||||||
|
try:
|
||||||
|
handler = self._extension_handlers[ext]
|
||||||
|
except KeyError:
|
||||||
|
return super().extension(ext, opt, out)
|
||||||
|
return handler(opt, out)
|
||||||
|
|
||||||
|
def _handle_errorpage(self, opt, out):
|
||||||
|
"""Display an error page if needed.
|
||||||
|
|
||||||
|
Loosly based on Helpviewer/HelpBrowserWV.py from eric5
|
||||||
|
(line 260 @ 5d937eb378dd)
|
||||||
|
|
||||||
|
"""
|
||||||
|
info = sip.cast(opt, QWebPage.ErrorPageExtensionOption)
|
||||||
|
errpage = sip.cast(out, QWebPage.ErrorPageExtensionReturn)
|
||||||
|
errpage.baseUrl = info.url
|
||||||
|
if (info.domain == QWebPage.QtNetwork and
|
||||||
|
info.error == QNetworkReply.OperationCanceledError):
|
||||||
|
return False
|
||||||
|
urlstr = urlutils.urlstring(info.url)
|
||||||
|
title = "Error loading page: {}".format(urlstr)
|
||||||
|
errpage.content = read_file('html/error.html').format(
|
||||||
|
title=title, url=urlstr, error=info.errorString)
|
||||||
|
return True
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user