X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreinfodlg.cpp;h=8aa738c5049aba685ff80e1f3c1116d9d733bee4;hp=29e60485eb741bff40fa00128ff1e0da4fb4e42e;hb=620cd1aa35e05099b3f84400dd33afc207c98244;hpb=52df0969e22249e6758714eec9e5afd7d4fe9b83

diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp
index 29e60485..8aa738c5 100644
--- a/src/qtui/coreinfodlg.cpp
+++ b/src/qtui/coreinfodlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,26 +15,46 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "coreinfodlg.h"
 
+#include <QDateTime>
+
 #include "client.h"
 #include "signalproxy.h"
 
 CoreInfoDlg::CoreInfoDlg(QWidget *parent)
-  : QDialog(parent),
+    : QDialog(parent),
     _coreInfo(this)
 {
-  ui.setupUi(this);
-  connect(&_coreInfo, SIGNAL(initDone()), this, SLOT(coreInfoAvailable()));
-  Client::signalProxy()->synchronize(&_coreInfo);
+    ui.setupUi(this);
+    connect(&_coreInfo, SIGNAL(initDone()), this, SLOT(coreInfoAvailable()));
+    Client::signalProxy()->synchronize(&_coreInfo);
+}
+
+
+void CoreInfoDlg::coreInfoAvailable()
+{
+    ui.labelCoreVersion->setText(_coreInfo["quasselVersion"].toString());
+    ui.labelCoreVersionDate->setText(_coreInfo["quasselBuildDate"].toString()); // "BuildDate" for compatibility
+    ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
+    updateUptime();
+    startTimer(1000);
 }
 
-void CoreInfoDlg::coreInfoAvailable() {
-  ui.labelCoreVersion->setText(_coreInfo["quasselVersion"].toString());
-  ui.labelUptime->setText(_coreInfo["startTime"].toString());
-  ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
-  // data["quasselBuildDate"] = Global::quasselBuildDate;
+
+void CoreInfoDlg::updateUptime()
+{
+    QDateTime startTime = _coreInfo["startTime"].toDateTime();
+
+    int uptime = startTime.secsTo(QDateTime::currentDateTime().toUTC());
+    int updays = uptime / 86400; uptime %= 86400;
+    int uphours = uptime / 3600; uptime %= 3600;
+    int upmins = uptime / 60; uptime %= 60;
+
+    QString uptimeText = tr("%n Day(s)", "", updays)
+                         + tr(" %1:%2:%3 (since %4)").arg(uphours, 2, 10, QChar('0')).arg(upmins, 2, 10, QChar('0')).arg(uptime, 2, 10, QChar('0')).arg(startTime.toLocalTime().toString(Qt::TextDate));
+    ui.labelUptime->setText(uptimeText);
 }