Consistent with #12421 which highlights the transaction after send.
~I’m not too proud of the QTimer::singleShot(10 bit; any suggestions on how to properly wait for the transactions table to become aware of the new transaction?~
Although I could have called focusTransaction() directly from TransactionView::bumpFee() I’m using the same signal as the send screen. This should make it easier to move fee bump / transaction replacement functionality around later.
Travis fails with:
0qt/transactionview.cpp: In member function ‘void TransactionView::bumpFee()’:
1qt/transactionview.cpp:446:10: error: no matching function for call to ‘QTimer::singleShot(int, TransactionView::bumpFee()::__lambda0)’
2 });
3 ^
4qt/transactionview.cpp:446:10: note: candidate is:
5In file included from /usr/include/qt4/QtCore/QTimer:1:0,
6 from ./qt/sendcoinsdialog.h:13,
7 from qt/transactionview.cpp:13:
8/usr/include/qt4/QtCore/qtimer.h:78:17: note: static void QTimer::singleShot(int, QObject*, const char*)
9 static void singleShot(int msec, QObject *receiver, const char *member);
Seems to be a QT 4 issue. Will look into that later, since it might go away if there’s a way to avoidsingleShot (or if #8263 happens first). For now I just skip it for QT < 5.4.
441 // Update the table
442+ transactionView->selectionModel()->clearSelection();
443 model->getTransactionTableModel()->updateTransaction(hashQStr, CT_UPDATED, true);
444+
445+ #if QT_VERSION >= 0x050400
446+ QTimer::singleShot(10, [=](){
442+ transactionView->selectionModel()->clearSelection();
443 model->getTransactionTableModel()->updateTransaction(hashQStr, CT_UPDATED, true);
444+
445+ #if QT_VERSION >= 0x050400
446+ QTimer::singleShot(10, [=](){
447+ Q_EMIT bumpedFee(newHash);
qApp->processEvents(); instead of the single shot dummy timer?
qApp->processEvents(), which also removes the need for any Qt4 specific code.
202@@ -202,6 +203,9 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
203 connect(copyTxPlainText, SIGNAL(triggered()), this, SLOT(copyTxPlainText()));
204 connect(editLabelAction, SIGNAL(triggered()), this, SLOT(editLabel()));
205 connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails()));
206+
207+ // Highlight transaction after fee bump
208+ connect(this, SIGNAL(bumpedFee(uint256)), this, SLOT(focusTransaction(uint256)));
Two options ATM:
0connect(this, &TransactionView::bumpedFee, [this](const uint256& txid) {
1 focusTransaction(txid);
2});
0connect(this, &TransactionView::bumpedFee, this, static_cast<void (TransactionView::*)(const uint256&)>(&TransactionView::focusTransaction));
Because TransactionView::focusTransaction is overloaded.
connect() syntax.