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

Fixed build issue. Closes #16

Browse Source
This commit is contained in:
nowrep 2011-10-19 16:49:04 +02:00
parent 13bde06e9e
commit 6225283814
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -5,6 +5,7 @@ David Rosca <nowrep@gmail.com>
Contributors: Contributors:
Daniele Cocca <jmc@chakra-project.org> (added close tabs with middle click feature) Daniele Cocca <jmc@chakra-project.org> (added close tabs with middle click feature)
Jan Rajnoha <honza.rajny@hotmail.com> (QupZilla icon)
Translators: Translators:

3
src/QupZilla.pro
View File

@ -315,7 +315,7 @@ unix {
icon_folder = "$$d_prefix"share/pixmaps icon_folder = "$$d_prefix"share/pixmaps
} }
DEFINES += USE_DATADIR=\""$$data_folder"/\" DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\""
target.path = $$binary_folder target.path = $$binary_folder
@ -355,4 +355,3 @@ message($$DEFINES)

17
src/network/qupzillaschemehandler.cpp
View File

@ -21,6 +21,11 @@
#include "mainapplication.h" #include "mainapplication.h"
#include "webpage.h" #include "webpage.h"
QString authorString(const QString &name, const QString &mail)
{
return QString("%1 &lt;<a href=mailto:%2>%2</a>&gt;").arg(name, mail);
}
QupZillaSchemeHandler::QupZillaSchemeHandler(QObject* parent) : QupZillaSchemeHandler::QupZillaSchemeHandler(QObject* parent) :
QObject(parent) QObject(parent)
{ {
@ -170,13 +175,15 @@ QString QupZillaSchemeReply::aboutPage()
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Plugins"), mApp->PLUGINSDIR) + QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Plugins"), mApp->PLUGINSDIR) +
QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Translations"), mApp->TRANSLATIONSDIR)); QString("<dt>%1</dt><dd>%2<dd>").arg(tr("Translations"), mApp->TRANSLATIONSDIR));
page.replace("%MAIN-DEVELOPER%", tr("Main developer")); page.replace("%MAIN-DEVELOPER%", tr("Main developer"));
page.replace("%MAIN-DEVELOPER-TEXT%", QupZilla::AUTHOR + " &lt;<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>&gt;"); page.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com"));
page.replace("%CONTRIBUTORS%", tr("Contributors")); page.replace("%CONTRIBUTORS%", tr("Contributors"));
page.replace("%CONTRIBUTORS-TEXT%", "Daniele Cocca &lt;<a href=mailto:jmc@chakra-project.org>jmc@chakra-project.org</a>&gt;"); page.replace("%CONTRIBUTORS-TEXT%", authorString("Daniele Cocca", "jmc@chakra-project.org") + "<br/>" +
authorString("Jan Rajnoha", "honza.rajny@hotmail.com")
);
page.replace("%TRANSLATORS%", tr("Translators")); page.replace("%TRANSLATORS%", tr("Translators"));
page.replace("%TRANSLATORS-TEXT%", "Heimen Stoffels &lt;<a href=mailto:vistausss@gmail.com>vistausss@gmail.com</a>&gt; (Dutch)<br/>" page.replace("%TRANSLATORS-TEXT%", authorString("Heimen Stoffels", "vistausss@gmail.com") + " (Dutch)<br/>" +
"Peter Vacula &lt;<a href=mailto:pvacula1989@gmail.com>pvacula1989@gmail.com</a>&gt; (Slovak)<br/>" authorString("Peter Vacula", "pvacula1989@gmail.com") + " (Slovak)<br/>" +
"Jonathan Hooverman &lt;<a href=mailto:jonathan.hooverman@gmail.com>jonathan.hooverman@gmail.com</a>&gt; (German)<br/>"); authorString("Jonathan Hooverman", "jonathan.hooverman@gmail.com") + " (German)<br/>");
return page; return page;
} }

2
src/other/aboutdialog.cpp
View File

@ -70,7 +70,7 @@ void AboutDialog::showAuthors()
if (m_authorsHtml.isEmpty()) { if (m_authorsHtml.isEmpty()) {
m_authorsHtml.append("<div style='margin:10px;'>"); m_authorsHtml.append("<div style='margin:10px;'>");
m_authorsHtml.append(tr("<p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>")); m_authorsHtml.append(tr("<p><b>Main developers:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>"));
m_authorsHtml.append(tr("<p><b>Contributors:</b><br/>%1</p>").arg("Daniele Cocca")); m_authorsHtml.append(tr("<p><b>Contributors:</b><br/>%1</p>").arg("Daniele Cocca<br/>Jan Rajnoha"));
m_authorsHtml.append(tr("<p><b>Translators:</b><br/>%1</p>").arg("Heimen Stoffels (Dutch)<br/>" m_authorsHtml.append(tr("<p><b>Translators:</b><br/>%1</p>").arg("Heimen Stoffels (Dutch)<br/>"
"Peter Vacula (Slovakia)<br/>" "Peter Vacula (Slovakia)<br/>"
"Jonathan Hooverman (German)")); "Jonathan Hooverman (German)"));