Page MenuHomePhabricator
Differential D7794

GUI: Move QRImageWidget to its own file-pair
ClosedPublic
Actions

Authored by PiRK on Oct 7 2020, 06:29.

Details

Reviewers
Fabien
Group Reviewers
Restricted Owners Package(Owns No Changed Paths)
Restricted Project
Commits
rABCff9974a75ed5: GUI: Move QRImageWidget to its own file-pair
Summary

Commit fc929842
This concludes backport of Core PR15928
Depends on D7783

Test Plan

ninja && ninja check && sudo ninja install
Run bitcoin-qt and make sure the QR code is still generated properly.

Diff Detail

Event Timeline

PiRK created this revision.Oct 7 2020, 06:29
Owners added a reviewer: Restricted Owners Package.Oct 7 2020, 06:29
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 7 2020, 06:29
PiRK requested review of this revision.Oct 7 2020, 06:29
teamcity edited the summary of this revision. (Show Details)Oct 7 2020, 06:29

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

Harbormaster completed remote builds in B13225: Diff 24322.Oct 7 2020, 06:38
teamcity added a comment.Oct 7 2020, 06:38
Build Bitcoin ABC Diffs / Diff Testing (build-diff) failed.

Snippet of first build failure:

rpc_getblockstats.py                             | ✓ Passed  | 1 s
rpc_getchaintips.py                              | ✓ Passed  | 3 s
rpc_help.py                                      | ✓ Passed  | 1 s
rpc_invalidateblock.py                           | ✓ Passed  | 6 s
rpc_misc.py                                      | ✓ Passed  | 1 s
rpc_named_arguments.py                           | ✓ Passed  | 1 s
rpc_net.py                                       | ✓ Passed  | 1 s
rpc_preciousblock.py                             | ✓ Passed  | 1 s
rpc_psbt.py                                      | ✓ Passed  | 22 s
rpc_scantxoutset.py                              | ✓ Passed  | 5 s
rpc_setban.py                                    | ✓ Passed  | 3 s
rpc_signmessage.py                               | ✓ Passed  | 1 s
rpc_signrawtransaction.py                        | ✓ Passed  | 2 s
rpc_txoutproof.py                                | ✓ Passed  | 2 s
rpc_uptime.py                                    | ✓ Passed  | 1 s
rpc_users.py                                     | ✓ Passed  | 3 s
rpc_whitelist.py                                 | ✓ Passed  | 1 s
tool_wallet.py                                   | ✓ Passed  | 5 s
wallet_abandonconflict.py                        | ✓ Passed  | 13 s
wallet_address_types.py                          | ✓ Passed  | 14 s
wallet_avoidreuse.py                             | ✓ Passed  | 5 s
wallet_backup.py                                 | ✓ Passed  | 40 s
wallet_balance.py                                | ✓ Passed  | 14 s
wallet_basic.py                                  | ✓ Passed  | 30 s
wallet_coinbase_category.py                      | ✓ Passed  | 1 s
wallet_create_tx.py                              | ✓ Passed  | 7 s
wallet_createwallet.py                           | ✓ Passed  | 3 s
wallet_createwallet.py --usecli                  | ✓ Passed  | 3 s
wallet_disable.py                                | ✓ Passed  | 1 s
wallet_dump.py                                   | ✓ Passed  | 3 s
wallet_encryption.py                             | ✓ Passed  | 5 s
wallet_groups.py                                 | ✓ Passed  | 9 s
wallet_hd.py                                     | ✓ Passed  | 5 s
wallet_import_rescan.py                          | ✓ Passed  | 8 s
wallet_import_with_label.py                      | ✓ Passed  | 1 s
wallet_importmulti.py                            | ✓ Passed  | 6 s
wallet_importprunedfunds.py                      | ✓ Passed  | 2 s
wallet_keypool.py                                | ✓ Passed  | 4 s
wallet_keypool_topup.py                          | ✓ Passed  | 4 s
wallet_labels.py                                 | ✓ Passed  | 1 s
wallet_listreceivedby.py                         | ✓ Passed  | 13 s
wallet_listsinceblock.py                         | ✓ Passed  | 5 s
wallet_listtransactions.py                       | ✓ Passed  | 15 s
wallet_multiwallet.py                            | ✓ Passed  | 15 s
wallet_multiwallet.py --usecli                   | ✓ Passed  | 17 s
wallet_reorgsrestore.py                          | ✓ Passed  | 4 s
wallet_resendwallettransactions.py               | ✓ Passed  | 11 s
wallet_txn_clone.py                              | ✓ Passed  | 3 s
wallet_txn_clone.py --mineblock                  | ✓ Passed  | 3 s
wallet_txn_doublespend.py                        | ✓ Passed  | 1 s
wallet_txn_doublespend.py --mineblock            | ✓ Passed  | 4 s
wallet_watchonly.py                              | ✓ Passed  | 1 s
wallet_watchonly.py --usecli                     | ✓ Passed  | 1 s
wallet_zapwallettxes.py                          | ✓ Passed  | 3 s

