diff --git a/AUTHORS b/AUTHORS index c7461b7d6..d4540f836 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,6 +5,7 @@ David Rosca Contributors: Daniele Cocca (added close tabs with middle click feature) +Jan Rajnoha (QupZilla icon) Translators: diff --git a/src/QupZilla.pro b/src/QupZilla.pro index b3bfc8112..ee91c8796 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -315,7 +315,7 @@ unix { icon_folder = "$$d_prefix"share/pixmaps } - DEFINES += USE_DATADIR=\""$$data_folder"/\" + DEFINES += USE_DATADIR=\\\"""$$data_folder/"\\\"" target.path = $$binary_folder @@ -355,4 +355,3 @@ message($$DEFINES) - diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index a34ef740d..0ab3267a9 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -21,6 +21,11 @@ #include "mainapplication.h" #include "webpage.h" +QString authorString(const QString &name, const QString &mail) +{ + return QString("%1 <%2>").arg(name, mail); +} + QupZillaSchemeHandler::QupZillaSchemeHandler(QObject* parent) : QObject(parent) { @@ -170,13 +175,15 @@ QString QupZillaSchemeReply::aboutPage() QString("
%1
%2
").arg(tr("Plugins"), mApp->PLUGINSDIR) + QString("
%1
%2
").arg(tr("Translations"), mApp->TRANSLATIONSDIR)); page.replace("%MAIN-DEVELOPER%", tr("Main developer")); - page.replace("%MAIN-DEVELOPER-TEXT%", QupZilla::AUTHOR + " <nowrep@gmail.com>"); + page.replace("%MAIN-DEVELOPER-TEXT%", authorString(QupZilla::AUTHOR, "nowrep@gmail.com")); page.replace("%CONTRIBUTORS%", tr("Contributors")); - page.replace("%CONTRIBUTORS-TEXT%", "Daniele Cocca <jmc@chakra-project.org>"); + page.replace("%CONTRIBUTORS-TEXT%", authorString("Daniele Cocca", "jmc@chakra-project.org") + "
" + + authorString("Jan Rajnoha", "honza.rajny@hotmail.com") + ); page.replace("%TRANSLATORS%", tr("Translators")); - page.replace("%TRANSLATORS-TEXT%", "Heimen Stoffels <vistausss@gmail.com> (Dutch)
" - "Peter Vacula <pvacula1989@gmail.com> (Slovak)
" - "Jonathan Hooverman <jonathan.hooverman@gmail.com> (German)
"); + page.replace("%TRANSLATORS-TEXT%", authorString("Heimen Stoffels", "vistausss@gmail.com") + " (Dutch)
" + + authorString("Peter Vacula", "pvacula1989@gmail.com") + " (Slovak)
" + + authorString("Jonathan Hooverman", "jonathan.hooverman@gmail.com") + " (German)
"); return page; } diff --git a/src/other/aboutdialog.cpp b/src/other/aboutdialog.cpp index 75750e547..1a950d3cf 100644 --- a/src/other/aboutdialog.cpp +++ b/src/other/aboutdialog.cpp @@ -70,7 +70,7 @@ void AboutDialog::showAuthors() if (m_authorsHtml.isEmpty()) { m_authorsHtml.append("
"); m_authorsHtml.append(tr("

Main developers:
%1 <%2>

").arg(QupZilla::AUTHOR, "nowrep@gmail.com")); - m_authorsHtml.append(tr("

Contributors:
%1

").arg("Daniele Cocca")); + m_authorsHtml.append(tr("

Contributors:
%1

").arg("Daniele Cocca
Jan Rajnoha")); m_authorsHtml.append(tr("

Translators:
%1

").arg("Heimen Stoffels (Dutch)
" "Peter Vacula (Slovakia)
" "Jonathan Hooverman (German)"));