Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

New logo

Browse Source 
Thanks to Adrien Vigneron and Elio Qoshi
This commit is contained in:
David Rosca 2015-11-08 22:28:01 +01:00
parent 999bfd3b9a
commit 8b2e6bf9b6
30 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AUTHORS
View File

@ -12,7 +12,8 @@ Bryan M Dunsmore <dunsmoreb@gmail.com> (opening background tab
Mariusz Fik <fisiu@opensuse.org> (fixed tab order in preferences dialog) Mariusz Fik <fisiu@opensuse.org> (fixed tab order in preferences dialog)
Daniele Cocca <jmc@chakra-project.org> (close tabs with middle click, initial work on speed dial) Daniele Cocca <jmc@chakra-project.org> (close tabs with middle click, initial work on speed dial)
Giuseppe Calà <jiveaxe@gmail.com> (fixed loading of bookmarklets) Giuseppe Calà <jiveaxe@gmail.com> (fixed loading of bookmarklets)
Jan Rajnoha <honza.rajny@hotmail.com> (QupZilla icon) Adrien Vigneron <adrienvigneron@ml1.net> (new QupZilla logo)
Elio Qoshi <ping@elioqoshi.me> (new QupZilla logo)
Translators: Translators:
@ -56,5 +57,5 @@ Special thanks:
Jonathan Hooverman <jonathan.hooverman@gmail.com> (english language correction) Jonathan Hooverman <jonathan.hooverman@gmail.com> (english language correction)
Peter Vacula <pvacula1989@gmail.com> (for a big support in the beginnings) Peter Vacula <pvacula1989@gmail.com> (for a big support in the beginnings)
Sergio Cipolla <secipolla@gmail.com> (modifications to QupZilla icon) Sergio Cipolla <secipolla@gmail.com> (modifications to old QupZilla icon)
Radomir Orkac (qupzilla.com domain) Radomir Orkac (qupzilla.com domain)

BIN
linux/hicolor/128x128/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
linux/hicolor/16x16/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 883 B

After

Width:  |  Height:  |  Size: 746 B

BIN
linux/hicolor/256x256/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
linux/hicolor/32x32/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
linux/hicolor/48x48/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
linux/hicolor/64x64/apps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
linux/pixmaps/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -12,7 +12,7 @@ dl {margin-top: 0px;}
dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%}
dd {color: black;margin: 0 0 0.3em 28%;} dd {color: black;margin: 0 0 0.3em 28%;}
p {margin-%LEFT_STR%: 1%;} p {margin-%LEFT_STR%: 1%;}
.about-img {float: %RIGHT_STR%;margin-top: 15px;margin-%RIGHT_STR%: -25px;} .about-img {float: %RIGHT_STR%;}
</style> </style>
</head> </head>
<body> <body>

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

