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

diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp
index 29e60485..1d441a0a 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-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,6 +20,8 @@
 
 #include "coreinfodlg.h"
 
+#include <QDateTime>
+
 #include "client.h"
 #include "signalproxy.h"
 
@@ -34,7 +36,21 @@ CoreInfoDlg::CoreInfoDlg(QWidget *parent)
 
 void CoreInfoDlg::coreInfoAvailable() {
   ui.labelCoreVersion->setText(_coreInfo["quasselVersion"].toString());
-  ui.labelUptime->setText(_coreInfo["startTime"].toString());
+  ui.labelCoreBuildDate->setText(_coreInfo["quasselBuildDate"].toString());
   ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
-  // data["quasselBuildDate"] = Global::quasselBuildDate;
+  updateUptime();
+  startTimer(1000);
+}
+
+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.toString(Qt::TextDate));
+  ui.labelUptime->setText(uptimeText);
 }