UI: Add notification to status bar for transactions in pending map

zathras-crypto · zathras-crypto · commit 24004e09749c · 2015-06-15T14:46:07.000+10:00
NOTE: this is for the pending map, so currently outbound transactions
diff --git a/src/omnicore/pending.cpp b/src/omnicore/pending.cpp
@@ -91,6 +91,7 @@ void PendingAdd(const uint256& txid, const std::string& sendingAddress, const st
 
     // after adding a transaction to pending the available balance may now be reduced, refresh wallet totals
     set_wallet_totals();
+    uiInterface.OmniPendingChanged(true); // after adding it is a safe assumption that pending map now contains txn(s)
     uiInterface.OmniStateChanged();
 }
 
@@ -108,10 +109,12 @@ void PendingDelete(const uint256& txid)
         if (msc_debug_pending) PrintToLog("%s(%s): amount=%d\n", __FUNCTION__, txid.GetHex(), src_amount);
         if (src_amount) update_tally_map(pending.src, pending.prop, pending.amount, PENDING);
         my_pending.erase(it);
+
+        // if pending map is now empty following deletion, trigger a status change
+        if (my_pending.empty()) uiInterface.OmniPendingChanged(false);
     }
 }
 
-
 } // namespace mastercore
 
 /**
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -70,6 +70,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
     labelEncryptionIcon(0),
     labelConnectionsIcon(0),
     labelBlocksIcon(0),
+    labelOmniPendingIcon(0),
     progressBarLabel(0),
     progressBar(0),
     progressDialog(0),
@@ -176,6 +177,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
     labelEncryptionIcon = new QLabel();
     labelConnectionsIcon = new QLabel();
     labelBlocksIcon = new QLabel();
+    labelOmniPendingIcon = new QLabel();
     if(enableWallet)
     {
         frameBlocksLayout->addStretch();
@@ -188,6 +190,8 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
     frameBlocksLayout->addStretch();
     frameBlocksLayout->addWidget(labelBlocksIcon);
     frameBlocksLayout->addStretch();
+    frameBlocksLayout->addWidget(labelOmniPendingIcon);
+    frameBlocksLayout->addStretch();
 
     // Progress bar and label for blocks download
     progressBarLabel = new QLabel();
@@ -461,6 +465,9 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
         // Show progress dialog
         connect(clientModel, SIGNAL(showProgress(QString,int)), this, SLOT(showProgress(QString,int)));
 
+        // Update Omni pending status
+        connect(clientModel, SIGNAL(refreshOmniPending(bool)), this, SLOT(setOmniPendingStatus(bool)));
+
         rpcConsole->setClientModel(clientModel);
 #ifdef ENABLE_WALLET
         if(walletFrame)
@@ -957,6 +964,17 @@ bool BitcoinGUI::handlePaymentRequest(const SendCoinsRecipient& recipient)
     return false;
 }
 
+void BitcoinGUI::setOmniPendingStatus(bool pending)
+{
+    if (!pending) {
+        labelOmniPendingIcon->hide();
+    } else {
+        labelOmniPendingIcon->show();
+        labelOmniPendingIcon->setPixmap(QIcon(":/icons/hourglass").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
+        labelOmniPendingIcon->setToolTip(tr("You have Omni transactions awaiting confirmation."));
+    }
+}
+
 void BitcoinGUI::setEncryptionStatus(int status)
 {
     switch(status)
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
@@ -81,6 +81,7 @@ class BitcoinGUI : public QMainWindow
     QLabel *labelEncryptionIcon;
     QLabel *labelConnectionsIcon;
     QLabel *labelBlocksIcon;
+    QLabel *labelOmniPendingIcon;
     QLabel *progressBarLabel;
     QProgressBar *progressBar;
     QProgressDialog *progressDialog;
@@ -162,7 +163,7 @@ public slots:
        @see WalletModel::EncryptionStatus
     */
     void setEncryptionStatus(int status);
-
+    void setOmniPendingStatus(bool pending);
     bool handlePaymentRequest(const SendCoinsRecipient& recipient);
 
     /** Show incoming transaction notification for new transactions. */
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -132,6 +132,11 @@ void ClientModel::updateOmniState()
     emit refreshOmniState();
 }
 
+void ClientModel::updateOmniPending(bool pending)
+{
+    emit refreshOmniPending(pending);
+}
+
 void ClientModel::updateAlert(const QString &hash, int status)
 {
     // Show error message notification for new alert
@@ -213,6 +218,12 @@ static void OmniStateChanged(ClientModel *clientmodel)
     QMetaObject::invokeMethod(clientmodel, "updateOmniState", Qt::QueuedConnection);
 }
 
+static void OmniPendingChanged(ClientModel *clientmodel, bool pending)
+{
+    // Triggered when Omni pending map adds/removes transactions
+    QMetaObject::invokeMethod(clientmodel, "updateOmniPending", Qt::QueuedConnection, Q_ARG(bool, pending));
+}
+
 static void ShowProgress(ClientModel *clientmodel, const std::string &title, int nProgress)
 {
     // emits signal "showProgress"
@@ -243,6 +254,7 @@ void ClientModel::subscribeToCoreSignals()
     uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));
     uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));
     uiInterface.OmniStateChanged.connect(boost::bind(OmniStateChanged, this));
+    uiInterface.OmniPendingChanged.connect(boost::bind(OmniPendingChanged, this, _1));
 }
 
 void ClientModel::unsubscribeFromCoreSignals()