@ -12,7 +12,7 @@ dl {margin-top: 0px;}
dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%} dt {display: block;float: %LEFT_STR%;min-width: 24%;margin: 0 0 0.3em 1%}
dd {color: black;margin: 0 0 0.3em 28%;} dd {color: black;margin: 0 0 0.3em 28%;}
p {margin-%LEFT_STR%: 1%;} p {margin-%LEFT_STR%: 1%;}
.about-img {float: %RIGHT_STR%;margin-top: 15px;margin-%RIGHT_STR%: -25px;} .about-img {float: %RIGHT_STR%;}
table.tbl {width: 100%;margin: 15px 0;border-radius: 4px;padding: 0px;border: 2px solid #aaa;border-collapse: separate;} table.tbl {width: 100%;margin: 15px 0;border-radius: 4px;padding: 0px;border: 2px solid #aaa;border-collapse: separate;}
.tbl th{border-radius: 2px;border: 1px solid #aaa;padding: 1px 3px;background: #eee;font-style:italic;} .tbl th{border-radius: 2px;border: 1px solid #aaa;padding: 1px 3px;background: #eee;font-style:italic;}
.tbl th[colspan="2"] {text-align: center;background: #ddd;font-style:normal;} .tbl th[colspan="2"] {text-align: center;background: #ddd;font-style:normal;}

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

@ -11,6 +11,7 @@ h1 {color: #1a4ba4;font-size: 160%;margin-top: 0px;}
.submit {margin-top: 5px;} .submit {margin-top: 5px;}
a {color: #1a4ba4;text-decoration: none;font-weight: bold;} a {color: #1a4ba4;text-decoration: none;font-weight: bold;}
.bottom {margin-top: 20px;margin-bottom: 3px;} .bottom {margin-top: 20px;margin-bottom: 3px;}
img {margin-bottom:15px;}
</style> </style>
</head> </head>
<body onload="document.getElementById('inp').focus()"> <body onload="document.getElementById('inp').focus()">

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

@ -1,7 +1,6 @@
<RCC> <RCC>
<qresource prefix="/"> <qresource prefix="/">
<file>icons/qupzilla.png</file> <file>icons/qupzilla.png</file>
<file>icons/qupzillaupdate.png</file>
<file>icons/preferences/applications-internet.png</file> <file>icons/preferences/applications-internet.png</file>
<file>icons/preferences/applications-system.png</file> <file>icons/preferences/applications-system.png</file>
<file>icons/preferences/applications-webbrowsers.png</file> <file>icons/preferences/applications-webbrowsers.png</file>
@ -64,5 +63,6 @@
<file>icons/other/empty-page.png</file> <file>icons/other/empty-page.png</file>
<file>icons/menu/privatebrowsing.png</file> <file>icons/menu/privatebrowsing.png</file>
<file>icons/menu/settings.png</file> <file>icons/menu/settings.png</file>
<file>icons/other/startpage.png</file>
</qresource> </qresource>
</RCC> </RCC>

BIN
src/lib/data/icons/exeicons/page.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/lib/data/icons/exeicons/page16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 665 B

BIN
src/lib/data/icons/exeicons/page32.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/lib/data/icons/exeicons/page48.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/lib/data/icons/exeicons/qupzilla-window.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 94 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
src/lib/data/icons/exeicons/qupzilla.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 1.4 MiB

BIN
src/lib/data/icons/other/about.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
src/lib/data/icons/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 872 B

After

Width:  |  Height:  |  Size: 657 B

BIN
src/lib/data/icons/qupzillaupdate.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 899 B

BIN
src/lib/data/qupzilla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

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

@ -170,7 +170,7 @@ 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("%BOX-BORDER%"), QLatin1String("qrc:html/box-border.png"));
sPage.replace(QLatin1String("%ABOUT-IMG%"), QLatin1String("qrc:icons/other/about.png")); sPage.replace(QLatin1String("%ABOUT-IMG%"), QLatin1String("qrc:icons/other/startpage.png"));
sPage.replace(QLatin1String("%TITLE%"), tr("Start Page")); sPage.replace(QLatin1String("%TITLE%"), tr("Start Page"));
sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web")); sPage.replace(QLatin1String("%BUTTON-LABEL%"), tr("Search on Web"));
@ -212,12 +212,13 @@ QString QupZillaSchemeReply::aboutPage()
aPage.replace(QLatin1String("%CONTRIBUTORS%"), tr("Contributors")); aPage.replace(QLatin1String("%CONTRIBUTORS%"), tr("Contributors"));
aPage.replace(QLatin1String("%CONTRIBUTORS-TEXT%"), aPage.replace(QLatin1String("%CONTRIBUTORS-TEXT%"),
authorString("Mladen Pejaković", "pejakm@autistici.org") + "<br/>" + authorString("Mladen Pejaković", "pejakm@autistici.org") + "<br/>" +
authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "<br/>" + authorString("Adrien Vigneron", "adrienvigneron@ml1.net") + "<br/>" +
authorString("Elio Qoshi", "ping@elioqoshi.me") + "<br/>" +
authorString("Seyyed Razi Alavizadeh", "s.r.alavizadeh@gmail.com") + "<br/>" + authorString("Seyyed Razi Alavizadeh", "s.r.alavizadeh@gmail.com") + "<br/>" +
authorString("Alexander Samilov", "alexsamilovskih@gmail.com") + "<br/>" +
authorString("Franz Fellner", "alpine.art.de@googlemail.com") + "<br/>" + authorString("Franz Fellner", "alpine.art.de@googlemail.com") + "<br/>" +
authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "<br/>" + authorString("Bryan M Dunsmore", "dunsmoreb@gmail.com") + "<br/>" +
authorString("Mariusz Fik", "fisiu@opensuse.org") + "<br/>" + authorString("Mariusz Fik", "fisiu@opensuse.org") + "<br/>" +
authorString("Jan Rajnoha", "honza.rajny@hotmail.com") + "<br/>" +
authorString("Daniele Cocca", "jmc@chakra-project.org") authorString("Daniele Cocca", "jmc@chakra-project.org")
); );
aPage.replace(QLatin1String("%TRANSLATORS%"), tr("Translators")); aPage.replace(QLatin1String("%TRANSLATORS%"), tr("Translators"));

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

@ -65,7 +65,7 @@ void AboutDialog::showAbout()
m_showingAuthors = false; m_showingAuthors = false;
ui->authorsButton->setText(tr("Authors and Contributors")); ui->authorsButton->setText(tr("Authors and Contributors"));
if (m_aboutHtml.isEmpty()) { if (m_aboutHtml.isEmpty()) {
m_aboutHtml += "<center><div style='margin:10px;'>"; m_aboutHtml += "<center><div style='margin:20px;'>";
m_aboutHtml += tr("<p><b>Application version %1</b><br/>").arg( m_aboutHtml += tr("<p><b>Application version %1</b><br/>").arg(
#ifdef GIT_REVISION #ifdef GIT_REVISION
QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION) QString("%1 (%2)").arg(Qz::VERSION, GIT_REVISION)
@ -91,12 +91,13 @@ void AboutDialog::showAuthors()
m_authorsHtml += tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(Qz::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>"); m_authorsHtml += tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(Qz::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>");
m_authorsHtml += tr("<p><b>Contributors:</b><br/>%1</p>").arg( m_authorsHtml += tr("<p><b>Contributors:</b><br/>%1</p>").arg(
QString::fromUtf8("Mladen Pejaković<br/>" QString::fromUtf8("Mladen Pejaković<br/>"
"Alexander Samilov<br/>"
"Seyyed Razi Alavizadeh<br/>" "Seyyed Razi Alavizadeh<br/>"
"Adrien Vigneron<br/>"
"Elio Qoshi<br/>"
"Alexander Samilov<br/>"
"Franz Fellner<br/>" "Franz Fellner<br/>"
"Bryan M Dunsmore<br/>" "Bryan M Dunsmore<br/>"
"Mariusz Fik<br/>" "Mariusz Fik<br/>"
"Jan Rajnoha<br/>"
"Daniele Cocca") "Daniele Cocca")
); );

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

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>381</width> <width>446</width>
<height>416</height> <height>382</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -32,13 +32,6 @@
<property name="horizontalScrollBarPolicy"> <property name="horizontalScrollBarPolicy">
<enum>Qt::ScrollBarAlwaysOff</enum> <enum>Qt::ScrollBarAlwaysOff</enum>
</property> </property>
<property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
</property> </property>

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

@ -148,7 +148,7 @@ void Updater::downCompleted()
Version updated(html); Version updated(html);
if (current.isValid && updated.isValid && current < updated) { if (current.isValid && updated.isValid && current < updated) {
mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download.")); mApp->desktopNotifications()->showNotification(QPixmap(":icons/qupzilla.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
} }
} }

BIN
windows/install.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
windows/uninstall.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
windows/welcome.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 150 KiB