Add OptionButton control#67
Conversation
|
Rebase on top of the merged #49? |
|
Concept ACK. Looks great! |
a6c389f to
99d4f66
Compare
|
Rebased and split to a new component ( |
|
Tested 99d4f66: |
|
@hebasto thanks, didn't notice it, will fix. |
99d4f66 to
653d7cd
Compare
|
0b5fb6b is included so that you can test by pressing TAB to switch between options and SPACE to select it (we don't have focus feedback yet). |
Does not work for me on Linux. Only mouse clicks work. |
|
2acd4a7 "qml: Drop import qualifier BitcoinCoreComponents" Wouldn't it be useful to keep it as is in case if we use |
Built on ubuntu with depends and works by pressing TAB and SPACE. I'll include focus feedback since @GBKS already has a suggestion for that. |
That should be fine, I don't expect name collisions - at least I'd like to avoid ambiguities. |
653d7cd to
4c4aa30
Compare
|
Now with hover and focus feedback. Rebased on top of #73 to have the macOS artifact. |
e143115 to
6af285e
Compare
|
Rebased, made adjustments suggested by @GBKS, made |
6af285e to
b70ee53
Compare
|
Rebased on #74. |
b70ee53 to
7cde50b
Compare
hebasto
left a comment
There was a problem hiding this comment.
Tested 7cde50b on Linux Mint 20.2 (Qt 5.12.8).
Tab (focus moving) and Space (focus selecting) work as expected.
What should be a role of the Return key in focus treatment?
Also:
$ src/qt/bitcoin-qt -signet
qrc:/qml/pages/stub.qml:34:9: QML Pane: Binding loop detected for property "implicitHeight"
qrc:/qml/pages/stub.qml:34:9: QML Pane: Binding loop detected for property "implicitHeight"
|
Thanks @hebasto, will address both comments. |
Follow Qt recomendation (1) since the background is a solid color. 1. https://doc.qt.io/qt-5/qml-qtquick-controls2-applicationwindow.html#background-prop
Label implicit height depends on the font size but the font size depends on the label height. This results in a runtime anchor loop warning.
Github-Pull: bitcoin-core#67 Rebased-From: cbe91f6
Github-Pull: bitcoin-core#67 Rebased-From: 7985aad
Github-Pull: bitcoin-core#67 Rebased-From: 61668e9
Follow Qt recomendation (1) since the background is a solid color. 1. https://doc.qt.io/qt-5/qml-qtquick-controls2-applicationwindow.html#background-prop Github-Pull: bitcoin-core#67 Rebased-From: cd5527f
Label implicit height depends on the font size but the font size depends on the label height. This results in a runtime anchor loop warning. Github-Pull: bitcoin-core#67 Rebased-From: 6bedd3d
Github-Pull: bitcoin-core#67 Rebased-From: 37cfe4e
Github-Pull: bitcoin-core#67 Rebased-From: cbe91f6
Github-Pull: bitcoin-core#67 Rebased-From: 7985aad
Github-Pull: bitcoin-core#67 Rebased-From: 61668e9
Follow Qt recomendation (1) since the background is a solid color. 1. https://doc.qt.io/qt-5/qml-qtquick-controls2-applicationwindow.html#background-prop Github-Pull: bitcoin-core#67 Rebased-From: cd5527f
Label implicit height depends on the font size but the font size depends on the label height. This results in a runtime anchor loop warning. Github-Pull: bitcoin-core#67 Rebased-From: 6bedd3d
Github-Pull: bitcoin-core#67 Rebased-From: 37cfe4e
Github-Pull: bitcoin-core#67 Rebased-From: cbe91f6
Github-Pull: bitcoin-core#67 Rebased-From: 7985aad
Github-Pull: bitcoin-core#67 Rebased-From: 61668e9
Follow Qt recomendation (1) since the background is a solid color. 1. https://doc.qt.io/qt-5/qml-qtquick-controls2-applicationwindow.html#background-prop Github-Pull: bitcoin-core#67 Rebased-From: cd5527f
Label implicit height depends on the font size but the font size depends on the label height. This results in a runtime anchor loop warning. Github-Pull: bitcoin-core#67 Rebased-From: 6bedd3d
Github-Pull: bitcoin-core#67 Rebased-From: 37cfe4e
Github-Pull: bitcoin-core#67 Rebased-From: cbe91f6
Github-Pull: bitcoin-core#67 Rebased-From: 7985aad
Github-Pull: bitcoin-core#67 Rebased-From: 61668e9
Follow Qt recomendation (1) since the background is a solid color. 1. https://doc.qt.io/qt-5/qml-qtquick-controls2-applicationwindow.html#background-prop Github-Pull: bitcoin-core#67 Rebased-From: cd5527f
Label implicit height depends on the font size but the font size depends on the label height. This results in a runtime anchor loop warning. Github-Pull: bitcoin-core#67 Rebased-From: 6bedd3d
Github-Pull: bitcoin-core#67 Rebased-From: 37cfe4e
Github-Pull: bitcoin-core#67 Rebased-From: cbe91f6
Github-Pull: bitcoin-core#67 Rebased-From: 7985aad
Github-Pull: bitcoin-core#67 Rebased-From: 61668e9
22b2f0a qml: Show ConnectionOptions (João Barbosa) 551f54f qml: Add ConnectionOptions component (João Barbosa) 705aec9 qml: Add OptionButton control (João Barbosa) c948bc0 qml: Use ColumnLayout in application window (João Barbosa) d72de3a qml: Drop import qualifier BitcoinCoreComponents (João Barbosa) efbf58f qml: Remove explicit height of BlockCounter (João Barbosa) 75aac55 qml: Use window color instead of background (João Barbosa) Pull request description:  [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/Win64%20\[unit%20tests,%20no%20gui%20tests,%20no%20boost::process,%20no%20functional%20tests\]%20\[focal\]/insecure_win_gui.zip?branch=pull/67) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macOS%2010.15%20\[gui,%20no%20tests\]%20\[focal\]/insecure_mac_gui.zip?branch=pull/67) ACKs for top commit: hebasto: re-ACK 22b2f0a jarolrod: ACK 22b2f0a Tree-SHA512: ea9d3a1e213590025ee1ffcb693a33d61aab553cfab0b7319e89c51e52fb3f3780a1c945b8c84283cc9f3465a8f1598d5d6f4f3f0f5b7a4e66553a9bbd3b7624
Pull request description: Sync with the main repo up to bitcoin/bitcoin@c9d7d0a To reproduce: 1) There are merge conflicts. To remedy this, the following commits from the following PR's must be reverted. They have been reverted from newest to oldest as listed: ``` - PR bitcoin-core#82 (Nov 12) - 80ded50 - 0f5d210 - PR bitcoin-core#79 (Nov 5) - 8d5ea7c - PR bitcoin-core#69 (Nov 4) - 1ae2e09 - PR bitcoin-core#77 (Nov 3) - 871de3f - fdc7212 - PR bitcoin-core#67 (Nov 3) - 22b2f0a - c948bc0 - d72de3a - PR bitcoin-core#65 (Oct 30) - c386fbf - PR bitcoin-core#74 (Oct 29) - 319db69 - PR bitcoin-core#72 (Oct 27) - a7028ee - PR bitcoin-core#55 (Oct 10) - 15ee3f4 - PR bitcoin-core#45 (Oct 3) - b431cef - PR bitcoin-core#44 (Oct 3) - 4f1a5d7 - PR bitcoin-core#30 (Aug 30) - 3a0f948 - f17a32a - PR bitcoin-core#19 (Aug 19) - ae72249 - f88cc24 - 2937059 ``` 2) Fetch the upstream commit ``` git fetch https://github.com/bitcoin/bitcoin git merge c9d7d0a ``` 3) Cherry-pick back the reverted commits from oldest to newest. Note that I have left out fdc7212 and f88cc24 from cherry-picking back in as it is unnecessary and leads to a cleaner commit history. ## GUIX HASHES ``` $ find guix-build-$(git rev-parse --short=12 HEAD)/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum 6a9def1ba270b4e987c44194bf2704899da603fb25860063fc5ff22ee3b2168b guix-build-f6691736de2a/output/aarch64-linux-gnu/SHA256SUMS.part a5750927e2d5a9086ae70b0279e6d06a48602b1b7b535fe2d1f743d0d320c1b6 guix-build-f6691736de2a/output/aarch64-linux-gnu/bitcoin-f6691736de2a-aarch64-linux-gnu-debug.tar.gz ec1a7e9750df2d00dbb420842ef17813e6f825d06e2122be031c6daf977a9714 guix-build-f6691736de2a/output/aarch64-linux-gnu/bitcoin-f6691736de2a-aarch64-linux-gnu.tar.gz 74aa6e3330956e0d4445c2989056fa807e3dba9a35ec2b38b84c48c0f9bd3efb guix-build-f6691736de2a/output/arm-linux-gnueabihf/SHA256SUMS.part 1c1db52f0bcf91e8c27b150e4c9de3cd235d565e3cdb499dfec8433b4da2119a guix-build-f6691736de2a/output/arm-linux-gnueabihf/bitcoin-f6691736de2a-arm-linux-gnueabihf-debug.tar.gz 9bb58c56527c28b1730dadbf9b169527e056161e30a7cf758b53fdb565f98cdb guix-build-f6691736de2a/output/arm-linux-gnueabihf/bitcoin-f6691736de2a-arm-linux-gnueabihf.tar.gz 325a29527468d7a5686dbcd31602cbae01a41f6cd324680df311815d976f9ca2 guix-build-f6691736de2a/output/dist-archive/bitcoin-f6691736de2a.tar.gz 6e2adbd2a9298f335332b1661e813c9a208a76ad45a37244791756d3296b278d guix-build-f6691736de2a/output/powerpc64-linux-gnu/SHA256SUMS.part e1402abb77216fe1325625404ca8c909b8229f96f58154828c04bb7f699eb9e9 guix-build-f6691736de2a/output/powerpc64-linux-gnu/bitcoin-f6691736de2a-powerpc64-linux-gnu-debug.tar.gz 080ef0d1b1361fbb2354e24d100a49f63ed914afccc69792edd4674ba7d02bb0 guix-build-f6691736de2a/output/powerpc64-linux-gnu/bitcoin-f6691736de2a-powerpc64-linux-gnu.tar.gz e6fb710af41df7be3ae6029ef1114707e0516d551beae0a9928c9de84a025563 guix-build-f6691736de2a/output/powerpc64le-linux-gnu/SHA256SUMS.part 3bb370f79e6fb55ff50ea8db3b49ed7303fce2b9e49af6d0722821b049bfcee4 guix-build-f6691736de2a/output/powerpc64le-linux-gnu/bitcoin-f6691736de2a-powerpc64le-linux-gnu-debug.tar.gz 1ed30ff64eacab08f724e521266784ae21c6ff879cbde7baad21a4b6ceb8ef82 guix-build-f6691736de2a/output/powerpc64le-linux-gnu/bitcoin-f6691736de2a-powerpc64le-linux-gnu.tar.gz dadebd336d5a359105bc4f757f60eba7651ed068a0a8d196ca7a18fa22e692c7 guix-build-f6691736de2a/output/riscv64-linux-gnu/SHA256SUMS.part 208082743c43c37cb6907fe60ddea1909271204188763ee7b214673558f3c18e guix-build-f6691736de2a/output/riscv64-linux-gnu/bitcoin-f6691736de2a-riscv64-linux-gnu-debug.tar.gz a28abc53c3a6cf7ddbd7177e3aae5a4636301c2fb18a0a361cb05d98ef23ea68 guix-build-f6691736de2a/output/riscv64-linux-gnu/bitcoin-f6691736de2a-riscv64-linux-gnu.tar.gz 6f3c8b2fc3fa4638d8adf08f53dce07a9d96a2ef01db1df74ef53799f804ddb2 guix-build-f6691736de2a/output/x86_64-apple-darwin19/SHA256SUMS.part 46160e6460bd1dfd8943f48199daacf58f8e8249edc3757ab681978d72490db9 guix-build-f6691736de2a/output/x86_64-apple-darwin19/bitcoin-f6691736de2a-osx-unsigned.dmg 75f45e27858931ee91201962d1ffa8cf7998da3c962c672403ac8f8888bda7f2 guix-build-f6691736de2a/output/x86_64-apple-darwin19/bitcoin-f6691736de2a-osx-unsigned.tar.gz ee466fca21a6353d2aa6e85be5ac14192ce71430f87c54e8c406398fdeedd73f guix-build-f6691736de2a/output/x86_64-apple-darwin19/bitcoin-f6691736de2a-osx64.tar.gz 44de818d70a295fcd8488142b76a893cd94126ee3aa69d0bfc02096231cfac8c guix-build-f6691736de2a/output/x86_64-linux-gnu/SHA256SUMS.part bb2bc967836cf11bf0412ecc64c1cfbd4076199ac1c1a828919a11802bbd9a4c guix-build-f6691736de2a/output/x86_64-linux-gnu/bitcoin-f6691736de2a-x86_64-linux-gnu-debug.tar.gz 52942d2ba01535b645c6d0460f074a6d683896082fe81b2f31addfc425a631a6 guix-build-f6691736de2a/output/x86_64-linux-gnu/bitcoin-f6691736de2a-x86_64-linux-gnu.tar.gz e437ff82adb1ac30ca9a27bd1732d14f9b17bfa2c9f017aeccadd19685daaf95 guix-build-f6691736de2a/output/x86_64-w64-mingw32/SHA256SUMS.part c4d2ed7580949cc6d4207b57429651a46cc023381b81408adfe4337f360c2be6 guix-build-f6691736de2a/output/x86_64-w64-mingw32/bitcoin-f6691736de2a-win-unsigned.tar.gz e5116106e634d0e1d6a7f509c645de81d19bd7b91243d94a6f90d893ca141016 guix-build-f6691736de2a/output/x86_64-w64-mingw32/bitcoin-f6691736de2a-win64-debug.zip 005710c9e3032dfdc6117a77c38f85a2a5fa723b32772bc33c907298fe91ebfa guix-build-f6691736de2a/output/x86_64-w64-mingw32/bitcoin-f6691736de2a-win64-setup-unsigned.exe c85bb2671820715a97273cc57b81de73f50f95fd8c8909020b08a6be02eb4797 guix-build-f6691736de2a/output/x86_64-w64-mingw32/bitcoin-f6691736de2a-win64.zip ``` [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/87) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/87) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/87) ACKs for top commit: hebasto: ACK f669173 Tree-SHA512: abefdfb363d5ec51c0e4eb079b14e8befd1e921fc19beea210f34f70e80de84c33e4e2e68145eff6cb7e516e73ca2efb0f07fdeafaf440488950170be03ee3a1
22b2f0a2771e2f6303b6d5668bce82dfbc499b08 qml: Show ConnectionOptions (João Barbosa) 551f54f7b84b6cad275c81605b8e6a227050a917 qml: Add ConnectionOptions component (João Barbosa) 705aec9584a76daf2d6d4c99ba5d6f3227c096d0 qml: Add OptionButton control (João Barbosa) c948bc090e882082681a559770ed22daf046817c qml: Use ColumnLayout in application window (João Barbosa) d72de3a2ca42ec9508783755036752bfbfbde615 qml: Drop import qualifier BitcoinCoreComponents (João Barbosa) efbf58f202549f9ca913fa8575a20a410e8890bf qml: Remove explicit height of BlockCounter (João Barbosa) 75aac55f06699f48e1899e40ed0688a86d02e968 qml: Use window color instead of background (João Barbosa) Pull request description:  [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/Win64%20\[unit%20tests,%20no%20gui%20tests,%20no%20boost::process,%20no%20functional%20tests\]%20\[focal\]/insecure_win_gui.zip?branch=pull/67) [](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macOS%2010.15%20\[gui,%20no%20tests\]%20\[focal\]/insecure_mac_gui.zip?branch=pull/67) ACKs for top commit: hebasto: re-ACK 22b2f0a2771e2f6303b6d5668bce82dfbc499b08 jarolrod: ACK 22b2f0a Tree-SHA512: ea9d3a1e213590025ee1ffcb693a33d61aab553cfab0b7319e89c51e52fb3f3780a1c945b8c84283cc9f3465a8f1598d5d6f4f3f0f5b7a4e66553a9bbd3b7624
Uh oh!
There was an error while loading. Please reload this page.