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.

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

qt: Correct misleading "overridden options" label #14375

Merged
merged 1 commit into from Jan 3, 2019

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Oct 2, 2018

Refs: #3867, #8165.

@fanquake fanquake added the GUI label Oct 2, 2018
@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Oct 4, 2018

Coverage Change (pull 14375) Reference (master)
Lines +0.0177 % 87.0471 %
Functions +0.1081 % 84.1130 %
Branches +0.0142 % 51.5403 %

Sjors
Sjors approved these changes Oct 5, 2018
Copy link
Member

@Sjors Sjors left a comment

Much better text imo.

utACK cddc166ceac284e71522d973733a12b2803218a8

FYI #12833 would completely eliminate the need for this message.

@DrahtBot
Copy link
Contributor

@DrahtBot DrahtBot commented Nov 13, 2018

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

No conflicts as of last run.

@@ -714,7 +714,7 @@
<item>
<widget class="QLabel" name="overriddenByCommandLineInfoLabel">
<property name="text">
<string>Active command-line options that override above options:</string>
<string>GUI options overridden by the command line or in the configuration file:</string>
Copy link
Member

@laanwj laanwj Nov 23, 2018

I think the first part is confusing, these are not only GUI options, but anything that can be configured in the options dialog.

Copy link
Member Author

@hebasto hebasto Nov 23, 2018

Could it be:
"Options set in this dialog and overridden by the command line or in the configuration file:" ?

Copy link
Member

@laanwj laanwj Nov 23, 2018

yes, that's better

Command-line options override values set in the configuration file and
configuration file options override values set in the GUI.
@hebasto hebasto force-pushed the 20181002-gui-overridden-options branch from cddc166 to 7514361 Nov 23, 2018
@hebasto
Copy link
Member Author

@hebasto hebasto commented Nov 23, 2018

@laanwj
Thank you for your review.
Your comment has been addressed. Would you mind re-reviewing?

@laanwj
Copy link
Member

@laanwj laanwj commented Jan 3, 2019

utACK 7514361

@laanwj laanwj merged commit 7514361 into bitcoin:master Jan 3, 2019
2 checks passed
laanwj added a commit that referenced this issue Jan 3, 2019
7514361 Correct misleading "overridden options" label (Hennadii Stepanov)

Pull request description:

  Refs: #3867, #8165.

Tree-SHA512: da3b13a0560654053aeff22a15031ae59a3136abc941f3959440c2d250add7de7ca837c96d721eed69b2cac21d340e1895a186f69383ab82a41fc1e0ee789e5c
@hebasto hebasto deleted the 20181002-gui-overridden-options branch Jan 3, 2019
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this issue Oct 26, 2020
Summary:
75143612546450c064ccd8dcf1f7f6e79f397802 Correct misleading "overridden options" label (Hennadii Stepanov)

Pull request description:

  Refs: #3867, #8165.

---

Backport of Core [[bitcoin/bitcoin#14375 | PR14375]]

Test Plan:
  ninja

Reviewers: #bitcoin_abc, PiRK

Reviewed By: PiRK

Differential Revision: https://reviews.bitcoinabc.org/D8135
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jun 26, 2021
7514361 Correct misleading "overridden options" label (Hennadii Stepanov)

Pull request description:

  Refs: dashpay#3867, bitcoin#8165.

Tree-SHA512: da3b13a0560654053aeff22a15031ae59a3136abc941f3959440c2d250add7de7ca837c96d721eed69b2cac21d340e1895a186f69383ab82a41fc1e0ee789e5c
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this issue Jun 28, 2021
7514361 Correct misleading "overridden options" label (Hennadii Stepanov)

Pull request description:

  Refs: dashpay#3867, bitcoin#8165.

Tree-SHA512: da3b13a0560654053aeff22a15031ae59a3136abc941f3959440c2d250add7de7ca837c96d721eed69b2cac21d340e1895a186f69383ab82a41fc1e0ee789e5c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants