[Qt] use NotifyHeaderTip's height and date for the progress update

jonasschnelli · jonasschnelli · commit 3154d6e3a207 · 2016-10-20T19:02:59.000+02:00
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -717,13 +717,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
 {
     if (modalOverlay)
     {
-        if (header) {
-            /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */
-            modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));
-        }
-        else {
+        if (header)
+            modalOverlay->setKnownBestHeight(count, blockDate);
+        else
             modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);
-        }
     }
     if (!clientModel)
         return;
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui
@@ -219,7 +219,7 @@ QLabel { color: rgb(40,40,40);  }</string>
            <item row="0" column="1">
             <widget class="QLabel" name="numberOfBlocksLeft">
              <property name="text">
-              <string>unknown...</string>
+              <string>Unknown...</string>
              </property>
             </widget>
            </item>
@@ -245,7 +245,7 @@ QLabel { color: rgb(40,40,40);  }</string>
               </sizepolicy>
              </property>
              <property name="text">
-              <string>unknown...</string>
+              <string>Unknown...</string>
              </property>
             </widget>
            </item>
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
@@ -132,7 +132,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     if (estimateNumHeadersLeft < 24 && hasBestHeader) {
         ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));
     } else {
-        ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));
+        ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight));
+        ui->expectedTimeLeft->setText(tr("Unknown..."));
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -717,13 +717,10 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer`
`717`	`717`	`{`
`718`	`718`	`if (modalOverlay)`
`719`	`719`	`{`
`720`		`- if (header) {`
`721`		`- /* use clientmodels getHeaderTipHeight and getHeaderTipTime because the NotifyHeaderTip signal does not fire when updating the best header */`
`722`		`- modalOverlay->setKnownBestHeight(clientModel->getHeaderTipHeight(), QDateTime::fromTime_t(clientModel->getHeaderTipTime()));`
`723`		`- }`
`724`		`- else {`
	`720`	`+ if (header)`
	`721`	`+ modalOverlay->setKnownBestHeight(count, blockDate);`
	`722`	`+ else`
`725`	`723`	`modalOverlay->tipUpdate(count, blockDate, nVerificationProgress);`
`726`		`- }`
`727`	`724`	`}`
`728`	`725`	`if (!clientModel)`
`729`	`726`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri`
`132`	`132`	`if (estimateNumHeadersLeft < 24 && hasBestHeader) {`
`133`	`133`	`ui->numberOfBlocksLeft->setText(QString::number(bestHeaderHeight - count));`
`134`	`134`	`} else {`
`135`		`- ui->expectedTimeLeft->setText(tr("Unknown. Syncing Headers..."));`
	`135`	`+ ui->numberOfBlocksLeft->setText(tr("Unknown. Syncing Headers (%1)...").arg(bestHeaderHeight));`
	`136`	`+ ui->expectedTimeLeft->setText(tr("Unknown..."));`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`