@@ -252,4 +264,5 @@ void ClientModel::unsubscribeFromCoreSignals()
     uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));
     uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));
     uiInterface.OmniStateChanged.disconnect(boost::bind(OmniStateChanged, this));
+    uiInterface.OmniPendingChanged.disconnect(boost::bind(OmniPendingChanged, this, _1));
 }
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
@@ -90,6 +90,7 @@ class ClientModel : public QObject
     void alertsChanged(const QString &warnings);
     void bytesChanged(quint64 totalBytesIn, quint64 totalBytesOut);
     void refreshOmniState();
+    void refreshOmniPending(bool pending);
 
     //! Fired when a message should be reported to the user
     void message(const QString &title, const QString &message, unsigned int style);
@@ -102,6 +103,7 @@ public slots:
     void updateNumConnections(int numConnections);
     void updateAlert(const QString &hash, int status);
     void updateOmniState();
+    void updateOmniPending(bool pending);
 };
 
 #endif // BITCOIN_QT_CLIENTMODEL_H
diff --git a/src/ui_interface.h b/src/ui_interface.h
@@ -101,6 +101,9 @@ class CClientUIInterface
 
     /** Omni balances have been updated. */
     boost::signals2::signal<void ()> OmniStateChanged;
+
+    /** Omni pending status has been changed */
+    boost::signals2::signal<void (bool pending)> OmniPendingChanged;
 };
 
 extern CClientUIInterface uiInterface;

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,7 @@ void PendingAdd(const uint256& txid, const std::string& sendingAddress, const st`
`91`	`91`
`92`	`92`	`// after adding a transaction to pending the available balance may now be reduced, refresh wallet totals`
`93`	`93`	`set_wallet_totals();`
	`94`	`+ uiInterface.OmniPendingChanged(true); // after adding it is a safe assumption that pending map now contains txn(s)`
`94`	`95`	`uiInterface.OmniStateChanged();`
`95`	`96`	`}`
`96`	`97`
`@@ -108,10 +109,12 @@ void PendingDelete(const uint256& txid)`
`108`	`109`	`if (msc_debug_pending) PrintToLog("%s(%s): amount=%d\n", __FUNCTION__, txid.GetHex(), src_amount);`
`109`	`110`	`if (src_amount) update_tally_map(pending.src, pending.prop, pending.amount, PENDING);`
`110`	`111`	`my_pending.erase(it);`
	`112`	`+`
	`113`	`+ // if pending map is now empty following deletion, trigger a status change`
	`114`	`+ if (my_pending.empty()) uiInterface.OmniPendingChanged(false);`
`111`	`115`	`}`
`112`	`116`	`}`
`113`	`117`
`114`		`-`
`115`	`118`	`} // namespace mastercore`
`116`	`119`
`117`	`120`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,11 @@ void ClientModel::updateOmniState()`
`132`	`132`	`emit refreshOmniState();`
`133`	`133`	`}`
`134`	`134`
	`135`	`+void ClientModel::updateOmniPending(bool pending)`
	`136`	`+{`
	`137`	`+ emit refreshOmniPending(pending);`
	`138`	`+}`
	`139`	`+`
`135`	`140`	`void ClientModel::updateAlert(const QString &hash, int status)`
`136`	`141`	`{`
`137`	`142`	`// Show error message notification for new alert`
`@@ -213,6 +218,12 @@ static void OmniStateChanged(ClientModel *clientmodel)`
`213`	`218`	`QMetaObject::invokeMethod(clientmodel, "updateOmniState", Qt::QueuedConnection);`
`214`	`219`	`}`
`215`	`220`
	`221`	`+static void OmniPendingChanged(ClientModel *clientmodel, bool pending)`
	`222`	`+{`
	`223`	`+ // Triggered when Omni pending map adds/removes transactions`
	`224`	`+ QMetaObject::invokeMethod(clientmodel, "updateOmniPending", Qt::QueuedConnection, Q_ARG(bool, pending));`
	`225`	`+}`
	`226`	`+`
`216`	`227`	`static void ShowProgress(ClientModel *clientmodel, const std::string &title, int nProgress)`
`217`	`228`	`{`
`218`	`229`	`// emits signal "showProgress"`
`@@ -243,6 +254,7 @@ void ClientModel::subscribeToCoreSignals()`
`243`	`254`	`uiInterface.NotifyNumConnectionsChanged.connect(boost::bind(NotifyNumConnectionsChanged, this, _1));`
`244`	`255`	`uiInterface.NotifyAlertChanged.connect(boost::bind(NotifyAlertChanged, this, _1, _2));`
`245`	`256`	`uiInterface.OmniStateChanged.connect(boost::bind(OmniStateChanged, this));`
	`257`	`+ uiInterface.OmniPendingChanged.connect(boost::bind(OmniPendingChanged, this, _1));`
`246`	`258`	`}`
`247`	`259`
`248`	`260`	`void ClientModel::unsubscribeFromCoreSignals()`
`@@ -252,4 +264,5 @@ void ClientModel::unsubscribeFromCoreSignals()`
`252`	`264`	`uiInterface.NotifyNumConnectionsChanged.disconnect(boost::bind(NotifyNumConnectionsChanged, this, _1));`
`253`	`265`	`uiInterface.NotifyAlertChanged.disconnect(boost::bind(NotifyAlertChanged, this, _1, _2));`
`254`	`266`	`uiInterface.OmniStateChanged.disconnect(boost::bind(OmniStateChanged, this));`
	`267`	`+ uiInterface.OmniPendingChanged.disconnect(boost::bind(OmniPendingChanged, this, _1));`
`255`	`268`	`}`