qml, refactoring: Separate guiconstants from QT

Separating guiconstants.h file from QT, copying it from src/qt to src/qml, removing all unused constants so far and updating QAPP_APP_NAME_* constants values so both QT and QML gui apps don't clash with each other trying to persist same or different settings (e.g. configuration file for QT on signet will be still named as Bitcoin-Qt-signet.conf, as of today, while QML will start using a separate file named Bitcoin-Qml-signet.conf). This could be a temporary fix so instances from both QT and QML gui apps don't interfere between them during QML development. This change will be transparent for both QT app and users. Co-authored-by: Johnny <[email protected]>
bitcoin-core · Apr 15, 2024 · 54a1f15 · 54a1f15
1 parent b6bf91f
commit 54a1f15
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -123,6 +123,7 @@ BITCOIN_QT_H = \
   qml/models/peerlistsortproxy.h \
   qml/appmode.h \
   qml/bitcoin.h \
+  qml/guiconstants.h \
   qml/imageprovider.h \
   qml/util.h \
   qt/addressbookpage.h \
@@ -140,7 +141,6 @@ BITCOIN_QT_H = \
   qt/createwalletdialog.h \
   qt/csvmodelwriter.h \
   qt/editaddressdialog.h \
-  qt/guiconstants.h \
   qt/guiutil.h \
   qt/initexecutor.h \
   qt/intro.h \

diff --git a/src/qml/bitcoin.cpp b/src/qml/bitcoin.cpp
@@ -27,7 +27,7 @@
 #include <qml/models/peerlistsortproxy.h>
 #include <qml/imageprovider.h>
 #include <qml/util.h>
-#include <qt/guiconstants.h>
+#include <qml/guiconstants.h>
 #include <qt/guiutil.h>
 #include <qt/initexecutor.h>
 #include <qt/networkstyle.h>
@@ -72,7 +72,6 @@ void SetupUIArgs(ArgsManager& argsman)
     argsman.AddArg("-lang=<lang>", "Set language, for example \"de_DE\" (default: system locale)", ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-min", "Start minimized", ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
     argsman.AddArg("-resetguisettings", "Reset all settings changed in the GUI", ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
-    argsman.AddArg("-splash", strprintf("Show splash screen on startup (default: %u)", DEFAULT_SPLASHSCREEN), ArgsManager::ALLOW_ANY, OptionsCategory::GUI);
 }
 
 bool InitErrorMessageBox(

diff --git a/src/qml/guiconstants.h b/src/qml/guiconstants.h
@@ -0,0 +1,15 @@
+// Copyright (c) 2011-2024 The Bitcoin Core developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_QML_GUICONSTANTS_H
+#define BITCOIN_QML_GUICONSTANTS_H
+
+#define QAPP_ORG_NAME "Bitcoin"
+#define QAPP_ORG_DOMAIN "bitcoin.org"
+#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qml"
+#define QAPP_APP_NAME_TESTNET "Bitcoin-Qml-testnet"
+#define QAPP_APP_NAME_SIGNET "Bitcoin-Qml-signet"
+#define QAPP_APP_NAME_REGTEST "Bitcoin-Qml-regtest"
+
+#endif // BITCOIN_QML_GUICONSTANTS_H