X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Faboutdlg.cpp;h=2fc3d6ea1f4ab80a127401cfd8a17521bd3af06a;hb=932ab289c1482a8069cc320a16aca9216058523a;hp=5b08b643e6bb36a3108066f7e698dfe35d6b4339;hpb=c2e3479b87e7d0713d302d26fb2d7d01d7b8c9c2;p=quassel.git

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 5b08b643..2fc3d6ea 100644
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,9 +21,10 @@
 #include "aboutdlg.h"
 
 #include <QDateTime>
-#include <QIcon>
+#include <QPixmap>
 
 #include "aboutdata.h"
+#include "icon.h"
 #include "quassel.h"
 
 AboutDlg::AboutDlg(QWidget *parent)
@@ -33,7 +34,7 @@ AboutDlg::AboutDlg(QWidget *parent)
     AboutData::setQuasselPersons(_aboutData);
 
     ui.setupUi(this);
-    ui.quasselLogo->setPixmap(QIcon(":/icons/quassel-64.png").pixmap(64)); // don't let the icon theme affect our logo here
+    ui.quasselLogo->setPixmap(QPixmap{":/pics/quassel-64.svg"});  // don't let the icon theme affect our logo here
 
     ui.versionLabel->setText(QString(tr("<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"))
         .arg(Quassel::buildInfo().fancyVersionString)
@@ -44,7 +45,7 @@ AboutDlg::AboutDlg(QWidget *parent)
     ui.contributorTextBrowser->setHtml(contributors());
     ui.thanksToTextBrowser->setHtml(thanksTo());
 
-    setWindowIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")));
+    setWindowIcon(icon::get("quassel"));
 }
 
 
@@ -61,7 +62,7 @@ QString AboutDlg::about() const
              "<a href=\"https://api.kde.org/frameworks/oxygen-icons5/html\">Oxygen icon theme</a> &copy; Nuno Pinheiro and others, licensed under the "
                  "<a href=\"https://github.com/KDE/oxygen-icons/blob/master/COPYING\">LGPLv3</a>.<br><br>"
              "Please use <a href=\"https://bugs.quassel-irc.org\">https://bugs.quassel-irc.org</a> to report bugs."
-        ).arg("2005-2016")
+        ).arg("2005-2018")
     };
 
     return res;
@@ -101,9 +102,9 @@ QString AboutDlg::thanksTo() const
                                  "<td><b>John \"nox\" Hand</b></td></tr>"
               "<tr><td><i>" + tr("for the original Quassel logo - The All-Seeing Eye") + "</i></td></tr>"
               "<tr/>"
-              "<tr><td rowspan='2' valign='middle'><img src=':/icons/quassel-32.png'></td>"
+              "<tr><td rowspan='2' valign='middle'><img src=':/pics/quassel-oxygen-32.png'></td>"
                                  "<td><b>Nuno Pinheiro</b></td></tr>"
-              "<tr><td><i>" + tr("for the current Quassel logo") + "</i></td></tr>"
+              "<tr><td><i>" + tr("for the Oxygen Quassel logo") + "</i></td></tr>"
               "<tr/>"
               "<tr><td rowspan='2' valign='middle'><img src=':/pics/kde-vdg.png'></td>"
                                  "<td><b><a href='https://vdesign.kde.org'>The KDE Visual Design Group</a></b></td></tr>"