Happy New Year!

[quassel.git] / src / qtui / aboutdlg.cpp

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 8f10023..68fd655 100644 (file)
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -19,16 +19,15 @@
  ***************************************************************************/
 
 #include <QDateTime>
+#include <QIcon>
 
 #include "aboutdlg.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.quasselLogo->setPixmap(QIcon(":/icons/quassel-64.png").pixmap(64)); // don't let the icon theme affect our logo here
 
     ui.versionLabel->setText(QString(tr("<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"))
         .arg(Quassel::buildInfo().fancyVersionString)
@@ -39,7 +38,7 @@ AboutDlg::AboutDlg(QWidget *parent) : QDialog(parent)
     ui.contributorTextBrowser->setHtml(contributors());
     ui.thanksToTextBrowser->setHtml(thanksTo());
 
-    setWindowIcon(Icon("quassel"));
+    setWindowIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")));
 }
 
 
@@ -55,7 +54,7 @@ QString AboutDlg::about() const
              "Most icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> and used under the "
              "<a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>"
              "Please use <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to report bugs."
-        ).arg("2005-2014");
+        ).arg("2005-2015");
 
     return res;
 }
@@ -89,6 +88,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Terje \"tan\" Andersen</b></dt><dd>Norwegian translation, documentation</dd>"
                               "<dt><b>Jens \"amiconn\" Arnold</b></dt><dd>Postgres migration fixes</dd>"
                               "<dt><b>Adolfo Jayme Barrientos</b></dt><dd>Spanish translation</dd>"
+                              "<dt><b>Mattia Basaglia</b></dt><dd>Fixes</dd>"
                               "<dt><b>Pete \"elbeardmorez\" Beardmore</b></dt><dd>Linewrap for input line</dd>"
                               "<dt><b>Rafael \"EagleScreen\" Belmonte</b></dt><dd>Spanish translation</dd>"
                               "<dt><b>Sergiu Bivol</b></dt><dd>Romanian translation</dd>"
@@ -129,6 +129,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Johannes \"j0hu\" Huber</b></dt><dd>Many fixes and features, bug triaging</dd>"
                               "<dt><b>Theofilos Intzoglou</b></dt><dd>Greek translation</dd>"
                               "<dt><b>Jovan Jojkić</b></dt><dd>Serbian translation</dd>"
+                              "<dt><b>Allan Jude</b></dt><dd>Documentation improvements</dd>"
                               "<dt><b>Michael \"ycros\" Kedzierski</b></dt><dd>Mac fixes</dd>"
                               "<dt><b>Scott \"ScottK\" Kitterman<b></dt><dd>Kubuntu nightly packager, (packaging/build system) bughunter</dd>"
                               "<dt><b>Paul \"Haudrauf\" Klumpp</b></dt><dd>Initial design and mainwindow layout</dd>"
@@ -144,6 +145,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Michael \"mamarley\" Marley</b></dt><dd>Various fixes and improvements</dd>"
                               "<dt><b>Martin \"m4yer\" Mayer</b></dt><dd>German translation</dd>"
                               "<dt><b>Daniel \"hydrogen\" Meltzer</b></dt><dd>Various fixes and improvements</dd>"
+                              "<dt><b>Sebastian Meyer</b></dt><dd>Fixes</dd>"
                               "<dt><b>Daniel E. Moctezuma</b></dt><dd>Japanese translation</dd>"
                               "<dt><b>Chris \"kode54\" Moeller</b></dt><dd>Various fixes and improvements</dd>"
                               "<dt><b>Thomas Müller</b></dt><dd>Fixes, Debian packaging</dd>"
@@ -167,6 +169,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Dirk \"MarcLandis\" Rettschlag</b></dt><dd>Various fixes and new features</dd>"
                               "<dt><b>Miguel Revilla</b></dt><dd>Spanish translation</dd>"
                               "<dt><b>Jaak Ristioja</b></dt><dd>Fixes</dd>"
+                              "<dt><b>David \"Bombe\" Roden</b></dt><dd>Fixes</dd>"
                               "<dt><b>Henning \"honk\" Rohlfs</b></dt><dd>Various fixes</dd>"
                               "<dt><b>Stella \"differentreality\" Rouzi</b></dt><dd>Greek translation</dd>"
                               "<dt><b>\"salnx\"</b></dt><dd>Highlight configuration improvements</dd>"
@@ -177,6 +180,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>Tim \"xAFFE\" Schumacher</b></dt><dd>Fixes and feedback</dd>"
                               "<dt><b>\"sfionov\"</b></dt><dd>Russian translation</dd>"
                               "<dt><b>Harald \"apachelogger\" Sitter</b></dt><dd>{ku|U}buntu packager, motivator, promoter</dd>"
+                              "<dt><b>Ramanathan Sivagurunathan</b></dt><dd>Fixes</dd>"
                               "<dt><b>Stefanos Sofroniou</b></dt><dd>Greek translation</dd>"
                               "<dt><b>Rüdiger \"ruediger\" Sonderfeld</b></dt><dd>Emacs keybindings</dd>"
                               "<dt><b>Alexander Stein</b></dt><dd>Tray icon fix</dd>"
@@ -186,6 +190,7 @@ QString AboutDlg::contributors() const
                               "<dt><b>\"ToBeFree\"</b></dt><dd>German translation</dd>"
                               "<dt><b>Edward \"Aides\" Toroshchin</b></dt><dd>Russian translation</dd>"
                               "<dt><b>Adam \"adamt\" Tulinius</b></dt><dd>Early beta tester and bughunter, Danish translation</dd>"
+                              "<dt><b>Deniz Türkoglu</b></dt><dd>Mac fixes</dd>"
                               "<dt><b>Frederik M.J. \"freqmod\" Vestre</b></dt><dd>Norwegian translation</dd>"
                               "<dt><b>Atte Virtanen</b></dt><dd>Finnish translation</dd>"
                               "<dt><b>Pavel \"int\" Volkovitskiy</b></dt><dd>Early beta tester and bughunter</dd>"