X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Faboutdlg.cpp;h=065e97e0e3abe58817e9ef4b6709f217be9c4984;hp=7a0e4637cac15a2dd734e74ebcac945c4a545e1d;hb=f7379184b7c0ae4e53d7470809f84e2ad3239ec1;hpb=f07a9e9b540da811583cb67ae5bb28a7b681baa5

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 7a0e4637..065e97e0 100644
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -18,20 +18,27 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QDateTime>
+
 #include "aboutdlg.h"
-#include "global.h"
+#include "icon.h"
+#include "iconloader.h"
+#include "quassel.h"
 
 AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent) {
   ui.setupUi(this);
+  ui.quasselLogo->setPixmap(DesktopIcon("quassel", IconLoader::SizeHuge));
 
-  ui.versionLabel->setText(QString(tr("<b>Version %1</b><br>Protocol version: %2<br>Built: %3 %4")).arg(Global::quasselVersion)
-			   .arg(Global::protocolVersion)
-			   .arg(Global::quasselBuildDate).arg(Global::quasselBuildTime));
+  ui.versionLabel->setText(QString(tr("<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"))
+                           .arg(Quassel::buildInfo().fancyVersionString)
+			   .arg(Quassel::buildInfo().protocolVersion)
+			   .arg(Quassel::buildInfo().buildDate));
   ui.aboutTextBrowser->setHtml(about());
   ui.authorTextBrowser->setHtml(authors());
   ui.contributorTextBrowser->setHtml(contributors());
   ui.thanksToTextBrowser->setHtml(thanksTo());
 
+  setWindowIcon(Icon("quassel"));
 }
 
 QString AboutDlg::about() const {
@@ -67,24 +74,30 @@ 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:") + "<br>"
+  res = tr("We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:")
+      + QString::fromUtf8("<br>"
            "<dl>"
            "<dt><b>Daniel \"al\" Albers</b></dt><dd>German translation, various fixes</dd>"
            "<dt><b>Terje \"tan\" Andersen</b></dt><dd>Norwegian translation, documentation</dd>"
+           "<dt><b>Kevin \"KRF\" Funk</b></dt><dd>German translation</dd>"
            "<dt><b>Marco \"kaffeedoktor\" Genise</b></dt><dd>Ideas, hacking, motivation</dd>"
            "<dt><b>Sebastian \"seezer\" Goth</b></dt><dd>Various improvements and features</dd>"
+           "<dt><b>H. İbrahim \"igungor\" Güngör</b></dt><dd>Turkish translation</dd>"
+           "<dt><b>Edward \"Aides\" Toroshchin</b></dt><dd>Russian translation</dd>"
            "<dt><b>John \"nox-Hand\" Hand</b></dt><dd>Gorgeous application and tray icons</dd>"
            "<dt><b>Jonas \"Dante\" Heese</b></dt><dd>Project founder, various improvements</dd>"
+           "<dt><b>Paul \"Haudrauf\" Klumpp</b></dt><dd>Initial design and mainwindow layout</dd>"
            "<dt><b>Regis \"ZRegis\" Perrin</b></dt><dd>French translation</dd>"
-           "<dt><b>Diego \"Flameeyes\" Petten&ograve;</b></dt><dd>Gentoo maintainer</dd>"
-           "<dt><b>Dennis \"devurandom\" Schridde</b></dt><dd>D-Bus notifications</dd>"
+           "<dt><b>Diego \"Flameeyes\" Petten&ograve;</b></dt><dd>Gentoo maintainer, build system improvements</dd>"
+           "<dt><b>Dennis \"DevUrandom\" Schridde</b></dt><dd>D-Bus notifications</dd>"
            "<dt><b>Jussi \"jussi01\" Schultink</b></dt><dd>Tireless tester, {k|U}buntu nightly packages</dd>"
+           "<dt><b>Tim \"xAFFE\" Schumacher</b></dt><dd>Fixes and feedback</dd>"
            "<dt><b>Harald \"apachelogger\" Sitter</b></dt><dd>{k|U}buntu packager, motivator, promoter</dd>"
            "<dt><b>Daniel \"son\" Steinmetz</b></dt><dd>Early beta tester and bughunter (on Vista&trade;!)</dd>"
            "<dt><b>Adam \"adamt\" Tulinius</b></dt><dd>Early beta tester and bughunter, Danish translation</dd>"
            "<dt><b>Pavel \"int\" Volkovitskiy</b></dt><dd>Early beta tester and bughunter</dd>"
            "</dl><br>"
-           "...and anybody else finding and reporting bugs, giving feedback, helping others and being part of the community!";
+           "...and anybody else finding and reporting bugs, giving feedback, helping others and being part of the community!");
 
   return res;
 }
@@ -93,12 +106,14 @@ QString AboutDlg::thanksTo() const {
   QString res;
   res = tr("Special thanks goes to:<br>"
            "<dl>"
-           "<dt><b>John \"nox-Hand\" Hand</b></dt>"
+           "<dt><b>John \"nox\" Hand</b></dt>"
               "<dd>for great artwork and the Quassel logo/icon</dt>"
            "<dt><b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt>"
               "<dd>for creating most of the other shiny icons you see throughout Quassel</dd>"
-           "<dt><b><a href=\"http://www.trolltech.com\">Trolltech</a></b></dt>"
-              "<dd>for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more</dd>"
+           "<dt><b><a href=\"http://www.trolltech.com\">Qt Software formerly known as Trolltech</a></b></dt>"
+              "<dd>for creating Qt and Qtopia, and for sponsoring development of QuasselTopia with Greenphones and more</dd>"
+           "<dt><b><a href=\"http://www.nokia.com\">Nokia</a></b></dt>"
+              "<dd>for keeping Qt alive, and for sponsoring development of Quassel Mobile with N810s</dd>"
           );
 
   return res;