diff options
| author | barrystyle <[email protected]> | 2021-02-20 20:13:43 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-20 12:13:43 +0000 |
| commit | 8f77f8870dcff8d22c4339cd72269cf71a8b1265 (patch) | |
| tree | 418715cc6d3f5f019f8e596b6b784d5247b67eec /src/qt | |
| parent | Merge #20933: [0.21] doc: Archive release notes, Add template for minor release (diff) | |
| download | discoin-8f77f8870dcff8d22c4339cd72269cf71a8b1265.tar.xz discoin-8f77f8870dcff8d22c4339cd72269cf71a8b1265.zip | |
1.21 codebase rebrand (#1711)
* build: Brand codebase as Dogecoin via automake/autoconf files.
* build: Update internal resource files for windows builds.
* build: Update internal application names and data directories.
* build: Update immediately visible remaining bitcoin name references from cli binaries and qt.
* build: Update immediately visible bitcoin references in the main gui itself.
* Update functional tests to match Dogecoin
* wallet: Add missing check for -descriptors wallet tool option
* correct output for functional tests (errorlevels?)
Co-authored-by: Ross Nicoll <[email protected]>
Co-authored-by: MarcoFalke <[email protected]>
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/bitcoin.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoingui.cpp | 18 | ||||
| -rw-r--r-- | src/qt/bitcoinstrings.cpp | 2 | ||||
| -rw-r--r-- | src/qt/bitcoinunits.cpp | 23 | ||||
| -rw-r--r-- | src/qt/guiconstants.h | 12 | ||||
| -rw-r--r-- | src/qt/res/bitcoin-qt-res.rc | 8 | ||||
| -rw-r--r-- | src/qt/test/Makefile | 6 | ||||
| -rw-r--r-- | src/qt/utilitydialog.cpp | 2 |
8 files changed, 34 insertions, 39 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 63b4107f7..23c6f6e9d 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -194,7 +194,7 @@ void BitcoinCore::shutdown() } static int qt_argc = 1; -static const char* qt_argv = "bitcoin-qt"; +static const char* qt_argv = "dogecoin-qt"; BitcoinApplication::BitcoinApplication(): QApplication(qt_argc, const_cast<char **>(&qt_argv)), diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 23370e6ad..c432ecee6 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -249,7 +249,7 @@ void BitcoinGUI::createActions() tabGroup->addAction(overviewAction); sendCoinsAction = new QAction(platformStyle->SingleColorIcon(":/icons/send"), tr("&Send"), this); - sendCoinsAction->setStatusTip(tr("Send coins to a Bitcoin address")); + sendCoinsAction->setStatusTip(tr("Send coins to a Dogecoin address")); sendCoinsAction->setToolTip(sendCoinsAction->statusTip()); sendCoinsAction->setCheckable(true); sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2)); @@ -260,7 +260,7 @@ void BitcoinGUI::createActions() sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip()); receiveCoinsAction = new QAction(platformStyle->SingleColorIcon(":/icons/receiving_addresses"), tr("&Receive"), this); - receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and bitcoin: URIs)")); + receiveCoinsAction->setStatusTip(tr("Request payments (generates QR codes and dogecoin: URIs)")); receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip()); receiveCoinsAction->setCheckable(true); receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3)); @@ -320,13 +320,13 @@ void BitcoinGUI::createActions() changePassphraseAction = new QAction(tr("&Change Passphrase..."), this); changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption")); signMessageAction = new QAction(tr("Sign &message..."), this); - signMessageAction->setStatusTip(tr("Sign messages with your Bitcoin addresses to prove you own them")); + signMessageAction->setStatusTip(tr("Sign messages with your Dogecoin addresses to prove you own them")); verifyMessageAction = new QAction(tr("&Verify message..."), this); - verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Bitcoin addresses")); + verifyMessageAction->setStatusTip(tr("Verify messages to ensure they were signed with specified Dogecoin addresses")); m_load_psbt_action = new QAction(tr("&Load PSBT from file..."), this); - m_load_psbt_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction")); + m_load_psbt_action->setStatusTip(tr("Load Partially Signed Dogecoin Transaction")); m_load_psbt_clipboard_action = new QAction(tr("Load PSBT from clipboard..."), this); - m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Bitcoin Transaction from clipboard")); + m_load_psbt_clipboard_action->setStatusTip(tr("Load Partially Signed Dogecoin Transaction from clipboard")); openRPCConsoleAction = new QAction(tr("Node window"), this); openRPCConsoleAction->setStatusTip(tr("Open node debugging and diagnostic console")); @@ -340,7 +340,7 @@ void BitcoinGUI::createActions() usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels")); openAction = new QAction(tr("Open &URI..."), this); - openAction->setStatusTip(tr("Open a bitcoin: URI")); + openAction->setStatusTip(tr("Open a dogecoin: URI")); m_open_wallet_action = new QAction(tr("Open Wallet"), this); m_open_wallet_action->setEnabled(false); @@ -359,7 +359,7 @@ void BitcoinGUI::createActions() showHelpMessageAction = new QAction(tr("&Command-line options"), this); showHelpMessageAction->setMenuRole(QAction::NoRole); - showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(PACKAGE_NAME)); + showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Dogecoin command-line options").arg(PACKAGE_NAME)); m_mask_values_action = new QAction(tr("&Mask values"), this); m_mask_values_action->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M)); @@ -913,7 +913,7 @@ void BitcoinGUI::updateNetworkState() QString tooltip; if (m_node.getNetworkActive()) { - tooltip = tr("%n active connection(s) to Bitcoin network", "", count) + QString(".<br>") + tr("Click to disable network activity."); + tooltip = tr("%n active connection(s) to Dogecoin network", "", count) + QString(".<br>") + tr("Click to disable network activity."); } else { tooltip = tr("Network activity disabled.") + QString("<br>") + tr("Click to enable network activity again."); icon = ":/icons/network_disabled"; diff --git a/src/qt/bitcoinstrings.cpp b/src/qt/bitcoinstrings.cpp index 27e512d07..658e49aa7 100644 --- a/src/qt/bitcoinstrings.cpp +++ b/src/qt/bitcoinstrings.cpp @@ -11,7 +11,7 @@ static const char UNUSED *bitcoin_strings[] = { QT_TRANSLATE_NOOP("bitcoin-core", "The %s developers"), QT_TRANSLATE_NOOP("bitcoin-core", "" -"%s corrupt. Try using the wallet tool bitcoin-wallet to salvage or restoring " +"%s corrupt. Try using the wallet tool dogecoin-wallet to salvage or restoring " "a backup."), QT_TRANSLATE_NOOP("bitcoin-core", "" "-maxtxfee is set very high! Fees this large could be paid on a single " diff --git a/src/qt/bitcoinunits.cpp b/src/qt/bitcoinunits.cpp index fd55c547f..b9f496786 100644 --- a/src/qt/bitcoinunits.cpp +++ b/src/qt/bitcoinunits.cpp @@ -42,32 +42,27 @@ QString BitcoinUnits::longName(int unit) { switch(unit) { - case BTC: return QString("BTC"); - case mBTC: return QString("mBTC"); - case uBTC: return QString::fromUtf8("µBTC (bits)"); - case SAT: return QString("Satoshi (sat)"); + case BTC: return QString("DOGE"); + case mBTC: return QString("mDOGE"); + case uBTC: return QString::fromUtf8("µDOGE"); + case SAT: return QString("Koinu"); default: return QString("???"); } } QString BitcoinUnits::shortName(int unit) { - switch(unit) - { - case uBTC: return QString::fromUtf8("bits"); - case SAT: return QString("sat"); - default: return longName(unit); - } + return longName(unit); } QString BitcoinUnits::description(int unit) { switch(unit) { - case BTC: return QString("Bitcoins"); - case mBTC: return QString("Milli-Bitcoins (1 / 1" THIN_SP_UTF8 "000)"); - case uBTC: return QString("Micro-Bitcoins (bits) (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); - case SAT: return QString("Satoshi (sat) (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case BTC: return QString("Dogecoins"); + case mBTC: return QString("Milli-Dogecoins (1 / 1" THIN_SP_UTF8 "000)"); + case uBTC: return QString("Micro-Dogecoins (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); + case SAT: return QString("Koinu (1 / 100" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)"); default: return QString("???"); } } diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index 882d2c8f5..bd4ab6a74 100644 --- a/src/qt/guiconstants.h +++ b/src/qt/guiconstants.h @@ -42,12 +42,12 @@ static const int TOOLTIP_WRAP_THRESHOLD = 80; /* Number of frames in spinner animation */ #define SPINNER_FRAMES 36 -#define QAPP_ORG_NAME "Bitcoin" -#define QAPP_ORG_DOMAIN "bitcoin.org" -#define QAPP_APP_NAME_DEFAULT "Bitcoin-Qt" -#define QAPP_APP_NAME_TESTNET "Bitcoin-Qt-testnet" -#define QAPP_APP_NAME_SIGNET "Bitcoin-Qt-signet" -#define QAPP_APP_NAME_REGTEST "Bitcoin-Qt-regtest" +#define QAPP_ORG_NAME "Dogecoin" +#define QAPP_ORG_DOMAIN "dogecoin.com" +#define QAPP_APP_NAME_DEFAULT "Dogecoin-Qt" +#define QAPP_APP_NAME_TESTNET "Dogecoin-Qt-testnet" +#define QAPP_APP_NAME_SIGNET "Dogecoin-Qt-signet" +#define QAPP_APP_NAME_REGTEST "Dogecoin-Qt-regtest" /* One gigabyte (GB) in bytes */ static constexpr uint64_t GB_BYTES{1000000000}; diff --git a/src/qt/res/bitcoin-qt-res.rc b/src/qt/res/bitcoin-qt-res.rc index 94ae25647..d5d4c0e4f 100644 --- a/src/qt/res/bitcoin-qt-res.rc +++ b/src/qt/res/bitcoin-qt-res.rc @@ -19,13 +19,13 @@ BEGIN BEGIN BLOCK "040904E4" // U.S. English - multilingual (hex) BEGIN - VALUE "CompanyName", "Bitcoin" - VALUE "FileDescription", PACKAGE_NAME " (GUI node for Bitcoin)" + VALUE "CompanyName", "Dogecoin" + VALUE "FileDescription", PACKAGE_NAME " (GUI node for Dogecoin)" VALUE "FileVersion", VER_FILEVERSION_STR - VALUE "InternalName", "bitcoin-qt" + VALUE "InternalName", "dogecoin-qt" VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalTrademarks1", "Distributed under the MIT software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." - VALUE "OriginalFilename", "bitcoin-qt.exe" + VALUE "OriginalFilename", "dogecoin-qt.exe" VALUE "ProductName", PACKAGE_NAME VALUE "ProductVersion", VER_PRODUCTVERSION_STR END diff --git a/src/qt/test/Makefile b/src/qt/test/Makefile index a02f86b62..47235ca82 100644 --- a/src/qt/test/Makefile +++ b/src/qt/test/Makefile @@ -1,6 +1,6 @@ all: - $(MAKE) -C ../../ test_bitcoin_qt + $(MAKE) -C ../../ test_dogecoin_qt clean: - $(MAKE) -C ../../ test_bitcoin_qt_clean + $(MAKE) -C ../../ test_dogecoin_qt_clean check: - $(MAKE) -C ../../ test_bitcoin_qt_check + $(MAKE) -C ../../ test_dogecoin_qt_check diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index b7f85446f..388cf221e 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -58,7 +58,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) : ui->helpMessage->setVisible(false); } else { setWindowTitle(tr("Command-line options")); - QString header = "Usage: bitcoin-qt [command-line options] \n"; + QString header = "Usage: dogecoin-qt [command-line options] \n"; QTextCursor cursor(ui->helpMessage->document()); cursor.insertText(version); cursor.insertBlock(); |