Happy New Year!

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

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index b76f899..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;
 }