Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[qt] Fix typo and access key in optionsdialog.ui #10911

Merged
merged 1 commit into from Sep 7, 2017
Merged

[qt] Fix typo and access key in optionsdialog.ui #10911

merged 1 commit into from Sep 7, 2017

Conversation

keystrike
Copy link
Contributor

Tooltip displayed ampersand incorrectly, & should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

@fanquake fanquake added the GUI label Jul 22, 2017
@benma
Copy link

benma commented Jul 24, 2017

utACK f066abd0837df5f4d414d6a092e48f334f9bb864

@jonasschnelli
Copy link
Contributor

I think the PR description is a little bit misleading because it adds new access keys, right?
Are there no overlapping access keys (haven't checked)?

Binaries: https://bitcoin.jonasschnelli.ch/build/229

@benma
Copy link

benma commented Jul 24, 2017

As part of my utACK I checked that there is no overlap. Even if there was, it would just cycle through (there is already an instance of that with the two Proxy IP in the network tab).

@jonasschnelli
Copy link
Contributor

utACK f066abd0837df5f4d414d6a092e48f334f9bb864
Please update PR description (it's now part of the git history).

@laanwj
Copy link
Member

laanwj commented Jul 24, 2017

utACK

@laanwj laanwj changed the title Typo in optionsdialog.ui [qt] Fix typo and access key in optionsdialog.ui Jul 24, 2017
@promag
Copy link
Member

promag commented Jul 24, 2017

utACK f066abd. Maybe squash?

TheBlueMatt
TheBlueMatt reviewed Jul 25, 2017
View reviewed changes
src/qt/forms/optionsdialog.ui
@@ -199,10 +199,10 @@
<item>
<widget class="QCheckBox" name="allowIncoming">
<property name="toolTip">
<string>Accept connections from outside</string>
<string>Accept connections from outside.</string>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this result in a translation string change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but one that is easy to adjust for.

@TheBlueMatt
Copy link
Contributor

I assume &amps will not result in translation string changes?

@laanwj
Copy link
Member

laanwj commented Jul 26, 2017 •
edited

I assume &amps will not result in translation string changes?

They do.
This should go in after 0.15 branch.

luke-jr
luke-jr reviewed Jul 26, 2017
View reviewed changes
Copy link
Member

@luke-jr luke-jr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this touches strings, I think we should merge the fixes, but leave the hotkeys alone/unchanged for now.

Poke me to save affected translations just before merging, so I can restore them after.

src/qt/forms/optionsdialog.ui
</property>
<property name="text">
<string>Allow incoming connections</string>
<string>Allow incomin&amp;g connections</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is currently being auto-assigned L. I'm not sure G is logical enough to warrant a change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest leaving this alone until 0.16.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any of these being auto-assigned under Windows or Linux. Perhaps I'm missing something?

src/qt/forms/optionsdialog.ui
@@ -399,7 +399,7 @@
<string>Connect to the Bitcoin network through a separate SOCKS5 proxy for Tor hidden services.</string>
</property>
<property name="text">
<string>Use separate SOCKS5 proxy to reach peers via Tor hidden services:</string>
<string>Use separate SOCKS&amp;5 proxy to reach peers via Tor hidden services:</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is being auto-assigned S. If we change it, T seems like a more logical choice...

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggest leaving it alone until 0.16.

src/qt/forms/optionsdialog.ui
</property>
<property name="text">
<string>Hide tray icon</string>
<string>&amp;Hide tray icon</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redundant with auto-assignment. Suggest leaving it alone until 0.16. (But still fix the tooltip)

src/qt/forms/optionsdialog.ui
@@ -610,7 +610,7 @@
<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>&amp;Third party transaction URLs</string>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Redundant with auto-assignment. Suggest leaving it alone until 0.16.

@jonasschnelli
Copy link
Contributor

@keystrike: can you squash these two commits?

@fanquake fanquake mentioned this pull request Sep 2, 2017
Closed
@maflcko
Copy link
Member

maflcko commented Sep 7, 2017

@keystrike Please squash your commits according to https://github.com/bitcoin/bitcoin/blob/master/CONTRIBUTING.md#squashing-commits

@keystrike @jonasschnelli
Typo in optionsdialog.ui
d2be7b2 
Tooltip displayed ampersand incorrectly, &amp; should be in text.
@jonasschnelli jonasschnelli merged commit d2be7b2 into bitcoin:master Sep 7, 2017
jonasschnelli added a commit that referenced this pull request Sep 7, 2017
@jonasschnelli
Merge #10911: [qt] Fix typo and access key in optionsdialog.ui
9c8f365 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
@jonasschnelli
Copy link
Contributor

squashed by maintainer due to lack of response.

PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Sep 23, 2019
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
baf0946 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Sep 24, 2019
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
e5df271 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Nov 19, 2019
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
0363f86 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Nov 21, 2019
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
2ea1cf7 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Dec 9, 2019
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
e9a3792 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 1, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
8371319 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 2, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
b03550e 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 2, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
516a324 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 2, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
85933fd 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 2, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
5655985 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 2, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
0df31ee 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jan 3, 2020
@jonasschnelli @PastaPastaPasta
Merge bitcoin#10911: [qt] Fix typo and access key in optionsdialog.ui
1d2cd24 
d2be7b2 Typo in optionsdialog.ui Tooltip displayed ampersand incorrectly, &amp; should be in text. (James Evans)

Pull request description:

  Tooltip displayed ampersand incorrectly, &amp; should be in text property rather than tooltip so that access key is correctly displayed for accessibility.

Tree-SHA512: 331848207317d37d4d9db40119d0b7ae9a276d06cd1b057cd0e87d508e1aa769b785246ca30ca9156db632798ec9f68ba8bf78cf42904267b4187bd27cfced35
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@TheBlueMatt TheBlueMatt TheBlueMatt left review comments

@luke-jr luke-jr luke-jr left review comments

Assignees
No one assigned
Labels
GUI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@keystrike @benma @jonasschnelli @laanwj @promag @TheBlueMatt @maflcko @luke-jr @fanquake