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

Provide HighDPI pixmaps of QupZilla logo

Browse Source
This commit is contained in:
David Rosca 2016-12-28 21:24:57 +01:00
parent 13a6573ecb
commit 897cdff77e
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ img {margin-bottom:15px;}
<div id="box">
<center>
<img src="%ABOUT-IMG%">
<img src="%ABOUT-IMG%" width="200" height="155">
%PRIVATE-BROWSING%
<form action="https://duckduckgo.com/" method="GET">
<input type="hidden" name="t" value="qupzilla" />

2
src/lib/data/icons.qrc
View File

@ -12,6 +12,7 @@
<file>icons/menu/tab-new.png</file>
<file>icons/menu/qt.png</file>
<file>icons/other/about.png</file>
<file>icons/other/about@2x.png</file>
<file>icons/other/feed.png</file>
<file>icons/other/bigstar.png</file>
<file>icons/locationbar/safe.png</file>
@ -64,6 +65,7 @@
<file>icons/menu/privatebrowsing.png</file>
<file>icons/menu/settings.png</file>
<file>icons/other/startpage.png</file>
<file>icons/other/startpage@2x.png</file>
<file>icons/other/audioplaying.png</file>
<file>icons/other/audiomuted.png</file>
<file>icons/preferences/tools-check-spelling.png</file>

BIN
src/lib/data/icons/other/about@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
src/lib/data/icons/other/startpage@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

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

@ -170,7 +170,7 @@ QString QupZillaSchemeReply::startPage()
sPage.append(QzTools::readAllFileContents(":html/start.html"));
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%"), QLatin1String("qrc:icons/other/startpage.png"));
sPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QIcon(":icons/other/startpage.png").pixmap(200, 155)).toString());
sPage.replace(QLatin1String("%TITLE%"), tr("Start Page"));
sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web"));
@ -191,7 +191,7 @@ QString QupZillaSchemeReply::aboutPage()
aPage.append(QzTools::readAllFileContents(":html/about.html"));
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%"), QLatin1String("qrc:icons/other/about.png"));
aPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QIcon(QSL(":icons/other/about.png")).pixmap(300, 130)).toString());
aPage.replace(QLatin1String("%COPYRIGHT-INCLUDE%"), QzTools::readAllFileContents(":html/copyright").toHtmlEscaped());
aPage.replace(QLatin1String("%TITLE%"), tr("About QupZilla"));
@ -356,7 +356,7 @@ QString QupZillaSchemeReply::configPage()
cPage.append(QzTools::readAllFileContents(":html/config.html"));
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%"), QLatin1String("qrc:icons/other/about.png"));
cPage.replace(QLatin1String("%ABOUT-IMG%"), QzTools::pixmapToDataUrl(QIcon(QSL(":icons/other/about.png")).pixmap(300, 130)).toString());
cPage.replace(QLatin1String("%TITLE%"), tr("Configuration Information"));
cPage.replace(QLatin1String("%CONFIG%"), tr("Configuration Information"));

2
src/lib/other/aboutdialog.cpp
View File

@ -35,6 +35,8 @@ AboutDialog::AboutDialog(QWidget* parent)
setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(this);
ui->label->setPixmap(QIcon(QSL(":icons/other/about.png")).pixmap(300, 130));
#ifdef Q_OS_WIN
if (QtWin::isCompositionEnabled()) {
QtWin::extendFrameIntoClientArea(this);

7
src/lib/other/aboutdialog.ui
View File

@ -19,9 +19,6 @@
</property>
<item>
<widget class="QLabel" name="label">
<property name="pixmap">
<pixmap resource="../data/icons.qrc">:/icons/other/about.png</pixmap>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
@ -72,9 +69,7 @@
</item>
</layout>
</widget>
<resources>
<include location="../data/icons.qrc"/>
</resources>
<resources/>
<connections>
<connection>
<sender>buttonBox</sender>