From 6d074f5118a63712e8995902ebcca9232185211c Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Tue, 20 Sep 2016 23:06:10 +0200 Subject: [PATCH] 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 --- icons/hicolor.qrc | 1 + pics/kde-vdg.png | Bin 0 -> 1196 bytes pics/nokia.png | Bin 2879 -> 0 bytes pics/oxygen.png | Bin 2121 -> 0 bytes pics/pics.qrc | 5 ++-- pics/qt-logo-32.png | Bin 2020 -> 629 bytes src/qtui/aboutdlg.cpp | 56 +++++++++++++++++++++----------------- src/qtui/ui/aboutdlg.ui | 4 +-- src/uisupport/aboutdata.h | 2 ++ 9 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 pics/kde-vdg.png delete mode 100644 pics/nokia.png delete mode 100644 pics/oxygen.png 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 0000000000000000000000000000000000000000..5e7ee18bbb9f183129d4489e48f2364c0f239634 GIT binary patch literal 1196 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 X($fEFhUs@EUIT!>u8B^yHWK%5oz_mL diff --git a/pics/oxygen.png b/pics/oxygen.png deleted file mode 100644 index 430cfa7c3bb03d8a442eded5fd4b799a04d42b47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2121 zcmV-P2)6f$P)aS}n=!00006VoOIv0RI600RN!9r;`8x2i8eM zK~#9!tyf!Y99J3s=FENe>h*eKJ9ZK~G-(oOTBwKsl^4`j$OHmXXd4hbghwP^5aO*u zMO3_$2c$eu1ytImsHK7kQK~A?QcBwtkw9>j=4Qv2UE8~BulF)DJGV3ZXWNNZ@v0>X zpY(fn*XPXl{onteGiPu+7&`itP9ftqAl(94URULr&wqUU@Myu>Ur1})i#cN`;xXUo zcx#PzP+q9E&;D(;aypLVzcya@c5u4_65^c`#q?vJ*+2I1XAg|4+wuksjX{?ss0xEX z7{%~Hj&8uQP<8P3#nr~E7s^jG+s+dt#K8a@IDYa-W!*NU4)Cv9 z=Z=DciClyr@KCOIP+q(qq?~y<6RyRkP9FvE$2K-3E zxdjhCOiT~+Xm3fD7pqNNUEaWZi|aAxY?pKsd5SWBBR^ES+wL^My$$Rdu~4h7Ma9m) z;z`q13WWkJ%Yvq9kR%DzaJ}$654LTiw%&-#@kGS8-NW+PG<)aL8dBLJa`__0EEh}V zWr{j@jKAQGN57z;4~(&sne6c0j@`!Q#wrYjW3#*z+$CL9CU=iYnal(fMG@nA}N7v~*gHDvf6Vidb9kg4dS;D33$@?aTgt)5<=?d5F!% zDm0m6Tw3uynJMd&6L-Kg&4l>vn?-_@p7>eB5tde*QrO7?< z^2)Vm`Rs`^i2y-P&TBu_brb9L3K01yS#Ef5YE_%sH3h>kAj@)(tY1Vwgn%SC=b}U+ zSUh(j46RQ`e&~^i8cJh3rLlV-D3@nXK!D+W%ve_D9=B`5v75+RYWxZ9T0A|qlWfn3 zti;X4RfG_fd>;5)@?G@Hf$33Yl3(L_%S0Hs=(IPX8`gJ+j{Z7*!vV(RuhDWst6A@@ z^KrHo?A=k+a=DzSc`y4U^W-`R{SJtTq6ovo!`R6@5Qub(2r+m2_$anJb+&12gWLAtbsf65 zb)+W%z&=egioWLpQ3z9(yr~gG7mcK*$V-Q1N|-xECZ1Z?15yC*e8@Y@QB|G!w~eN%4B(12uOoKQz4QvHJK&ZCk`ZW zs}A&!7fCThob~2$2+&gu%-UV81cCqf`>8FBC#@bSxjoypF8FX0av2X=bEZ9 zfT0;0>6RNrC1M^RAc-vkl1OUbFF@3Msja$x5T$~MBdzM<_sbwKIjaK;do7L7* zP{^)s*wS33N#rH6Kf6p$A4eZ#^ud{Z@tS();WpXypu`j`RB9*=rI@D<>2F=xw8O65 z9m%NFd#WS|lWdbSVWqa||LOdS`|?!|nEBM@#VXEUUg?qN^22Tr1P_*f_2nxc`C?M~ z#`8bOWb!|u14{1{vwI?kPwm?QLzCgyj-OY35~5`cMGA$dw#VaYJM09Cl}o1#skZ6h z@8_|%W4Hp4tFboTHyo0Li>r|N^w_6)0YNsCdZ|miB - - 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 581ba2b17e792ac4d33fa79853bdfc5cef1131bd..cd8b71397a6f281e2ee94e24f9e29af3f96ccb6e 100644 GIT binary patch delta 605 zcmV-j0;2uo5A_6)BYy%sNklF~N$P`i{6G6_~`Nn(8=V3Bq(UVlDcRT2yJ zJDq#a<$b^R-gCd_!3_U9Y@LIZ{Hh7P28s!pw8OeDazl3)F8mQ*A!2~SKA_o7rUvwi-WQoStZ5}p{Etdccy zY@ffe6!2hJ^8JgbAkP{(_A3YMR}KWBd%?xt(yk@RFwB`HLJxzu7hC|GT%?E;qaqhC zC&f-RSw)e&oPXY&jU~YJ1Og7VO;}0xm-rUX_PS_4f1-z-0(NXul69KJ%3tdRo{V_zXiyxf0+e=Xpy z@$U;T^MFnas*#BWv_7gx-hm<%$=hE0>kb5bzRrnwsu|Rtd;$Crwv% zQ>(TVFjfd**A_dsHPG89M#R-vJ`gV_#g00g)~Mt_$g~Em@UHZMfUI)({b-z@k}Dwe r#s4Wk))h<$K@RtC#a-kx%mDBQfxgu5#o|9a00000NkvXXu0mjf@6aZM delta 2007 zcmV;|2PpXU1mq8pBYyw}VoOIv0RI600RN!9r;`8x010qNS#tmY0LB0S0LB5ZbeqKh z000Sga6xAP001BW001BWhx(kI000K)NklPytiho2Pv?>jikf17vM^c3l zA+>6hk{5a5IB7#%*G_D&?X11_uJptb1 zQ{|P`JB7SX^>ydnGe^>yXpQY%+0!#GfE5_tlD24m=#g5YF&m}K?1RMAwK2v2lmnB` z>8$JOeksN2U`U)8PpQ##${!p{`RDq2-L6=TtvhzUcYhtg7qsT}ntEH_|Ct!Uken&J zkhD$%)Ebm;(Av1t5?7RG28R;f_od{(z9-ILPa9W_F)~zUVOe5MVS_;%jn*0|BvM${ z#Z3nn0-S&VL;z?qnkL&3OQbB`m)DP;eO6KmJl`jq@hPL4#gXNN168;xk2Y$S5e73U zcHL`&(tiM(d6={WeV5XN^2>Pa{_V8Xt)Ma1!0<#L?_D{;p`JY?GCkPRDXJ@j6gIXk z&{~y1X4Ssw!=<3NJA)Zq!OtGu#g;V>)7rR-%3zF^*lM=6evNOf{{@Yeag_0qQgG^c zk~Q+H{Cw*k;<0u-?cN%I5a4;5^QR|x^5G|GX@86ZkjQlN!atwoxj#Nf!7I=lSy(HvE!B70d9ozc2t_8T^7pOH-**GU1Mq z%q9>xkWlRPCAzXprJm>kbj;Zynp(mQv6@fzR1pZo+6R{0BdrWOt-nWp%8ek zMjD6P>ZfMps$A({kV2r0hv$1mpg<5yNG=UuF2(nZcXD#zP0E}Kq>x-&Xy(oU;CTj# zO{^j|4WKZMQK0bg{NlT{q(iwA!ID$5maws90Kx3l^@eLeN-)OYDsM_qPEVRaAb%!j z1{i~3^7x#m%?V%t$B}3}5~KYkf6ywMiZLLuaqJ?LuRU_!1VVfW02os&rNU=0l_B0zd zMh46cac;NozvlZsW209_Q;1dDfvSHP|gq%I6g4d3|!f*DzQo5&%BJXFBa;i5p1_F+a#zz~4V+CjQj@mcAp6s~i1#ndqB&~PE z*mrC{smv$!}4+NmvXLZfdu-WVw4^~tw?*m)?M(eqmaGZl)*^xE}Nj`#hUAMZQQy4&vtsp%T+ zz!F8dt9594Cu|Jlvg(5?gWfZb>|SU7^o^6Z05B;eg`jz9h*AA62fEH81lTfwB_+x? zD1`yWrA2=sr$;9;Du1CB2i?4S{lNDQBq~3(zN9zvXq&@k`xH|Oq_C03Quzs;$|~LE z1k6zk7e&q-Sz6lg}%L6?f)-ZA{{2r?)?A&03~!q zSaf4@Wnpw>Eo5PIWdJfTFgPtSF)cDPR53U@G&4FeIV&(QIxsM?)2Jc<001R)MObug zZ)9m^c`amNbWmjgGB7YWEio}IGBZ>$I65>lIx#sbFfckWFz#aB761SM8FWQhbW?9; pba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H1002ovPDHLkV1k_Z#GU{E 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 -- 2.20.1