[qt] TransactionView: highlight replacement tx after fee bump #12818

Sjors · 2018-03-28T14:43:02Z

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.

meshcollider · 2018-03-28T21:14:22Z

Concept ACK

Sjors · 2018-03-29T10:33:50Z

Travis fails with:

qt/transactionview.cpp: In member function ‘void TransactionView::bumpFee()’:
qt/transactionview.cpp:446:10: error: no matching function for call to ‘QTimer::singleShot(int, TransactionView::bumpFee()::__lambda0)’
         });
          ^
qt/transactionview.cpp:446:10: note: candidate is:
In file included from /usr/include/qt4/QtCore/QTimer:1:0,
                 from ./qt/sendcoinsdialog.h:13,
                 from qt/transactionview.cpp:13:
/usr/include/qt4/QtCore/qtimer.h:78:17: note: static void QTimer::singleShot(int, QObject*, const char*)
     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.

promag · 2018-03-29T10:59:38Z

Concept ACK. NACK the timed single shot 😄

jonasschnelli · 2018-04-10T18:21:13Z

src/qt/transactionview.cpp

        model->getTransactionTableModel()->updateTransaction(hashQStr, CT_UPDATED, true);
+
+        #if QT_VERSION >= 0x050400
+        QTimer::singleShot(10, [=](){


IMO just avoid the lambda and make it therefore Qt4 compile compatible.

jonasschnelli · 2018-04-10T18:26:54Z

src/qt/transactionview.cpp

+
+        #if QT_VERSION >= 0x050400
+        QTimer::singleShot(10, [=](){
+            Q_EMIT bumpedFee(newHash);


Have you tried qApp->processEvents(); instead of the single shot dummy timer?

jonasschnelli · 2018-04-11T06:47:14Z

Needs rebase

Sjors · 2018-04-11T10:36:01Z

Rebased

@promag @jonasschnelli I replaced the single shot with qApp->processEvents(), which also removes the need for any Qt4 specific code.

maflcko · 2018-07-22T19:19:22Z

src/qt/transactionview.cpp

@@ -202,6 +203,9 @@ TransactionView::TransactionView(const PlatformStyle *platformStyle, QWidget *pa
    connect(copyTxPlainText, SIGNAL(triggered()), this, SLOT(copyTxPlainText()));
    connect(editLabelAction, SIGNAL(triggered()), this, SLOT(editLabel()));
    connect(showDetailsAction, SIGNAL(triggered()), this, SLOT(showDetails()));
+
+    // Highlight transaction after fee bump
+    connect(this, SIGNAL(bumpedFee(uint256)), this, SLOT(focusTransaction(uint256)));


Could use the new connect syntax?

@MarcoFalke not sure what you mean by new connect syntax: http://doc.qt.io/qt-5/signalsandslots.html

@Sjors See #13529

Two options ATM:

connect(this, &TransactionView::bumpedFee, [this](const uint256& txid) { focusTransaction(txid); });

connect(this, &TransactionView::bumpedFee, this, static_cast<void (TransactionView::*)(const uint256&)>(&TransactionView::focusTransaction));

Because TransactionView::focusTransaction is overloaded.

@promag I find the first version more readable and less intimidating. I noticed the other version in your PR for a similar signal.

DrahtBot · 2018-07-22T23:50:12Z

The last travis run for this pull request was 60 days ago and is thus outdated. To trigger a fresh travis build, this pull request should be closed and re-opened.

Sjors · 2018-08-01T16:43:58Z

Rebased and switched the to the QT5 connect() syntax.

maflcko · 2018-08-01T17:18:57Z

Tested ACK d795c61

jonasschnelli · 2018-08-02T06:56:08Z

utACK d795c61, missed the 0.17 feature freeze though.

…e bump d795c61 [qt] TransactionView: highlight replacement tx after fee bump (Sjors Provoost) Pull request description: Consistent with #12421 which highlights the transaction after send. <img width="747" alt="1" src="https://user-images.githubusercontent.com/10217/38036280-a7358ea4-32a6-11e8-8f92-417e9e1e3e8b.png"> <img width="685" alt="2" src="https://user-images.githubusercontent.com/10217/38036289-aac87040-32a6-11e8-9f94-81745ff6c592.png"> ~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. Tree-SHA512: 242055b7c3d32c7b2cf871f5ceda2581221902fd53fa29e0b092713fc16d3191adbe8cbb28417d522dda9febec8cc05e07afe3489cd7caaecd33460c1dde6fbc

…fter fee bump d795c61 [qt] TransactionView: highlight replacement tx after fee bump (Sjors Provoost) Pull request description: Consistent with bitcoin#12421 which highlights the transaction after send. <img width="747" alt="1" src="https://user-images.githubusercontent.com/10217/38036280-a7358ea4-32a6-11e8-8f92-417e9e1e3e8b.png"> <img width="685" alt="2" src="https://user-images.githubusercontent.com/10217/38036289-aac87040-32a6-11e8-9f94-81745ff6c592.png"> ~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. Tree-SHA512: 242055b7c3d32c7b2cf871f5ceda2581221902fd53fa29e0b092713fc16d3191adbe8cbb28417d522dda9febec8cc05e07afe3489cd7caaecd33460c1dde6fbc # Conflicts: # src/qt/transactionview.cpp # src/qt/transactionview.h # src/qt/walletmodel.cpp # src/qt/walletmodel.h

fanquake added the GUI label Mar 28, 2018

Sjors force-pushed the 2018/03/bump-fee-focus branch from c92e346 to 0fa52d3 Compare March 29, 2018 10:41

Sjors force-pushed the 2018/03/bump-fee-focus branch 2 times, most recently from c601048 to bc48ac4 Compare April 3, 2018 16:18

jonasschnelli suggested changes Apr 10, 2018

View reviewed changes

Sjors force-pushed the 2018/03/bump-fee-focus branch from bc48ac4 to 90c614c Compare April 11, 2018 10:35

DrahtBot mentioned this pull request Jul 22, 2018

Use new Qt5 connect syntax #13529

Merged

maflcko reviewed Jul 22, 2018

View reviewed changes

DrahtBot closed this Jul 22, 2018

DrahtBot reopened this Jul 22, 2018

[qt] TransactionView: highlight replacement tx after fee bump

d795c61

Sjors force-pushed the 2018/03/bump-fee-focus branch from 90c614c to d795c61 Compare August 1, 2018 16:43

jonasschnelli approved these changes Aug 2, 2018

View reviewed changes

maflcko added this to the 0.18.0 milestone Aug 2, 2018

maflcko merged commit d795c61 into bitcoin:master Aug 20, 2018

Sjors deleted the 2018/03/bump-fee-focus branch August 21, 2018 10:34

Bushstar mentioned this pull request Sep 4, 2018

commits from bitcoin/master FeatherCoin/Feathercoin#359

Merged

promag mentioned this pull request Sep 15, 2019

gui: Drop calls to QCoreApplication::processEvents #16876

Closed

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[qt] TransactionView: highlight replacement tx after fee bump #12818

[qt] TransactionView: highlight replacement tx after fee bump #12818

Sjors commented Mar 28, 2018 •

edited by DrahtBot

Loading

meshcollider commented Mar 28, 2018

Sjors commented Mar 29, 2018 •

edited

Loading

promag commented Mar 29, 2018

jonasschnelli Apr 10, 2018

jonasschnelli Apr 10, 2018

jonasschnelli commented Apr 11, 2018

Sjors commented Apr 11, 2018

maflcko Jul 22, 2018

Sjors Jul 24, 2018

ken2812221 Jul 24, 2018

promag Jul 24, 2018

Sjors Aug 1, 2018

DrahtBot commented Jul 22, 2018

Sjors commented Aug 1, 2018

maflcko commented Aug 1, 2018

jonasschnelli commented Aug 2, 2018

[qt] TransactionView: highlight replacement tx after fee bump #12818

[qt] TransactionView: highlight replacement tx after fee bump #12818

Conversation

Sjors commented Mar 28, 2018 • edited by DrahtBot Loading

meshcollider commented Mar 28, 2018

Sjors commented Mar 29, 2018 • edited Loading

promag commented Mar 29, 2018

jonasschnelli Apr 10, 2018

Choose a reason for hiding this comment

jonasschnelli Apr 10, 2018

Choose a reason for hiding this comment

jonasschnelli commented Apr 11, 2018

Sjors commented Apr 11, 2018

maflcko Jul 22, 2018

Choose a reason for hiding this comment

Sjors Jul 24, 2018

Choose a reason for hiding this comment

ken2812221 Jul 24, 2018

Choose a reason for hiding this comment

promag Jul 24, 2018

Choose a reason for hiding this comment

Sjors Aug 1, 2018

Choose a reason for hiding this comment

DrahtBot commented Jul 22, 2018

Sjors commented Aug 1, 2018

maflcko commented Aug 1, 2018

jonasschnelli commented Aug 2, 2018

Sjors commented Mar 28, 2018 •

edited by DrahtBot

Loading

Sjors commented Mar 29, 2018 •

edited

Loading