From: Manuel Nickschas Date: Tue, 20 Sep 2016 21:06:10 +0000 (+0200) Subject: Update ThanksTo in the AboutDlg X-Git-Tag: 0.12.5~49 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=6d074f5118a63712e8995902ebcca9232185211c;hp=862f33d6f9124a3ee6dbd4e90bcdfd8ba9abb77b Update ThanksTo in the AboutDlg This was pretty outdated and mentioned companies that no longer exist. Bring the content of that tab into the present. Add new icons, remove old. Also modernize the code a tiny bit, and ease the life of translators by factoring out most of the RichText stuff. (cherry picked from commit 69e767d13b6c2880a46d8a84cfab6678b15b26cf) Conflicts: src/qtui/aboutdlg.cpp --- diff --git a/icons/hicolor.qrc b/icons/hicolor.qrc index 2ad00b13..e7ae5e39 100644 --- a/icons/hicolor.qrc +++ b/icons/hicolor.qrc @@ -4,6 +4,7 @@ hicolor/22x22/apps/quassel.png hicolor/32x32/apps/quassel.png hicolor/48x48/apps/quassel.png + hicolor/32x32/apps/quassel.png hicolor/64x64/apps/quassel.png hicolor/128x128/apps/quassel.png hicolor/16x16/status/quassel-message.png diff --git a/pics/kde-vdg.png b/pics/kde-vdg.png new file mode 100644 index 00000000..5e7ee18b Binary files /dev/null and b/pics/kde-vdg.png differ diff --git a/pics/nokia.png b/pics/nokia.png deleted file mode 100644 index bd9862fb..00000000 Binary files a/pics/nokia.png and /dev/null differ diff --git a/pics/oxygen.png b/pics/oxygen.png deleted file mode 100644 index 430cfa7c..00000000 Binary files a/pics/oxygen.png and /dev/null differ diff --git a/pics/pics.qrc b/pics/pics.qrc index 0292b3aa..da6473de 100644 --- a/pics/pics.qrc +++ b/pics/pics.qrc @@ -1,7 +1,6 @@ - - nokia.png - oxygen.png + + kde-vdg.png quassel-eye.png quassel-logo.png qt-logo.png diff --git a/pics/qt-logo-32.png b/pics/qt-logo-32.png index 581ba2b1..cd8b7139 100644 Binary files a/pics/qt-logo-32.png and b/pics/qt-logo-32.png differ diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp index 1122afed..a69afd5d 100644 --- a/src/qtui/aboutdlg.cpp +++ b/src/qtui/aboutdlg.cpp @@ -50,17 +50,19 @@ AboutDlg::AboutDlg(QWidget *parent) QString AboutDlg::about() const { - QString res; - res = tr("A modern, distributed IRC Client

" + QString res {tr("A modern, distributed IRC Client

" "©%1 by the Quassel Project
" "http://quassel-irc.org
" "#quassel on Freenode

" "Quassel IRC is dual-licensed under GPLv2 and " - "GPLv3.
" - "Most icons are © by the Oxygen Team and used under the " - "LGPL.

" + "GPLv3.
" + "Breeze icon theme © Uri Herrera and others, licensed under the " + "LGPLv3.
" + "Oxygen icon theme © Nuno Pinheiro and others, licensed under the " + "LGPLv3.

" "Please use http://bugs.quassel-irc.org to report bugs." - ).arg("2005-2015"); + ).arg("2005-2016") + }; return res; } @@ -68,9 +70,8 @@ QString AboutDlg::about() const QString AboutDlg::authors() const { - QString res; - res = tr("Quassel IRC is mainly developed by:") + "
"; - for (const auto &person : _aboutData->authors()) { + QString res {tr("Quassel IRC is mainly developed by:") + "
"}; + for (auto &&person : _aboutData->authors()) { res.append("
" + person.prettyName() + "
"); if (!person.emailAddress().isEmpty()) res.append("" + person.emailAddress() + "
"); @@ -83,31 +84,36 @@ QString AboutDlg::authors() const QString AboutDlg::contributors() const { - QString res; - res = tr("We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:") + "
"; - for (const auto &person : _aboutData->credits()) { + QString res {tr("We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:") + "
"}; + for (auto &&person : _aboutData->credits()) { res.append("
" + person.prettyName() + "
" + person.task() + "
"); } res.append("
" + tr("...and anybody else finding and reporting bugs, giving feedback, helping others and being part of the community!")); - return res; } QString AboutDlg::thanksTo() const { - QString res; - res = tr("Special thanks goes to:
" - "
" - "
 John \"nox\" Hand
" - "
for the original Quassel icon - The All-Seeing Eye
" - "
 The Oxygen Team
" - "
for creating all the artwork you see throughout Quassel
" - "
 Qt Software formerly known as Trolltech
" - "
for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more
" - "
" - "
for sponsoring development of Quassel Mobile with N810s
" - ); + QString res {tr("Special thanks goes to:") + "
" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + "
 John \"nox\" Hand
" + tr("for the original Quassel logo - The All-Seeing Eye") + "
Nuno Pinheiro
" + tr("for the current Quassel logo") + "
The KDE Visual Design Group
" + tr("for the amazing Breeze and Oxygen icon themes") + "
The Qt Company (formerly known as Qt Software, Nokia, Trolltech)
" + tr("for creating an awesome framework, and for sponsoring development with Greenphones, N810s, N950s and more") + "
" + }; return res; } diff --git a/src/qtui/ui/aboutdlg.ui b/src/qtui/ui/aboutdlg.ui index 72e14db2..e7edcd99 100644 --- a/src/qtui/ui/aboutdlg.ui +++ b/src/qtui/ui/aboutdlg.ui @@ -9,8 +9,8 @@ 0 0 - 488 - 494 + 864 + 628 diff --git a/src/uisupport/aboutdata.h b/src/uisupport/aboutdata.h index 6c306be9..afc7a7bd 100644 --- a/src/uisupport/aboutdata.h +++ b/src/uisupport/aboutdata.h @@ -20,7 +20,9 @@ #pragma once +#include #include +#include #ifdef HAVE_KF5 # include