X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreinfodlg.cpp;h=38628accb8b3a208f1f9627c6a65f10a60cc721b;hp=ce36d018aa89443ba4f183796b1bd2835d6bd3ca;hb=a81619131cc9ddbd80f3528fc033e74d0e74cc66;hpb=294fd6215071dd0fc1c8634fe99e163934b1f94a

diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp
index ce36d018..38628acc 100644
--- a/src/qtui/coreinfodlg.cpp
+++ b/src/qtui/coreinfodlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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,7 +15,7 @@
  *   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"
@@ -24,33 +24,53 @@
 
 #include "client.h"
 #include "signalproxy.h"
+#include "bufferwidget.h"
+#include "coresessionwidget.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.labelCoreBuildDate->setText(_coreInfo["quasselBuildDate"].toString());
-  ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
-  updateUptime();
-  startTimer(1000);
+
+void CoreInfoDlg::coreInfoAvailable()
+{
+    ui.labelCoreVersion->setText(_coreInfo["quasselVersion"].toString());
+    ui.labelCoreVersionDate->setText(_coreInfo["quasselBuildDate"].toString()); // "BuildDate" for compatibility
+    ui.labelClientCount->setNum(_coreInfo["sessionConnectedClients"].toInt());
+
+    for (const auto &peerData : _coreInfo["sessionConnectedClientData"].toList()) {
+        auto coreSessionWidget = new CoreSessionWidget(ui.coreSessionScrollContainer);
+        coreSessionWidget->setData(peerData.toMap());
+        ui.coreSessionContainer->addWidget(coreSessionWidget);
+        connect(coreSessionWidget, SIGNAL(disconnectClicked(int)), this, SLOT(disconnectClicked(int)));
+    }
+
+    ui.coreSessionContainer->addStretch(1);
+
+    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;
+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);
+    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);
+}
+void CoreInfoDlg::disconnectClicked(int peerId)
+{
+    Client::kickClient(peerId);
 }