Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Edited error page, it has now the same look as the start and reportbug

Browse Source 
pages.
This commit is contained in:
nowrep 2011-10-15 13:40:25 +02:00
parent b094c3e7db
commit 70d22ca07e
3 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
README
View File

@ -1,27 +0,0 @@
#################################
## QUPZILLA - WEB BROWSER ##
#################################
Version: 1.0.0-rc1
Windows:
use precompiled windows installer in downloads
Unix:
cd src/
qmake
make
make install
You may need to run make install as root.
NOTE: Before building, please read BUILDING informations.
If you are experiencing some sort of issue, please read FAQ first.
Thank You!
QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org
Written in Qt Framework http://qt.nokia.com
Project mainpage at http://www.qupzilla.co.cc
English Wiki at https://github.com/nowrep/QupZilla/wiki
Download at https://github.com/nowrep/QupZilla/downloads
Full Changelog at https://github.com/nowrep/QupZilla/wiki/Changelog

34
src/data/html/errorPage.html
View File

@ -2,10 +2,28 @@
<title>%TITLE%</title>
<link rel="icon" href="data:image/png;base64,%FAVICON%" type="image/x-icon" />
<style>
body {
padding: 3em 0em;
html {
background: #eeeeee;
font: 14px/22px "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #525c66;
}
html * {
font-size: 100%;
line-height: 1.6;
}
#box {
max-width: 650px;
max-height: 330px;
overflow:auto;
margin: 25px auto 10px auto;
padding: 10px 40px;
border-width: 20px;
text-align: left;
-webkit-border-image: url(data:image/png;base64,%BOX-BORDER%) 25;
}
hr {
color: lightgray;
width: 100%;
@ -15,17 +33,7 @@ img {
margin-left: -20px;
margin-top: 15px;
}
#box {
background: white;
border: 1px solid lightgrey;
max-width: 700px;
max-height: 330px;
overflow:auto;
padding: 20px 20px 30px 50px;
margin: auto;
border-radius: 15px;
}
h1 {
font-size: 150%;
font-weight: bold;
@ -38,7 +46,7 @@ h2 {
font-weight: normal;
border-bottom: 1px solid #f4f4f4;
margin-left: 48px;
padding: 5px 0px 20px 2px;
padding: 5px 0px 10px 2px;
margin-right: 50px;
}
ul {

10
src/webview/webpage.cpp
View File

@ -296,13 +296,9 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
QString errString = file.readAll();
errString.replace("%TITLE%", tr("Failed loading page"));
QByteArray image = qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45,45));
if (!image.isEmpty())
errString.replace("%IMAGE%", image);
image = qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16,16));
if (!image.isEmpty())
errString.replace("%FAVICON%", image);
errString.replace("%IMAGE%", qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45,45)));
errString.replace("%FAVICON%", qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16,16)));
errString.replace("%BOX-BORDER%", qz_pixmapToByteArray(QPixmap(":html/box-border.png")));
errString.replace("%HEADING%", errorString);
errString.replace("%HEADING2%", tr("QupZilla can't load page from %1.").arg(QUrl(loadedUrl).host()));