more lint fixes; start blocks instead of time

diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index f89f889ce3399555efbb979d8d4e6864ff43239d..c09bb1d9a747876c0910224272135681a2e16d1d 100644 (file)
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -984,25 +984,16 @@ void MainWindow::onMultiBroadcast(const QMap<QString, QString> &txHexMap) {
 void MainWindow::onSyncStatus(quint64 height, quint64 target, bool daemonSync) {
     if (height >= (target - 1) && target > 0) {
         this->updateNetStats();
-        this->setStatusText(QString("Synchronized (%1)").arg(height));
+        this->setStatusText(QString("Synchronized (%1)").arg(QLocale().toString(height)));
     } else {
-        // Calculate depth
         quint64 blocksLeft = (target > height) ? (target - height) : 0;
-        // Estimate download size
-        QString sizeText;
-        if (target > 1) {
-             quint64 estimatedBytes = Utils::estimateSyncDataSize(blocksLeft);
-             sizeText = Utils::formatBytes(estimatedBytes);
-        }
-        QString statusMsg = Utils::formatSyncStatus(height, target, daemonSync);
-        // Show size estimate only if available
-        if (!sizeText.isEmpty()) {
-            this->setStatusText(QString("%1 (approx. %2)").arg(statusMsg).arg(sizeText));
-        } else {
-            this->setStatusText(statusMsg);
-        }
+        QString type = daemonSync ? tr("Blockchain") : tr("Wallet");
+        QString blocksStr = QLocale().toString(blocksLeft);
+        this->setStatusText(tr("%1 sync: %2 blocks behind").arg(type, blocksStr));
     }
-    m_statusLabelStatus->setToolTip(QString("Wallet Height: %1 | Network Tip: %2").arg(height).arg(target));
+    m_statusLabelStatus->setToolTip(tr("Wallet Height: %1 | Network Tip: %2")
+        .arg(QLocale().toString(height))
+        .arg(QLocale().toString(target)));
 }
 
 void MainWindow::onConnectionStatusChanged(int status)

diff --git a/src/utils/Utils.cpp b/src/utils/Utils.cpp
index 23ae865b46918173fcfa2f465063e465a4adac24..375e535ae5aae55cbf879343390665724b0b79d1 100644 (file)
--- a/src/utils/Utils.cpp
+++ b/src/utils/Utils.cpp
@@ -734,8 +734,8 @@ quint64 estimateSyncDataSize(quint64 blocks) {
 }
 
 QString formatPausedSyncStatus(quint64 blocks) {
-    quint64 size = estimateSyncDataSize(blocks);
-    return QObject::tr("[PAUSED] Sync %1 blocks / %2 upon resume").arg(blocks).arg(formatBytes(size));
+    QString blocksStr = QLocale().toString(blocks);
+    return QObject::tr("[PAUSED] %1 blocks behind").arg(blocksStr);
 }
 
 QString getPausedSyncStatus(Wallet *wallet, Nodes *nodes, QString *tooltip) {