Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-28 21:12:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

qt: Refactor ShowProgress to DispatchNotifications

Browse Source
This commit is contained in:
João Barbosa 2021-04-29 00:03:52 +01:00
parent 3bccd50ad2
commit c6cbdf1a90
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qt/transactiontablemodel.cpp
View File

@ -96,13 +96,14 @@ public:
*/ */
QList<TransactionRecord> cachedWallet; QList<TransactionRecord> cachedWallet;
bool fQueueNotifications = false;
/** True when model finishes loading all wallet transactions on start */ /** True when model finishes loading all wallet transactions on start */
bool m_loaded = false; bool m_loaded = false;
/** True when transactions are being notified, for instance when scanning */
bool m_loading = false;
std::vector< TransactionNotification > vQueueNotifications; std::vector< TransactionNotification > vQueueNotifications;
void NotifyTransactionChanged(const uint256 &hash, ChangeType status); void NotifyTransactionChanged(const uint256 &hash, ChangeType status);
void ShowProgress(const std::string &title, int nProgress); void DispatchNotifications();
/* Query entire wallet anew from core. /* Query entire wallet anew from core.
*/ */
@ -721,7 +722,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
TransactionNotification notification(hash, status, showTransaction); TransactionNotification notification(hash, status, showTransaction);
if (fQueueNotifications) if (m_loading)
{ {
vQueueNotifications.push_back(notification); vQueueNotifications.push_back(notification);
return; return;
@ -729,14 +730,11 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
notification.invoke(parent); notification.invoke(parent);
} }
void TransactionTablePriv::ShowProgress(const std::string &title, int nProgress) void TransactionTablePriv::DispatchNotifications()
{ {
if (nProgress == 0) if (m_loading) return;
fQueueNotifications = true;
if (nProgress == 100)
{ {
fQueueNotifications = false;
if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons
bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, true)); bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, true));
assert(invoked); assert(invoked);
@ -758,7 +756,10 @@ void TransactionTableModel::subscribeToCoreSignals()
{ {
// Connect signals to wallet // Connect signals to wallet
m_handler_transaction_changed = walletModel->wallet().handleTransactionChanged(std::bind(&TransactionTablePriv::NotifyTransactionChanged, priv, std::placeholders::_1, std::placeholders::_2)); m_handler_transaction_changed = walletModel->wallet().handleTransactionChanged(std::bind(&TransactionTablePriv::NotifyTransactionChanged, priv, std::placeholders::_1, std::placeholders::_2));
m_handler_show_progress = walletModel->wallet().handleShowProgress(std::bind(&TransactionTablePriv::ShowProgress, priv, std::placeholders::_1, std::placeholders::_2)); m_handler_show_progress = walletModel->wallet().handleShowProgress([this](const std::string&, int progress) {
priv->m_loading = progress < 100;
priv->DispatchNotifications();
});
} }
void TransactionTableModel::unsubscribeFromCoreSignals() void TransactionTableModel::unsubscribeFromCoreSignals()