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

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 5b08b643..840da62f 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,10 +21,12 @@
 #include "aboutdlg.h"
 
 #include <QDateTime>
-#include <QIcon>
+#include <QPixmap>
 
 #include "aboutdata.h"
+#include "icon.h"
 #include "quassel.h"
+#include "util.h"
 
 AboutDlg::AboutDlg(QWidget *parent)
     : QDialog(parent)
@@ -33,18 +35,30 @@ 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)
-        .arg(Quassel::buildInfo().commitDate)
-        .arg(Quassel::buildInfo().protocolVersion));
+    QString versionDate;
+    if (Quassel::buildInfo().commitDate.isEmpty()) {
+        // This shouldn't happen, but sometimes the packaging environment cannot set a proper
+        // date/time.  Add a fallback just in case.
+        versionDate = QString("<i>%1</i>").arg(tr("Unknown date"));
+    }
+    else {
+        versionDate = tryFormatUnixEpoch(Quassel::buildInfo().commitDate,
+                                         Qt::DateFormat::DefaultLocaleShortDate);
+    }
+    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)
+                             .arg(versionDate)
+                             .arg(Quassel::buildInfo().protocolVersion));
     ui.aboutTextBrowser->setHtml(about());
     ui.authorTextBrowser->setHtml(authors());
     ui.contributorTextBrowser->setHtml(contributors());
     ui.thanksToTextBrowser->setHtml(thanksTo());
 
-    setWindowIcon(QIcon::fromTheme("quassel", QIcon(":/icons/quassel.png")));
+    setWindowIcon(icon::get("quassel"));
 }
 
 
@@ -61,7 +75,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 +115,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>"