Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

Don't use border image in internal pages

Browse Source 
Also cleanup unused pages
This commit is contained in:
David Rosca 2016-12-31 15:08:47 +01:00
parent 9b3fc5f404
commit 8664dd8c7e
13 changed files with 7 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/data/html.qrc
View File

@ -1,10 +1,8 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>html/errorPage.html</file>
<file>html/adblock_big.png</file> <file>html/adblock_big.png</file>
<file>html/adblock.html</file> <file>html/adblock.html</file>
<file>html/about.html</file> <file>html/about.html</file>
<file>html/box-border.png</file>
<file>html/copyright</file> <file>html/copyright</file>
<file>html/reportbug.html</file> <file>html/reportbug.html</file>
<file>html/start.html</file> <file>html/start.html</file>
@ -20,7 +18,6 @@
<file>html/configure.png</file> <file>html/configure.png</file>
<file>html/config.html</file> <file>html/config.html</file>
<file>html/restore.html</file> <file>html/restore.html</file>
<file>html/dirlist.html</file>
<file>html/tabcrash.html</file> <file>html/tabcrash.html</file>
</qresource> </qresource>
</RCC> </RCC>

2
src/lib/data/html/about.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;} html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;-webkit-border-image: url(%BOX-BORDER%) 25;text-align: %LEFT_STR%;} #box {background: #ffffff; max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;text-align: %LEFT_STR%;}
h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;} h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;}
h2 {margin: 5px 0px;font-size: 100%;color: #525c66;font-weight: bold;} h2 {margin: 5px 0px;font-size: 100%;color: #525c66;font-weight: bold;}
dl {margin-top: 0px;} dl {margin-top: 0px;}

2
src/lib/data/html/adblock.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;} html {background: #dddddd;}
body {background: #dddddd;} body {background: #dddddd;}
#box {background: white;border: 1px solid lightgrey;max-width: 300px;height: 80%;overflow:auto;padding: 25px;padding-bottom: 10px;border-radius: 15px;text-align: center;vertical-align: middle;margin: auto;direction: %DIRECTION%;} #box {background: #ffffff;max-width: 300px;height: 80%;overflow:auto;padding: 25px;padding-bottom: 10px;text-align: center;vertical-align: middle;margin: auto;direction: %DIRECTION%;}
h2 {font-size: 100%;font-weight: bold; border-bottom: 1px solid #f4f4f4; margin-bottom: 0px;} h2 {font-size: 100%;font-weight: bold; border-bottom: 1px solid #f4f4f4; margin-bottom: 0px;}
</style> </style>
</head> </head>

BIN
src/lib/data/html/box-border.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

2
src/lib/data/html/config.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;} html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;-webkit-border-image: url(%BOX-BORDER%) 25;text-align: %LEFT_STR%;direction: %DIRECTION%;} #box {background: #ffffff; max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;text-align: %LEFT_STR%;direction: %DIRECTION%;}
h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;} h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;}
h2 {margin: 5px 0px;font-size: 100%;color: #525c66;font-weight: bold;} h2 {margin: 5px 0px;font-size: 100%;color: #525c66;font-weight: bold;}
dl {margin-top: 0px;} dl {margin-top: 0px;}

71
src/lib/data/html/dirlist.html
View File

@ -1,71 +0,0 @@
<html><head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>%TITLE%</title>
<style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;-webkit-border-image: url(%BOX-BORDER%) 25;text-align: %LEFT_STR%;direction: %DIRECTION%;}
h1 {color:#1a4ba4;font-size:120%;margin-bottom:0px;word-wrap:break-word;}
a{text-decoration:none;}
a:hover{text-decoration:underline;}
p{margin-bottom:0;}
h1 a{ border-bottom: 1px solid rgba(0, 130, 217, 0.196); color: #0082D9;}
h1 a:hover{ text-decoration:none; border-bottom: 1px solid rgba(0, 130, 217, 1); color: #0082D9;}
.dir-up{float:%LEFT_STR%;padding-%LEFT_STR%:22px;font-size:105%;height:30px;background:transparent url(data:image/png;base64,%UP-IMG%) no-repeat;background-position-x:%LEFT_STR%}
.show-hidden{float:%RIGHT_STR%;font-size:105%;height:30px;}
.tr-hidden{display:none;}
.tr-visible{display:table-row;}
.file-table{width:95%;margin-left:auto;margin-right:auto;}
.file-table th{font-size:105%;}
.file-table td{padding-%LEFT_STR%:8px;}
.name{width:100%;text-align:%LEFT_STR%;}
.size{min-width:80px;}
.modif{min-width:120px;}
.td-size{text-align:%RIGHT_STR%;}
.td-name{padding-%LEFT_STR%:20px !important;background-color:transparent;background-repeat:no-repeat;background-position:center %LEFT_STR%;}
</style>
<script>
function showHidden()
{
var hElems = document.getElementsByClassName('tr-hidden');
var vElems = document.getElementsByClassName('tr-visible');
var dest = new Array();
if (hElems.length > 0) {
for(var i = 0; i < hElems.length; ++i)
dest[i] = hElems[i];
for (var s = 0; s < dest.length; ++s)
dest[s].className = "tr-visible";
}
else if (vElems.length > 0) {
for(var i = 0; i < vElems.length; ++i)
dest[i] = vElems[i];
for (var s = 0; s < dest.length; ++s)
dest[s].className = "tr-hidden";
}
}
</script>
</head>
<body>
<div id="box">
<h1>%CLICKABLE-TITLE%</h1>
<p class="dir-up" style="display:%UP-DIR-DISPLAY%"><a href="%UP-DIR-LINK%">%UP-DIR-TEXT%</a></p>
<p class="show-hidden" style="display:%SHOW-HIDDEN-DISPLAY%"><label><input type="checkbox" onchange="showHidden()">%SHOW-HIDDEN-TEXT%</label></p>
<span style="clear:both;display:block;visibility:hidden;"></span>
<table class="file-table">
<thead>
<tr>
<th class="name">%NAME%</th>
<th class="size">%SIZE%</th>
<th class="modif" colspan="2">%MODIFIED%</th>
</tr>
</thead>
<tbody>
%T-BODY%
</tbody>
</table>
</div>
</body></html>

30
src/lib/data/html/errorPage.html
View File

@ -1,30 +0,0 @@
<html><head>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<title>%TITLE%</title>
<link rel="icon" href="data:image/png;base64,%FAVICON%" type="image/x-icon" />
<style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;text-align: %LEFT_STR%;-webkit-border-image: url(%BOX-BORDER%) 25;direction: %DIRECTION%;}
hr {color: lightgray;width: 100%;}
img {float: %LEFT_STR%;margin-%LEFT_STR%: -20px;margin-top: 15px;}
h1 {font-size: 150%;font-weight: bold;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;margin-%RIGHT_STR%: 50px;}
h2 {font-size: 100%;font-weight: normal;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;padding: 5px 0px 10px 2px;margin-%RIGHT_STR%: 50px;}
ul {font-size: 90%;padding-%LEFT_STR%: 48px;margin: 20px 0;max-width:600px;}
li {padding: 5px;}
#reloadButton {padding-%LEFT_STR%: 48px;margin-top: 20px;min-width: 100px;}
</style>
</head>
<body>
<div id="box">
<img src="data:image/png;base64,%IMAGE%" >
<h1>%HEADING%</h1>
<h2>%HEADING2%</h2>
<ul>
<li>%LI-1%</li>
<li>%LI-2%</li>
<li>%LI-3%</li>
<input type="submit" id="reloadButton" value="%TRY-AGAIN%" onclick="window.location.reload()">
</ul>
</div>
</body></html>

2
src/lib/data/html/reportbug.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;} html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;-webkit-border-image: url(%BOX-BORDER%) 25;text-align: %LEFT_STR%;direction: %DIRECTION%;} #box {background: #ffffff;max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;text-align: %LEFT_STR%;direction: %DIRECTION%;}
h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;} h1 {color: #1a4ba4;font-size: 160%;margin-bottom: 0px;}
p {margin-%LEFT_STR%: 1%;} p {margin-%LEFT_STR%: 1%;}
.submit {width: 100px;} .submit {width: 100px;}

2
src/lib/data/html/restore.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;} html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;text-align: %LEFT_STR%;-webkit-border-image: url(%BOX-BORDER%) 25;direction: %DIRECTION%;} #box {background: #ffffff;max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;text-align: %LEFT_STR%;direction: %DIRECTION%;}
hr {color: lightgray;width: 100%;} hr {color: lightgray;width: 100%;}
img.warning {float: %LEFT_STR%;margin-%LEFT_STR%: -20px;margin-top: 15px;} img.warning {float: %LEFT_STR%;margin-%LEFT_STR%: -20px;margin-top: 15px;}
h1 {font-size: 150%;font-weight: bold;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;margin-%RIGHT_STR%: 50px;} h1 {font-size: 150%;font-weight: bold;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;margin-%RIGHT_STR%: 50px;}

