Skip to content

Commit

Permalink
qml, refactoring: Separate guiconstants from QT
Browse files Browse the repository at this point in the history
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 BitcoinCore-App-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 <johnny9dev@pm.me>
  • Loading branch information
pablomartin4btc and johnny9 committed Apr 23, 2024
1 parent b6bf91f commit 5be1e52
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions src/qml/bitcoin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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(
Expand Down
15 changes: 15 additions & 0 deletions src/qml/guiconstants.h
Original file line number Diff line number Diff line change
@@ -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 "BitcoinCore"
#define QAPP_ORG_DOMAIN "bitcoincore.org"
#define QAPP_APP_NAME_DEFAULT "BitcoinCore-App"
#define QAPP_APP_NAME_TESTNET "BitcoinCore-App-testnet"
#define QAPP_APP_NAME_SIGNET "BitcoinCore-App-signet"
#define QAPP_APP_NAME_REGTEST "BitcoinCore-App-regtest"

#endif // BITCOIN_QML_GUICONSTANTS_H

0 comments on commit 5be1e52

Please sign in to comment.