ALL                                              | ✓ Passed  | 777 s (accumulated) 
Runtime: 156 s

ninja: build stopped: cannot make progress due to previous errors.
Build build-diff failed with exit code 1
Fabien requested changes to this revision.Oct 7 2020, 06:52
Fabien added a subscriber: Fabien.
Fabien added inline comments.
src/qt/qrimagewidget.cpp
35 ↗(On Diff #24322)

It's all duplicated, see above

This revision now requires changes to proceed.Oct 7 2020, 06:52
PiRK updated this revision to Diff 24323.Oct 7 2020, 07:02

remove duplicated headers

Harbormaster completed remote builds in B13226: Diff 24323.Oct 7 2020, 07:11
Fabien requested changes to this revision.Oct 7 2020, 07:15
Fabien added inline comments.
src/qt/qrimagewidget.h
15

350px

23

Use proper doxygen comment:

/**
 * Label widget for QR code. This image can be dragged, dropped, copied and
 * saved to disk.
 */
This revision now requires changes to proceed.Oct 7 2020, 07:15
PiRK updated this revision to Diff 24324.Oct 7 2020, 07:25

bump the size of the QR code
ABC uses a larger image size than Core (D802), which was accidentaly decreased in this backport

Harbormaster completed remote builds in B13227: Diff 24324.Oct 7 2020, 07:35
PiRK updated this revision to Diff 24329.Oct 7 2020, 08:30

use proper doxygen comment

PiRK marked 2 inline comments as done.Oct 7 2020, 08:31
Fabien accepted this revision.Oct 7 2020, 08:41
This revision is now accepted and ready to land.Oct 7 2020, 08:41
Harbormaster completed remote builds in B13231: Diff 24329.Oct 7 2020, 08:42
Closed by commit rABCff9974a75ed5: GUI: Move QRImageWidget to its own file-pair (authored by Luke Dashjr <luke-jr+git@utopios.org>, committed by PiRK). · Explain WhyOct 8 2020, 04:18
This revision was automatically updated to reflect the committed changes.
PiRK added a commit: rABCff9974a75ed5: GUI: Move QRImageWidget to its own file-pair.

Revision Contents
Changeset List

PathSize
src/
qt/
1 line
forms/
2 lines
6 lines
45 lines
qrimagewidget.cpp
receiverequestdialog.cpp
99 lines
32 lines
143 lines

Diff 24323

View Options

src/qt/CMakeLists.txt

Loading...
View Options

src/qt/forms/receiverequestdialog.ui

Loading...
View Options

src/qt/guiconstants.h

Loading...
View Options

src/qt/qrimagewidget.h

Loading...
View Options

src/qt/qrimagewidget.cpp

Loading...
View Options

src/qt/receiverequestdialog.h

Loading...
View Options

src/qt/receiverequestdialog.cpp

Loading...