2
src/lib/data/html/start.html
View File

@ -4,7 +4,7 @@
<link rel="icon" href="%FAVICON%" type="image/x-icon" /> <link rel="icon" href="%FAVICON%" type="image/x-icon" />
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
#box {max-width: 500px;min-width:450px;margin: 25px auto 0px auto;padding: 0px 40px 0px 40px;border-width: 20px;-webkit-border-image: url(%BOX-BORDER%) 25;direction: %DIRECTION%;} #box {background: #ffffff; max-width: 500px;min-width:450px;margin: 25px auto 0px auto;padding: 15px 40px 15px 40px;direction: %DIRECTION%;}
h1 {color: #1a4ba4;font-size: 160%;margin-top: 0px;} h1 {color: #1a4ba4;font-size: 160%;margin-top: 0px;}
.line {width: 400px;height: 25px;text-align: center;border: 1px solid #babcb8;} .line {width: 400px;height: 25px;text-align: center;border: 1px solid #babcb8;}
.line:focus {border-color: #579eea;} .line:focus {border-color: #579eea;}

2
src/lib/data/html/tabcrash.html
View File

@ -5,7 +5,7 @@
<style> <style>
html {background: #dddddd;font-family: sans-serif;color: #525c66;} html {background: #dddddd;font-family: sans-serif;color: #525c66;}
html * {font-size: 100%;line-height: 1.6;} html * {font-size: 100%;line-height: 1.6;}
#box {max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;border-width: 20px;text-align: %LEFT_STR%;-webkit-border-image: url(%BOX-BORDER%) 25;direction: %DIRECTION%;} #box {background: #ffffff;max-width:650px;min-width:400px;overflow:auto;margin: 25px auto 10px auto;padding: 10px 40px;text-align: %LEFT_STR%;direction: %DIRECTION%;}
hr {color: lightgray;width: 100%;} hr {color: lightgray;width: 100%;}
img {float: %LEFT_STR%;margin-%LEFT_STR%: -20px;margin-top: 15px;} img {float: %LEFT_STR%;margin-%LEFT_STR%: -20px;margin-top: 15px;}
h1 {font-size: 150%;font-weight: bold;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;margin-%RIGHT_STR%: 50px;} h1 {font-size: 150%;font-weight: bold;border-bottom: 1px solid #f4f4f4;margin-%LEFT_STR%: 48px;margin-%RIGHT_STR%: 50px;}

6
src/lib/network/schemehandlers/qupzillaschemehandler.cpp
View File

@ -130,7 +130,6 @@ QString QupZillaSchemeReply::reportbugPage()
bPage.append(QzTools::readAllFileContents(":html/reportbug.html")); bPage.append(QzTools::readAllFileContents(":html/reportbug.html"));
bPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); bPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png"));
bPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
bPage.replace(QLatin1String("%TITLE%"), tr("Report Issue")); bPage.replace(QLatin1String("%TITLE%"), tr("Report Issue"));
bPage.replace(QLatin1String("%REPORT-ISSUE%"), tr("Report Issue")); bPage.replace(QLatin1String("%REPORT-ISSUE%"), tr("Report Issue"));
@ -169,7 +168,6 @@ QString QupZillaSchemeReply::startPage()
sPage.append(QzTools::readAllFileContents(":html/start.html")); sPage.append(QzTools::readAllFileContents(":html/start.html"));
sPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); sPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png"));
sPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
sPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/startpage.png"))).toString()); sPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/startpage.png"))).toString());
sPage.replace(QLatin1String("%TITLE%"), tr("Start Page")); sPage.replace(QLatin1String("%TITLE%"), tr("Start Page"));
@ -190,7 +188,6 @@ QString QupZillaSchemeReply::aboutPage()
if (aPage.isEmpty()) { if (aPage.isEmpty()) {
aPage.append(QzTools::readAllFileContents(":html/about.html")); aPage.append(QzTools::readAllFileContents(":html/about.html"));
aPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); aPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png"));
aPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
aPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString()); aPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString());
aPage.replace(QLatin1String("%COPYRIGHT-INCLUDE%"), QzTools::readAllFileContents(":html/copyright").toHtmlEscaped()); aPage.replace(QLatin1String("%COPYRIGHT-INCLUDE%"), QzTools::readAllFileContents(":html/copyright").toHtmlEscaped());
@ -330,7 +327,6 @@ QString QupZillaSchemeReply::restorePage()
if (rPage.isEmpty()) { if (rPage.isEmpty()) {
rPage.append(QzTools::readAllFileContents(":html/restore.html")); rPage.append(QzTools::readAllFileContents(":html/restore.html"));
rPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); rPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png"));
rPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
rPage.replace(QLatin1String("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString()); rPage.replace(QLatin1String("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString());
rPage.replace(QLatin1String("%TITLE%"), tr("Restore Session")); rPage.replace(QLatin1String("%TITLE%"), tr("Restore Session"));
rPage.replace(QLatin1String("%OOPS%"), tr("Oops, QupZilla crashed.")); rPage.replace(QLatin1String("%OOPS%"), tr("Oops, QupZilla crashed."));
@ -354,7 +350,6 @@ QString QupZillaSchemeReply::configPage()
if (cPage.isEmpty()) { if (cPage.isEmpty()) {
cPage.append(QzTools::readAllFileContents(":html/config.html")); cPage.append(QzTools::readAllFileContents(":html/config.html"));
cPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png")); cPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:icons/qupzilla.png"));
cPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
cPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString()); cPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QzTools::dpiAwarePixmap(QSL(":icons/other/about.png"))).toString());
cPage.replace(QLatin1String("%TITLE%"), tr("Configuration Information")); cPage.replace(QLatin1String("%TITLE%"), tr("Configuration Information"));
@ -489,7 +484,6 @@ QString QupZillaSchemeReply::adblockPage()
if (aPage.isEmpty()) { if (aPage.isEmpty()) {
aPage.append(QzTools::readAllFileContents(":html/adblock.html")); aPage.append(QzTools::readAllFileContents(":html/adblock.html"));
aPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:html/adblock_big.png")); aPage.replace(QLatin1String("%FAVICON%"), QLatin1String("qrc:html/adblock_big.png"));
aPage.replace(QLatin1String("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
aPage.replace(QLatin1String("%IMAGE%"), QLatin1String("qrc:html/adblock_big.png")); aPage.replace(QLatin1String("%IMAGE%"), QLatin1String("qrc:html/adblock_big.png"));
aPage.replace(QLatin1String("%TITLE%"), tr("Blocked content")); aPage.replace(QLatin1String("%TITLE%"), tr("Blocked content"));
aPage = QzTools::applyDirectionToPage(aPage); aPage = QzTools::applyDirectionToPage(aPage);

1
src/lib/webengine/webpage.cpp
View File

@ -385,7 +385,6 @@ void WebPage::renderProcessTerminated(QWebEnginePage::RenderProcessTerminationSt
QString page = QzTools::readAllFileContents(":html/tabcrash.html"); QString page = QzTools::readAllFileContents(":html/tabcrash.html");
page.replace(QL1S("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString()); page.replace(QL1S("%IMAGE%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45)).toString());
page.replace(QL1S("%FAVICON%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16)).toString()); page.replace(QL1S("%FAVICON%"), QzTools::pixmapToDataUrl(IconProvider::standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16)).toString());
page.replace(QL1S("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
page.replace(QL1S("%TITLE%"), tr("Failed loading page")); page.replace(QL1S("%TITLE%"), tr("Failed loading page"));
page.replace(QL1S("%HEADING%"), tr("Failed loading page")); page.replace(QL1S("%HEADING%"), tr("Failed loading page"));
page.replace(QL1S("%LI-1%"), tr("Something went wrong while loading this page.")); page.replace(QL1S("%LI-1%"), tr("Something went wrong while loading this page."));