X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fcoreinfodlg.cpp;h=47ab75890f0cc60091999557db1a609023851d43;hp=299a94fa74ff87a15bbfacb0b408b65ae3735f21;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=744080e8b9e6d32aaeb3d08eaf1a576076735957

diff --git a/src/qtui/coreinfodlg.cpp b/src/qtui/coreinfodlg.cpp
index 299a94fa..47ab7589 100644
--- a/src/qtui/coreinfodlg.cpp
+++ b/src/qtui/coreinfodlg.cpp
@@ -18,32 +18,93 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QMessageBox>
-
 #include "coreinfodlg.h"
 
-#include "client.h"
+#include <QMessageBox>
+
 #include "bufferwidget.h"
+#include "client.h"
+#include "icon.h"
+#include "util.h"
 
 CoreInfoDlg::CoreInfoDlg(QWidget *parent) : QDialog(parent) {
     ui.setupUi(this);
-    CoreInfo *coreInfo = Client::coreInfo();
-    connect(coreInfo, SIGNAL(coreDataChanged(const QVariantMap &)), this, SLOT(coreInfoChanged(const QVariantMap &)));
 
-    coreInfoChanged(coreInfo->coreData());
+    // Listen for resynchronization events (pre-0.13 cores only)
+    connect(Client::instance(), SIGNAL(coreInfoResynchronized()),
+            this, SLOT(coreInfoResynchronized()));
+
+    // Update legacy core info for Quassel cores earlier than 0.13.  This does nothing on modern
+    // cores.
+    refreshLegacyCoreInfo();
+
+    // Display existing core info, set up signal handlers
+    coreInfoResynchronized();
 
     // Warning icon
-    ui.coreUnsupportedIcon->setPixmap(QIcon::fromTheme("dialog-warning").pixmap(16));
+    ui.coreUnsupportedIcon->setPixmap(icon::get("dialog-warning").pixmap(16));
 
     updateUptime();
     startTimer(1000);
 }
 
 
+void CoreInfoDlg::refreshLegacyCoreInfo() {
+    if (!Client::isConnected() || Client::isCoreFeatureEnabled(Quassel::Feature::SyncedCoreInfo)) {
+        // If we're not connected, or the core supports SyncedCoreInfo (0.13+), bail out
+        return;
+    }
+
+    // Request legacy (pre-0.13) CoreInfo object to be resynchronized (does nothing on modern cores)
+    Client::refreshLegacyCoreInfo();
+
+    // On legacy cores, CoreInfo data does not send signals.  Periodically poll for information.
+    // 15 seconds seems like a reasonable trade-off as this only happens while the dialog is open.
+    QTimer::singleShot(15 * 1000, this, SLOT(refreshLegacyCoreInfo()));
+}
+
+
+void CoreInfoDlg::coreInfoResynchronized() {
+    // CoreInfo object has been recreated, or this is the first time the dialog's been shown
+
+    CoreInfo *coreInfo = Client::coreInfo();
+    // Listen for changes to core information
+    connect(coreInfo, SIGNAL(coreDataChanged(const QVariantMap &)),
+            this, SLOT(coreInfoChanged(const QVariantMap &)));
+
+    // Update with any known core information set before connecting the signal.  This is needed for
+    // both modern (0.13+) and legacy cores.
+    coreInfoChanged(coreInfo->coreData());
+}
+
+
 void CoreInfoDlg::coreInfoChanged(const QVariantMap &coreInfo) {
-    ui.labelCoreVersion->setText(coreInfo["quasselVersion"].toString());
-    ui.labelCoreVersionDate->setText(coreInfo["quasselBuildDate"].toString()); // "BuildDate" for compatibility
-    ui.labelClientCount->setNum(coreInfo["sessionConnectedClients"].toInt());
+    if(coreInfo.isEmpty()) {
+        // We're missing data for some reason
+        if (Client::isConnected()) {
+            // Core info is entirely empty despite being connected.  Something's probably wrong.
+            ui.labelCoreVersion->setText(tr("Unknown"));
+            ui.labelCoreVersionDate->setText(tr("Unknown"));
+        } else {
+            // We're disconnected.  Mark as such.
+            ui.labelCoreVersion->setText(tr("Disconnected from core"));
+            ui.labelCoreVersionDate->setText(tr("Not available"));
+        }
+        ui.labelClientCount->setNum(0);
+        // Don't return, allow the code below to remove any existing session widgets
+    } else {
+        ui.labelCoreVersion->setText(coreInfo["quasselVersion"].toString());
+        // "BuildDate" for compatibility
+        if (coreInfo["quasselBuildDate"].toString().isEmpty()) {
+            ui.labelCoreVersionDate->setText(QString("<i>%1</i>").arg(tr("Unknown date")));
+        }
+        else {
+            ui.labelCoreVersionDate->setText(
+                        tryFormatUnixEpoch(coreInfo["quasselBuildDate"].toString(),
+                        Qt::DateFormat::DefaultLocaleShortDate));
+        }
+        ui.labelClientCount->setNum(coreInfo["sessionConnectedClients"].toInt());
+    }
 
     auto coreSessionSupported = false;
     auto ids = _widgets.keys();
@@ -79,14 +140,26 @@ void CoreInfoDlg::coreInfoChanged(const QVariantMap &coreInfo) {
 
     ui.coreSessionScrollArea->setVisible(coreSessionSupported);
 
-    // Hide the information bar when core sessions are supported
-    ui.coreUnsupportedWidget->setVisible(!coreSessionSupported);
+    // Hide the information bar when core sessions are supported or when disconnected
+    ui.coreUnsupportedWidget->setVisible(
+                !(coreSessionSupported || Client::isConnected() == false));
+
+    // Update uptime for immediate display, don't wait for the timer
+    updateUptime();
 }
 
 
 void CoreInfoDlg::updateUptime() {
     CoreInfo *coreInfo = Client::coreInfo();
-    if (coreInfo) {
+
+    if (!Client::isConnected()) {
+        // Not connected, don't bother trying to calculate the uptime
+        ui.labelUptime->setText(tr("Not available"));
+    } else if (coreInfo->coreData().isEmpty()) {
+        // Core info is entirely empty despite being connected.  Something's probably wrong.
+        ui.labelUptime->setText(tr("Unknown"));
+    } else {
+        // Connected, format the uptime for display
         QDateTime startTime = coreInfo->at("startTime").toDateTime();
 
         int64_t uptime = startTime.secsTo(QDateTime::currentDateTime().toUTC());
@@ -102,7 +175,8 @@ void CoreInfoDlg::updateUptime() {
                                      .arg(uphours, 2, 10, QChar('0'))
                                      .arg(upmins, 2, 10, QChar('0'))
                                      .arg(uptime, 2, 10, QChar('0'))
-                                     .arg(startTime.toLocalTime().toString(Qt::TextDate));
+                                     .arg(startTime.toLocalTime()
+                                          .toString(Qt::DefaultLocaleShortDate));
         ui.labelUptime->setText(uptimeText);
     }
 }