-
Notifications
You must be signed in to change notification settings - Fork 304
about:version:help clean up add Bitcoin branding #140
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
Conversation
return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2009, COPYRIGHT_YEAR) + " "); | ||
} | ||
|
||
std::string AboutMessageInfo() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The AboutMessageInfo() is simple and can be modified more easily in the future.
src/qt/bitcoin.qrc
Outdated
@@ -44,6 +44,7 @@ | |||
<file alias="hd_disabled">res/icons/hd_disabled.png</file> | |||
<file alias="network_disabled">res/icons/network_disabled.png</file> | |||
<file alias="proxy">res/icons/proxy.png</file> | |||
<file alias="bitcoin_core">res/icons/bitcoin_core.png</file> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Added the png art that is used in the header of the about view.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reuse of bitcoin.png is a better approach. Thanks for the feed back!
src/qt/forms/helpmessagedialog.ui
Outdated
@@ -6,10 +6,13 @@ | |||
<rect> | |||
<x>0</x> | |||
<y>0</y> | |||
<width>780</width> | |||
<height>400</height> | |||
<width>602</width> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new configuration makes a better use of space - therefore the window doesn't need to open as big.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The view's dimensions are now dynamic and resize based on help/about context.
@@ -41,21 +41,37 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : | |||
setWindowTitle(tr("About %1").arg(PACKAGE_NAME)); | |||
|
|||
std::string licenseInfo = LicenseInfo(); | |||
/// HTML-format the license message from the core | |||
std::string copyrightInfo = CopyrightInfo(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new implementation separates these strings.
REF: e0ff8e2#r536346038
NACK on changes of |
I ensured that the output is uniform for -version (except for the word "version" in bitcoind -version) I would prefer to take it out.. I believe v implies version and is redundant. thanks for the feedback! :) |
I like the new style. Concept ACK if we keep the color as is (we can always change it later to black if people want this). |
I would change that logo. This is Bitcoin, Core is secondary. Only forks want to reinforce the Core over Bitcoin.
|
I disagree with this view. The GUI this repo is for is a product developed by Core that uses the Bitcoin protocol. Other implementations may one day exist that work on Bitcoin that aren't Core. |
What do we want to communicate? We cannot be always thinking about other people concerns, the software is what it is and other implementations can exist - and they do exist - without the need to reinforce this concept on the logo and be "apologetic". I believe users of the Core implementation should feel they are running BITCOIN when running this "product" and not "Core". |
One or the other at this stage - currently both are used and its confusing.
You can still achieve this whilst using the black logo - do people think they are running something else when using products like electrum or bluewallet? I'd say no. This is the designers job to communicate this effectively and use the black and orange logos in their appropriate locations. Do most people see Bitcoin Core = Bitcoin? |
Why Bitcoin so thin and Core so bold? Isn't that trying to communicate Core over Bitcoin? |
I've already explained my rationale many times above. I'm still of the thought that: Bitcoin Core is a group of developers who work on Bitcoin. Bitcoin is a network that everyone is apart of. Electrum and BlueWallet are part of the Bitcoin ecosystem as is the GUI developed by the Core developers. |
I agree with not emphasizing "Core". Let's not institutionalize that emphasis further. Please keep them equal or put more weight on "Bitcoin". One of my pet peeves is people writing "Core" instead of "Bitcoin Core" ("Core devs", "running Core", and so on). See the Bitcoin Optech style guide:
100% agree with our Bitcoin Optech colleagues about this. |
Concept ACK, sorry about not reviewing the PR itself, in general this looks very nice @RandyMcMillan and is a good improvement. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd be happy to ACK everything but the logo change, maybe you want to split the PR?
Thank you for the feed back! |
I agree with the statement
is a group and this is why I've maintained that "Developers" should be capitalized in the branding. Further more... From a copyright perspective - THE BITCOIN CORE DEVELOPERS should be in all caps - but this isn't mandated in any legalese that I have read... But that is outside the scope of this PR. :) |
I didn't see the link - agree.
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested ACK 5210082
NACK on the current logo text, it looks really bad IMO.
Also the about page
and command-line options page
don't need to be the same size. There's a lot of unused space in the about page
because they're set to be the same size.
@jarolrod - please add some context to the pic you posted. |
OS: Arch Linux, DE: KDE Plasma 5.19.5, Res:3440x1440 |
@@ -846,6 +846,7 @@ void BitcoinGUI::showDebugWindowActivateConsole() | |||
void BitcoinGUI::showHelpMessageClicked() | |||
{ | |||
helpMessageDialog->show(); | |||
helpMessageDialog->raise();//bring to top if obscured |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the helpMessageDialog has already been presented - this change brings it to the front if the user re-clicks on the help menu item - otherwise it may remain obscured by any other windows.
@@ -33,29 +33,46 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : | |||
ui(new Ui::HelpMessageDialog) | |||
{ | |||
ui->setupUi(this); | |||
|
|||
this->resize(500,0);//force view height to stretch |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The Ui::HelpMessageDialog is shared with the about view.
These change forces the view to stretch to an appropriate height - this eliminates excessive height dimensions - the user resizes based upon personal preference.
|
||
if (about) | ||
{ | ||
setWindowTitle(tr("About %1").arg(PACKAGE_NAME)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Over riding PACKAGE_NAME is outside the scope of this PR.
This PR is implementing changes based on broader community discussions and sentiment.
REF: #89 (comment)
REF: #140 (comment)
src/bitcoind.cpp
Outdated
|
||
if (args.IsArgSet("-version")) { | ||
strUsage += FormatParagraph(LicenseInfo()) + "\n"; | ||
strUsage += FormatParagraph(LicenseInfo()) + "\n" + CopyrightInfo() + "\n";//from init.cpp |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bitcoind.cpp uses the same strings that help and about use.
LicenseInfo() and CopyrightInfo() are now refactored for reusability.
@@ -47,6 +47,11 @@ static std::string FormatVersion(int nVersion) | |||
return strprintf("%d.%d.%d", nVersion / 10000, (nVersion / 100) % 100, nVersion % 100); | |||
} | |||
|
|||
std::string FormatVersion() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Returns a terse string for reusability.
REF: e0ff8e2#r536344384
src/qt/bitcoin.qrc
Outdated
@@ -1,4 +1,4 @@ | |||
<!DOCTYPE RCC><RCC version="1.0"> | |||
<RCC> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this change necessary
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Corrected - Qt should have never changed that.
https://doc.qt.io/qt-5.12/qtxmlpatterns-schema-schema-qrc.html
Unexpected behavior.
src/qt/utilitydialog.cpp
Outdated
QString licenseInfoHTML = QString::fromStdString(LicenseInfo()); | ||
// Make URLs clickable | ||
QRegExp uri("<(.*)>", Qt::CaseSensitive, QRegExp::RegExp2); | ||
uri.setMinimal(true); // use non-greedy matching | ||
versionInfoHTML.replace(uri, "<a href=\"\\1\">\\1</a>"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why does it create a link here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are correct! This string no longer needs this transform.
Awesome!
strUsage += FormatParagraph(LicenseInfo()) + "\n" | ||
"\nUsage: bitcoind [options] Start " PACKAGE_NAME "\n" | ||
"\n"; | ||
strUsage += args.GetHelpMessage(); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Resolved conflict.
Whether I agree with the change or not, I don't see how it can be appropriate to slip in a name change. Either the PR title should be changed, or a new PR created IMO. It also doesn't make sense to me to have the name be Bitcoin Core on the loading screen, as well as We also have other issues underway on branding discussing this issue that aren't cleared yet (#89, #100). There's a lot of inconsistency. Bitcoin.org uses orange; bitcoincore.org uses both; bitcoin repo uses black; bitcoin-core repo uses orange. And now we're making additional naming changes before any decisions have been made. Seems very messy. |
@Rspigler - I agree it is a pretty serious issue... There is a lot to do - and lot of decisions to be made. And yes...the scope of this PR has changed. More importantly is - Working on the Gui has led me to believe there is a relatively easy work around to abstracting the Gui variables (PROJECT_NAME, etc..) from the build environment variables so Gui dev can progress and the plumbing can be refactored independently... So once I know which direction to go concerning naming/branding/logo/etc... |
Before:
After: