about:version:help clean up add Bitcoin branding

src/bitcoind.cpp

@@ -55,13 +55,12 @@ static bool AppInit(int argc, char* argv[])
 
     // Process help and version before taking care about datadir
     if (HelpRequested(args) || args.IsArgSet("-version")) {
-        std::string strUsage = PACKAGE_NAME " version " + FormatFullVersion() + "\n";
+        std::string strUsage = PACKAGE_NAME " " + FormatFullVersion() + "\n" + LicenseInfo()  +"\n" + CopyrightInfo() + "\n";
 
-        if (args.IsArgSet("-version")) {
-            strUsage += FormatParagraph(LicenseInfo()) + "\n";
-        } else {
-            strUsage += "\nUsage:  bitcoind [options]                     Start " PACKAGE_NAME "\n";
-            strUsage += "\n" + args.GetHelpMessage();
+        if (!args.IsArgSet("-version")) {
+            strUsage += "\nUsage:  bitcoind [options]                     Start " PACKAGE_NAME "\n"
+                "\n";
+            strUsage += args.GetHelpMessage();
         }
 
         tfm::format(std::cout, "%s", strUsage);

src/clientversion.cpp

@@ -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()
+{
+    return BUILD_DESC "-" BUILD_GIT_COMMIT;
+}
+
 std::string FormatFullVersion()
 {
     return CLIENT_BUILD;

src/clientversion.h

@@ -44,6 +44,7 @@ extern const std::string CLIENT_NAME;
 extern const std::string CLIENT_BUILD;
 
 
+std::string FormatVersion();
 std::string FormatFullVersion();
 std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
 

src/init.cpp

@@ -591,23 +591,28 @@ void SetupServerArgs(NodeContext& node)
     argsman.AddHiddenArgs(hidden_args);
 }
 
+std::string VersionInfo()
+{
+    return FormatVersion();//from clientversion.cpp
+}
+
+std::string CopyrightInfo()
+{
+    return CopyrightHolders(strprintf(_("Copyright (C) %i-%i ").translated, 2009, COPYRIGHT_YEAR));
+}
+
+std::string AboutMessageInfo()
+{
+    const std::string SOURCE_CODE_URL = "<https://github.com/bitcoin/bitcoin>";
+    return strprintf(_("Please contribute if you find %s useful." "\n"
+                       "Visit %s for further information.").translated, PACKAGE_NAME, "<" PACKAGE_URL ">") + "\n" +
+           strprintf(_("The source code is available at: %s").translated, SOURCE_CODE_URL);
+}
+
 std::string LicenseInfo()
 {
-    const std::string URL_SOURCE_CODE = "<https://github.com/bitcoin/bitcoin>";
-
-    return CopyrightHolders(strprintf(_("Copyright (C) %i-%i").translated, 2009, COPYRIGHT_YEAR) + " ") + "\n" +
-           "\n" +
-           strprintf(_("Please contribute if you find %s useful. "
-                       "Visit %s for further information about the software.").translated,
-               PACKAGE_NAME, "<" PACKAGE_URL ">") +
-           "\n" +
-           strprintf(_("The source code is available from %s.").translated,
-               URL_SOURCE_CODE) +
-           "\n" +
-           "\n" +
-           _("This is experimental software.").translated + "\n" +
-           strprintf(_("Distributed under the MIT software license, see the accompanying file %s or %s").translated, "COPYING", "<https://opensource.org/licenses/MIT>") +
-           "\n";
+    const std::string LICENSE_URL = "<https://github.com/bitcoin/bitcoin/blob/master/COPYING>";
+    return strprintf(_("\nThis is experimental software.\nDistributed under the MIT software license:\n%s").translated, LICENSE_URL);
 }
 
 static bool fHaveGenesis = false;
@@ -881,7 +886,7 @@ void InitLogging(const ArgsManager& args)
 
     fLogIPs = args.GetBoolArg("-logips", DEFAULT_LOGIPS);
 
-    std::string version_string = FormatFullVersion();
+    std::string version_string = FormatVersion();
 #ifdef DEBUG
     version_string += " (debug build)";
 #else

src/init.h

@@ -68,7 +68,10 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
  */
 void SetupServerArgs(NodeContext& node);
 
-/** Returns licensing information (for -version) */
+/** Returns information (for -version) */
+std::string VersionInfo();
+std::string CopyrightInfo();
+std::string AboutMessageInfo();
 std::string LicenseInfo();
 
 #endif // BITCOIN_INIT_H

src/qt/bitcoingui.cpp

@@ -846,6 +846,7 @@ void BitcoinGUI::showDebugWindowActivateConsole()
 void BitcoinGUI::showHelpMessageClicked()
 {
     helpMessageDialog->show();
+    helpMessageDialog->raise();//bring to top if obscured
 }
 
 #ifdef ENABLE_WALLET