From fa41d4c8c6e3f84a9117c0addf51a87f14321e2a Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Mon, 9 Nov 2015 19:23:46 +0100
Subject: [PATCH] [qt] Move GUI related HelpMessage() part downstream

---
 src/init.cpp                | 17 -----------------
 src/qt/guiconstants.h       |  2 ++
 src/qt/intro.h              |  2 ++
 src/qt/paymentrequestplus.h |  2 ++
 src/qt/utilitydialog.cpp    | 20 +++++++++++++++++++-
 src/util.h                  |  4 ----
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/init.cpp b/src/init.cpp
index 5c1abb54e..1c2f3f49d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -499,23 +499,6 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-rpcservertimeout=<n>", strprintf("Timeout during HTTP requests (default: %d)", DEFAULT_HTTP_SERVER_TIMEOUT));
     }
 
-    if (mode == HMM_BITCOIN_QT)
-    {
-        strUsage += HelpMessageGroup(_("UI Options:"));
-        if (showDebug) {
-            strUsage += HelpMessageOpt("-allowselfsignedrootcertificates", strprintf("Allow self signed root certificates (default: %u)", DEFAULT_SELFSIGNED_ROOTCERTS));
-        }
-        strUsage += HelpMessageOpt("-choosedatadir", strprintf(_("Choose data directory on startup (default: %u)"), DEFAULT_CHOOSE_DATADIR));
-        strUsage += HelpMessageOpt("-lang=<lang>", _("Set language, for example \"de_DE\" (default: system locale)"));
-        strUsage += HelpMessageOpt("-min", _("Start minimized"));
-        strUsage += HelpMessageOpt("-rootcertificates=<file>", _("Set SSL root certificates for payment request (default: -system-)"));
-        strUsage += HelpMessageOpt("-splash", strprintf(_("Show splash screen on startup (default: %u)"), DEFAULT_SPLASHSCREEN));
-        strUsage += HelpMessageOpt("-resetguisettings", _("Reset all settings changes made over the GUI"));
-        if (showDebug) {
-            strUsage += HelpMessageOpt("-uiplatform", "Select platform to customize UI for (one of windows, macosx, other; default: platform compiled on)");
-        }
-    }
-
     return strUsage;
 }
 
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index 7d3e48ff3..216f23f13 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -14,6 +14,8 @@ static const int MAX_PASSPHRASE_SIZE = 1024;
 /* BitcoinGUI -- Size of icons in status bar */
 static const int STATUSBAR_ICONSIZE = 16;
 
+static const bool DEFAULT_SPLASHSCREEN = true;
+
 /* Invalid field background style */
 #define STYLE_INVALID "background:#FF8080"
 
diff --git a/src/qt/intro.h b/src/qt/intro.h
index 50783f722..1d49922e9 100644
--- a/src/qt/intro.h
+++ b/src/qt/intro.h
@@ -9,6 +9,8 @@
 #include <QMutex>
 #include <QThread>
 
+static const bool DEFAULT_CHOOSE_DATADIR = false;
+
 class FreespaceChecker;
 
 namespace Ui {
diff --git a/src/qt/paymentrequestplus.h b/src/qt/paymentrequestplus.h
index 99a7186b8..8a7c4c062 100644
--- a/src/qt/paymentrequestplus.h
+++ b/src/qt/paymentrequestplus.h
@@ -15,6 +15,8 @@
 #include <QList>
 #include <QString>
 
+static const bool DEFAULT_SELFSIGNED_ROOTCERTS = false;
+
 //
 // Wraps dumb protocol buffer paymentRequest
 // with extra methods
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
index 5e26f3e01..da85ab2b3 100644
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -8,6 +8,9 @@
 
 #include "bitcoingui.h"
 #include "clientmodel.h"
+#include "guiconstants.h"
+#include "intro.h"
+#include "paymentrequestplus.h"
 #include "guiutil.h"
 
 #include "clientversion.h"
@@ -70,7 +73,22 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
         cursor.insertText(header);
         cursor.insertBlock();
 
-        QString coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT));
+        std::string strUsage = HelpMessage(HMM_BITCOIN_QT);
+        const bool showDebug = GetBoolArg("-help-debug", false);
+        strUsage += HelpMessageGroup(_("UI Options:"));
+        if (showDebug) {
+            strUsage += HelpMessageOpt("-allowselfsignedrootcertificates", strprintf("Allow self signed root certificates (default: %u)", DEFAULT_SELFSIGNED_ROOTCERTS));
+        }
+        strUsage += HelpMessageOpt("-choosedatadir", strprintf(_("Choose data directory on startup (default: %u)"), DEFAULT_CHOOSE_DATADIR));
+        strUsage += HelpMessageOpt("-lang=<lang>", _("Set language, for example \"de_DE\" (default: system locale)"));
+        strUsage += HelpMessageOpt("-min", _("Start minimized"));
+        strUsage += HelpMessageOpt("-rootcertificates=<file>", _("Set SSL root certificates for payment request (default: -system-)"));
+        strUsage += HelpMessageOpt("-splash", strprintf(_("Show splash screen on startup (default: %u)"), DEFAULT_SPLASHSCREEN));
+        strUsage += HelpMessageOpt("-resetguisettings", _("Reset all settings changes made over the GUI"));
+        if (showDebug) {
+            strUsage += HelpMessageOpt("-uiplatform", "Select platform to customize UI for (one of windows, macosx, other; default: platform compiled on)");
+        }
+        QString coreOptions = QString::fromStdString(strUsage);
         text = version + "\n" + header + "\n" + coreOptions;
 
         QTextTableFormat tf;
diff --git a/src/util.h b/src/util.h
index 25ab27a8e..fb154f666 100644
--- a/src/util.h
+++ b/src/util.h
@@ -56,10 +56,6 @@ extern CTranslationInterface translationInterface;
 extern const char * const BITCOIN_CONF_FILENAME;
 extern const char * const BITCOIN_PID_FILENAME;
 
-static const bool DEFAULT_SELFSIGNED_ROOTCERTS = false;
-static const bool DEFAULT_CHOOSE_DATADIR = false;
-static const bool DEFAULT_SPLASHSCREEN = true;
-
 /**
  * Translation function: Call Translate signal on UI interface, which returns a boost::optional result.
  * If no translation slot is registered, nothing is returned, and simply return the input.