Skip to content

qt, docs: Fix bitcoin-qt -version output formatting #14521

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
Merged
laanwj merged 1 commit into from
Nov 23, 2018
Merged

qt, docs: Fix bitcoin-qt -version output formatting #14521

laanwj merged 1 commit into from
Nov 23, 2018

Conversation

@hebasto
Copy link
Member

@hebasto hebasto commented Oct 19, 2018 •
edited
Loading

This PR makes command line output of bitcoin-qt -version formatted in the same way as bitcoind -version output.

Before:
screenshot from 2018-10-19 20-16-42

After:
screenshot from 2018-10-19 20-22-09

@molxyz
Copy link

molxyz commented Oct 19, 2018

@hebasto This screen is for "About Bitcoin Core", so I would like to have it kept as clean and professional looking as possible. There's a screen for "About Qt" under Help that you might want to look at? Although I still don't see the purpose for this. Please do not keep trying to change trivial, unnecessary things for Bitcoin Core, it's just a waste of devs time for more important improvements.

@maflcko maflcko added the GUI label Oct 20, 2018
@merland
Copy link
Contributor

merland commented Oct 23, 2018 •
edited
Loading

@molxyz
Regarding your comment about changing "trivial" things: Isn't that a very good way for newcomers to get used to the contribution process and learn the way around the docs and the code? I certainly think so.
And in the process, Bitcoin Core gets many small improvements in areas where more experienced devs rarely work. It's a win-win!

If "trivial" PRs take too much time for devs, we have a delegation problem. Reviewing "trivial" PRs could and should be delegated appropriately. Please don't scare away newcomers that want to (learn how to) contribute. I am one them.

@DrahtBot DrahtBot mentioned this pull request Oct 23, 2018
Merged
@DrahtBot
Copy link
Contributor

DrahtBot commented Oct 23, 2018 •
edited
Loading

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

Conflicts

No conflicts as of last run.

@fanquake
Copy link
Member

fanquake commented Oct 28, 2018

An uninteresting trip into all? the different place/ways we display version information (efaf2d8):

src/qt/bitcoin-qt -version
Bitcoin Core version v0.17.99.0-efaf2d85e (64-bit)
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Bitcoin Core useful. Visit <https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING or <https://opensource.org/licenses/MIT>

This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by Eric Young and UPnP software written by Thomas Bernard.

src/bitcoind -version
Bitcoin Core Daemon version v0.17.99.0-efaf2d85e
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>

This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
Eric Young and UPnP software written by Thomas Bernard.

src/bitcoin-cli -version
Bitcoin Core RPC client version v0.17.99.0-efaf2d85e

About Bitcoin Core:
about bitcoin core

Command Line Options:
command line options

Debug Console:
debug console

After (This PR 368bd04):

src/qt/bitcoin-qt -version
Bitcoin Core version v0.17.99.0-c61ee8181 (64-bit)
Copyright (C) 2009-2018 The Bitcoin Core developers

Please contribute if you find Bitcoin Core useful. Visit
<https://bitcoincore.org> for further information about the software.
The source code is available from <https://github.com/bitcoin/bitcoin>.

This is experimental software.
Distributed under the MIT software license, see the accompanying file COPYING
or <https://opensource.org/licenses/MIT>

This product includes software developed by the OpenSSL Project for use in the
OpenSSL Toolkit <https://www.openssl.org> and cryptographic software written by
Eric Young and UPnP software written by Thomas Bernard.

It seems that whatever FormatParagraph is meant to be doing doesn't have much of an affect in the About Core dialog, as the output appears the same with or without this commit.

@hebasto
Copy link
Member Author

hebasto commented Oct 28, 2018

@fanquake Thank you for your review.

This PR is intended only for the -version command-line option of bitcoin-qt.
"About Bitcoin Core" dialog is a resizable window, therefore it does not need FormatParagraph.

@hebasto hebasto force-pushed the 20181019-qt-cli-license branch from 368bd04 to 60ae463 Compare November 5, 2018 11:38
@hebasto
Copy link
Member Author

hebasto commented Nov 5, 2018

Rebased.

jonasschnelli
jonasschnelli approved these changes Nov 7, 2018
View reviewed changes
Copy link
Contributor

