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, docs: Fix `bitcoin-qt -version` output formatting #14521

Merged
merged 1 commit into from Nov 23, 2018

Conversation

Projects
None yet
8 participants
@hebasto
Copy link
Member

commented Oct 19, 2018

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

This comment has been minimized.

Copy link

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.

@MarcoFalke MarcoFalke added the GUI label Oct 20, 2018

@merland

This comment has been minimized.

Copy link
Contributor

commented Oct 23, 2018

@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

This comment has been minimized.

Copy link
Contributor

commented Oct 23, 2018

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

Conflicts

No conflicts as of last run.

@fanquake

This comment has been minimized.

Copy link
Member

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

This comment has been minimized.

Copy link
Member Author

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 hebasto:20181019-qt-cli-license branch to 60ae463 Nov 5, 2018

@hebasto

This comment has been minimized.

Copy link
Member Author

commented Nov 5, 2018

Rebased.

@DrahtBot DrahtBot removed the Needs rebase label Nov 5, 2018

@jonasschnelli
Copy link
Member

left a comment

utACK 60ae463

@laanwj laanwj merged commit 60ae463 into bitcoin:master Nov 23, 2018

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Nov 23, 2018

Merge #14521: qt, docs: Fix `bitcoin-qt -version` output formatting
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 hebasto:20181019-qt-cli-license branch Nov 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.