Bugfix: Default -uiplatform is not actually the platform this build was compiled on

luke-jr · luke-jr · commit 29266b64e8d1 · 2015-10-01T23:16:43.000Z
Also hides the option for non-GUI builds.
diff --git a/src/init.cpp b/src/init.cpp
@@ -494,8 +494,8 @@ std::string HelpMessage(HelpMessageMode mode)
         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));
-        if (showDebug) {
-            strUsage += HelpMessageOpt("-uiplatform", "Select platform to customize UI for (one of windows, macosx, other; default: platform compiled on)");
+        if (showDebug && !uiInterface.DefaultUIPlatform.empty()) {
+            strUsage += HelpMessageOpt("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", uiInterface.DefaultUIPlatform));
         }
     }
 
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -309,14 +309,8 @@ BitcoinApplication::BitcoinApplication(int &argc, char **argv):
     // UI per-platform customization
     // This must be done inside the BitcoinApplication constructor, or after it, because
     // PlatformStyle::instantiate requires a QApplication
-#if defined(Q_OS_MAC)
-    std::string platformName = "macosx";
-#elif defined(Q_OS_WIN)
-    std::string platformName = "windows";
-#else
-    std::string platformName = "other";
-#endif
-    platformName = GetArg("-uiplatform", platformName);
+    std::string platformName;
+    platformName = GetArg("-uiplatform", uiInterface.DefaultUIPlatform);
     platformStyle = PlatformStyle::instantiate(QString::fromStdString(platformName));
     if (!platformStyle) // Fall back to "other" if specified name not found
         platformStyle = PlatformStyle::instantiate("other");
@@ -509,6 +503,16 @@ int main(int argc, char *argv[])
 {
     SetupEnvironment();
 
+    uiInterface.DefaultUIPlatform =
+#if defined(Q_OS_MAC)
+        "macosx"
+#elif defined(Q_OS_WIN)
+        "windows"
+#else
+        "other"
+#endif
+        ;
+
     /// 1. Parse command-line options. These take precedence over anything else.
     // Command-line options take precedence:
     ParseParameters(argc, argv);
diff --git a/src/ui_interface.h b/src/ui_interface.h
@@ -98,6 +98,9 @@ class CClientUIInterface
 
     /** Banlist did change. */
     boost::signals2::signal<void (void)> BannedListChanged;
+
+    /** Default UI interface */
+    std::string DefaultUIPlatform;
 };
 
 extern CClientUIInterface uiInterface;

Original file line number	Diff line number	Diff line change
`@@ -494,8 +494,8 @@ std::string HelpMessage(HelpMessageMode mode)`
`494`	`494`	`strUsage += HelpMessageOpt("-min", _("Start minimized"));`
`495`	`495`	`strUsage += HelpMessageOpt("-rootcertificates=<file>", _("Set SSL root certificates for payment request (default: -system-)"));`
`496`	`496`	`strUsage += HelpMessageOpt("-splash", strprintf(_("Show splash screen on startup (default: %u)"), DEFAULT_SPLASHSCREEN));`
`497`		`- if (showDebug) {`
`498`		`- strUsage += HelpMessageOpt("-uiplatform", "Select platform to customize UI for (one of windows, macosx, other; default: platform compiled on)");`
	`497`	`+ if (showDebug && !uiInterface.DefaultUIPlatform.empty()) {`
	`498`	`+ strUsage += HelpMessageOpt("-uiplatform", strprintf("Select platform to customize UI for (one of windows, macosx, other; default: %s)", uiInterface.DefaultUIPlatform));`
`499`	`499`	`}`
`500`	`500`	`}`
`501`	`501`