@jonasschnelli jonasschnelli left a comment

Choose a reason for hiding this comment

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

utACK 60ae463

@laanwj laanwj merged commit 60ae463 into bitcoin:master Nov 23, 2018
laanwj added a commit that referenced this pull request Nov 23, 2018
@laanwj
Merge #14521: qt, docs: Fix bitcoin-qt -version output formatting
59f05d1 
60ae463 Fix `bitcoin-qt -version` output formatting (Hennadii Stepanov)

Pull request description:

  This PR makes command line output of `bitcoin-qt -version` formatted in the same way as `bitcoind -version` output.

  Before:
  ![screenshot from 2018-10-19 20-16-42](https://user-images.githubusercontent.com/32963518/47233718-434a2a80-d3dc-11e8-90d4-84dd23e8ac3b.png)

  After:
  ![screenshot from 2018-10-19 20-22-09](https://user-images.githubusercontent.com/32963518/47233888-b653a100-d3dc-11e8-9155-000b517a8e7b.png)

Tree-SHA512: fd8bd20e2108b9562bcbf6c094f950e867a5755994e8acc28b07e52fe73d04f783201c20bde47be2083ce89fb3ef9749f9c3757d479ad6c48ed09c633155f47e
@hebasto hebasto deleted the 20181019-qt-cli-license branch November 23, 2018 13:12
jasonbcox pushed a commit to Bitcoin-ABC/bitcoin-abc that referenced this pull request Nov 10, 2020
@hebasto @PiRK
Fix bitcoin-qt -version output formatting
e0818f9 
Summary:
> This PR makes command line output of `bitcoin-qt -version` formatted in the same way as `bitcoind -version` output.

This is a backport of Core [[bitcoin/bitcoin#14521 | PR14521]]

Test Plan: `src/qt/bitcoin-qt -version`

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D8352
linuxsh2 pushed a commit to linuxsh2/dash that referenced this pull request Jul 28, 2021
@laanwj @linuxsh2
Merge bitcoin#14521: qt, docs: Fix bitcoin-qt -version output forma…
f48f20a 
…tting

60ae463 Fix `bitcoin-qt -version` output formatting (Hennadii Stepanov)

Pull request description:

  This PR makes command line output of `bitcoin-qt -version` formatted in the same way as `bitcoind -version` output.

  Before:
  ![screenshot from 2018-10-19 20-16-42](https://user-images.githubusercontent.com/32963518/47233718-434a2a80-d3dc-11e8-90d4-84dd23e8ac3b.png)

  After:
  ![screenshot from 2018-10-19 20-22-09](https://user-images.githubusercontent.com/32963518/47233888-b653a100-d3dc-11e8-9155-000b517a8e7b.png)

Tree-SHA512: fd8bd20e2108b9562bcbf6c094f950e867a5755994e8acc28b07e52fe73d04f783201c20bde47be2083ce89fb3ef9749f9c3757d479ad6c48ed09c633155f47e
linuxsh2 pushed a commit to linuxsh2/dash that referenced this pull request Jul 30, 2021
@laanwj @linuxsh2
Merge bitcoin#14521: qt, docs: Fix bitcoin-qt -version output forma…
40d649d 
…tting

60ae463 Fix `bitcoin-qt -version` output formatting (Hennadii Stepanov)

Pull request description:

  This PR makes command line output of `bitcoin-qt -version` formatted in the same way as `bitcoind -version` output.

  Before:
  ![screenshot from 2018-10-19 20-16-42](https://user-images.githubusercontent.com/32963518/47233718-434a2a80-d3dc-11e8-90d4-84dd23e8ac3b.png)

  After:
  ![screenshot from 2018-10-19 20-22-09](https://user-images.githubusercontent.com/32963518/47233888-b653a100-d3dc-11e8-9155-000b517a8e7b.png)

Tree-SHA512: fd8bd20e2108b9562bcbf6c094f950e867a5755994e8acc28b07e52fe73d04f783201c20bde47be2083ce89fb3ef9749f9c3757d479ad6c48ed09c633155f47e
@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

1 more reviewer

@jonasschnelli jonasschnelli jonasschnelli approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

GUI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@hebasto @molxyz @merland @DrahtBot @fanquake @jonasschnelli @laanwj @maflcko