diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-09-29 13:15:21 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-09-29 13:18:26 +0300 |
| commit | ba1a82e6083f99cb0ab17235926b762179b4df25 (patch) | |
| tree | 91225dcfa0595d69d8dd5d328233e629ed3a7a00 /src/qt/forms | |
| parent | ad47fb8b6461333607ffed2bf549d133fd6de659 (diff) | |
| parent | 2ccde2f9329d2685563b09ff0830f0d5916f57d5 (diff) | |
| download | bitcoin-ba1a82e6083f99cb0ab17235926b762179b4df25.tar.xz | |
Merge bitcoin-core/gui#430: Improvements to the open up transaction in third-party link action
2ccde2f9329d2685563b09ff0830f0d5916f57d5 qt: hyphenate usage of third-party modifier (Jarol Rodriguez)
8177578b296adb82fb8ab6c64cd76b832ebcc132 qt: ensure seperator when adding third-party transaction links (Jarol Rodriguez)
a70a98075a0d258d41c1310553a2337538a1d80c qt: improve text for open third-party tx url action (Jarol Rodriguez)
9980f4aa5eaf3c0f62cf699d6a9c4677a1ea3365 qt, refactor: simplify third-party tx url action through overload (Jarol Rodriguez)
Pull request description:
[#4092](https://github.com/bitcoin/bitcoin/pull/4092) introduced the ability to open up a transaction in a block explorer. This improves the related code by simplifying the addition and connection of the action through an [overloaded](https://doc.qt.io/archives/qt-5.9/qmenu.html#addAction-5) `addAction` function and prepends action description text to the host, "Show in". The reason to add this text is to make it clear what the action does. It also creates a clearer mental correlation between a user doing the work to add the 3rd-party tx link and this new menu action popping up.
This updates the setting text so that "third-party" is hyphenated. It should be hyphenated because it is being used as a modifier of both "URL" and "transaction URLs".
Additionally, this fixes #431 by ensuring that the seperator will be added before creating action.
Screenshots of visual changes:
**Context menu actions**
| master | pr |
|--------------|--------|
| <img width="248" alt="3pt-master" src="https://user-images.githubusercontent.com/23396902/134618354-00278ac6-5094-44ee-8ba7-fe648fdcb7d2.png"> | <img width="248" alt="3pt-pr" src="https://user-images.githubusercontent.com/23396902/134618364-ddb64269-e5ee-40af-a2a6-1922001b6f4e.png"> |
**Setting text**
(tooltip text containing usage of "third-party" is also properly hyphenated)
| master | pr |
|--------------|--------|
|  |  |
ACKs for top commit:
stratospher:
tested ACK 2ccde2f.
promag:
Code view ACK 2ccde2f9329d2685563b09ff0830f0d5916f57d5.
hebasto:
ACK 2ccde2f9329d2685563b09ff0830f0d5916f57d5
Tree-SHA512: 8dfcd539a1d41c8abf3c8208d150d1480d4ef81a008de826299e8bad1dfa6e3c49dc76d041c5946fafcf0b033eebb9b9fbd3d49ba6d8af93dd388c488e92f143
Diffstat (limited to 'src/qt/forms')
| -rw-r--r-- | src/qt/forms/optionsdialog.ui | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index 087d0eb527..1c22124616 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -739,10 +739,10 @@ <item> <widget class="QLabel" name="thirdPartyTxUrlsLabel"> <property name="toolTip"> - <string>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</string> + <string>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</string> </property> <property name="text"> - <string>&Third party transaction URLs</string> + <string>&Third-party transaction URLs</string> </property> <property name="buddy"> <cstring>thirdPartyTxUrls</cstring> @@ -752,7 +752,7 @@ <item> <widget class="QLineEdit" name="thirdPartyTxUrls"> <property name="toolTip"> - <string>Third party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</string> + <string>Third-party URLs (e.g. a block explorer) that appear in the transactions tab as context menu items. %s in the URL is replaced by transaction hash. Multiple URLs are separated by vertical bar |.</string> </property> <property name="placeholderText"> <string notr="true">https://example.com/tx/%s</string> |