v31.1-roots.1 · Commit 8: [PATCH 08/17] chore(roots): integrate v31 identity and maintenance tooling
src/qt/bitcoingui.cpp
Before: src/qt/bitcoingui.cpp · After: src/qt/bitcoingui.cpp
File metadata
index 7a34ed8254aeb2a5a1ddac132613577e56358bfa..2c063d0acb5fccbab68cd324a17217da2d8d836d 100644
Download original patch · Release notes
Diff rows 1–48 of 48. Line numbers refer to the original before/after files.
+ Added− RemovedUnmarked lines are context.
Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.
src/qt/bitcoingui.cpp
CHANGED
|
@@ -5,6 +5,9 @@
|
|
| 5 |
#include <bitcoin-build-config.h> // IWYU pragma: keep
|
| 6 |
|
| 7 |
#include <qt/bitcoingui.h>
|
|
|
|
|
|
|
|
|
|
| 8 |
|
| 9 |
#include <qt/bitcoinunits.h>
|
| 10 |
#include <qt/clientmodel.h>
|
|
@@ -230,6 +233,10 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
|
|
| 230 |
m_app_nap_inhibitor = new CAppNapInhibitor;
|
| 231 |
#endif
|
| 232 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 233 |
GUIUtil::handleCloseWindowShortcut(this);
|
| 234 |
}
|
| 235 |
|
|
@@ -247,6 +254,9 @@ BitcoinGUI::~BitcoinGUI()
|
|
| 247 |
MacDockIconHandler::cleanup();
|
| 248 |
#endif
|
| 249 |
|
|
|
|
|
|
|
|
|
|
| 250 |
delete rpcConsole;
|
| 251 |
}
|
| 252 |
|
|
@@ -1213,6 +1223,9 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
|
| 1213 |
|
| 1214 |
progressBarLabel->setVisible(false);
|
| 1215 |
progressBar->setVisible(false);
|
|
|
|
|
|
|
|
|
|
| 1216 |
}
|
| 1217 |
else
|
| 1218 |
{
|
|
@@ -1223,6 +1236,11 @@ void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate, double nVer
|
|
| 1223 |
progressBar->setMaximum(1000000000);
|
| 1224 |
progressBar->setValue(nVerificationProgress * 1000000000.0 + 0.5);
|
| 1225 |
progressBar->setVisible(true);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1226 |
|
| 1227 |
tooltip = tr("Catching up…") + QString("<br>") + tooltip;
|
| 1228 |
if(count != prevBlocks)
|
|
|
|
| 5 |
#include <bitcoin-build-config.h> // IWYU pragma: keep
|
| 6 |
|
| 7 |
#include <qt/bitcoingui.h>
|
| 8 |
+
#ifdef BITCOIN_QT_WIN_TASKBAR
|
| 9 |
+
#include <qt/wintaskbarprogress.h>
|
| 10 |
+
#endif
|
| 11 |
|
| 12 |
#include <qt/bitcoinunits.h>
|
| 13 |
#include <qt/clientmodel.h>
|
|
|
|
| 233 |
m_app_nap_inhibitor = new CAppNapInhibitor;
|
| 234 |
#endif
|
| 235 |
|
| 236 |
+
#ifdef BITCOIN_QT_WIN_TASKBAR
|
| 237 |
+
m_taskbar_progress = new WinTaskbarProgress(this);
|
| 238 |
+
QApplication::instance()->installNativeEventFilter(m_taskbar_progress);
|
| 239 |
+
#endif
|
| 240 |
GUIUtil::handleCloseWindowShortcut(this);
|
| 241 |
}
|
| 242 |
|
|
|
|
| 254 |
MacDockIconHandler::cleanup();
|
| 255 |
#endif
|
| 256 |
|
| 257 |
+
#ifdef BITCOIN_QT_WIN_TASKBAR
|
| 258 |
+
QApplication::instance()->removeNativeEventFilter(m_taskbar_progress);
|
| 259 |
+
#endif
|
| 260 |
delete rpcConsole;
|
| 261 |
}
|
| 262 |
|
|
|
|
| 1223 |
|
| 1224 |
progressBarLabel->setVisible(false);
|
| 1225 |
progressBar->setVisible(false);
|
| 1226 |
+
#ifdef BITCOIN_QT_WIN_TASKBAR
|
| 1227 |
+
m_taskbar_progress->setVisible(false);
|
| 1228 |
+
#endif
|
| 1229 |
}
|
| 1230 |
else
|
| 1231 |
{
|
|
|
|
| 1236 |
progressBar->setMaximum(1000000000);
|
| 1237 |
progressBar->setValue(nVerificationProgress * 1000000000.0 + 0.5);
|
| 1238 |
progressBar->setVisible(true);
|
| 1239 |
+
#ifdef BITCOIN_QT_WIN_TASKBAR
|
| 1240 |
+
m_taskbar_progress->setWindow(this);
|
| 1241 |
+
m_taskbar_progress->setValue(qRound(nVerificationProgress * 100.0));
|
| 1242 |
+
m_taskbar_progress->setVisible(true);
|
| 1243 |
+
#endif
|
| 1244 |
|
| 1245 |
tooltip = tr("Catching up…") + QString("<br>") + tooltip;
|
| 1246 |
if(count != prevBlocks)
|