Rebrand to Bitcoin Core
Only messages for now, executable names and other file names can be changed later if necessary and safe. Do not do an all-sweeping change. Some occurences of Bitcoin-Qt need to be kept: - Applicationname: this is used to determine the registry entry names, we don't want to lose settings over a silly name change. - Where it refers to the executable name instead of the product name.
This commit is contained in:
parent
fb34be6d59
commit
22f0135df0
@ -6,7 +6,7 @@ Copyright (c) 2009-2013 Bitcoin Developers
|
|||||||
|
|
||||||
Setup
|
Setup
|
||||||
---------------------
|
---------------------
|
||||||
[Bitcoin-Qt](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0).
|
[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](https://bitcointalk.org/index.php?topic=145386.0).
|
||||||
|
|
||||||
Running
|
Running
|
||||||
---------------------
|
---------------------
|
||||||
|
@ -20,7 +20,7 @@ Setup
|
|||||||
-----
|
-----
|
||||||
Unpack the files into a directory and run bitcoin-qt.exe.
|
Unpack the files into a directory and run bitcoin-qt.exe.
|
||||||
|
|
||||||
Bitcoin-Qt is the original Bitcoin client and it builds the backbone of the network.
|
Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
|
||||||
However, it downloads and stores the entire history of Bitcoin transactions;
|
However, it downloads and stores the entire history of Bitcoin transactions;
|
||||||
depending on the speed of your computer and network connection, the synchronization
|
depending on the speed of your computer and network connection, the synchronization
|
||||||
process can take anywhere from a few hours to a day or more.
|
process can take anywhere from a few hours to a day or more.
|
||||||
|
@ -78,7 +78,7 @@ bool AppInit(int argc, char* argv[])
|
|||||||
if (mapArgs.count("-?") || mapArgs.count("--help"))
|
if (mapArgs.count("-?") || mapArgs.count("--help"))
|
||||||
{
|
{
|
||||||
// First part of help message is specific to bitcoind / RPC client
|
// First part of help message is specific to bitcoind / RPC client
|
||||||
std::string strUsage = _("Bitcoin version") + " " + FormatFullVersion() + "\n\n" +
|
std::string strUsage = _("Bitcoin Core Daemon") + " " + _("version") + " " + FormatFullVersion() + "\n\n" +
|
||||||
_("Usage:") + "\n" +
|
_("Usage:") + "\n" +
|
||||||
" bitcoind [options] " + _("Start Bitcoin server") + "\n" +
|
" bitcoind [options] " + _("Start Bitcoin server") + "\n" +
|
||||||
_("Usage (deprecated, use bitcoin-cli):") + "\n" +
|
_("Usage (deprecated, use bitcoin-cli):") + "\n" +
|
||||||
|
@ -162,14 +162,14 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
|
|||||||
void DebugMessageHandler(QtMsgType type, const char *msg)
|
void DebugMessageHandler(QtMsgType type, const char *msg)
|
||||||
{
|
{
|
||||||
Q_UNUSED(type);
|
Q_UNUSED(type);
|
||||||
LogPrint("qt", "Bitcoin-Qt: %s\n", msg);
|
LogPrint("qt", "GUI: %s\n", msg);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg)
|
void DebugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString &msg)
|
||||||
{
|
{
|
||||||
Q_UNUSED(type);
|
Q_UNUSED(type);
|
||||||
Q_UNUSED(context);
|
Q_UNUSED(context);
|
||||||
LogPrint("qt", "Bitcoin-Qt: %s\n", qPrintable(msg));
|
LogPrint("qt", "GUI: %s\n", qPrintable(msg));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -364,7 +364,7 @@ int main(int argc, char *argv[])
|
|||||||
guiref = 0;
|
guiref = 0;
|
||||||
delete walletModel;
|
delete walletModel;
|
||||||
}
|
}
|
||||||
// Shutdown the core and its threads, but don't exit Bitcoin-Qt here
|
// Shutdown the core and its threads, but don't exit the GUI here
|
||||||
threadGroup.interrupt_all();
|
threadGroup.interrupt_all();
|
||||||
threadGroup.join_all();
|
threadGroup.join_all();
|
||||||
Shutdown();
|
Shutdown();
|
||||||
|
@ -71,7 +71,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
|
|||||||
|
|
||||||
if (!fIsTestnet)
|
if (!fIsTestnet)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet"));
|
setWindowTitle(tr("Bitcoin Core") + " - " + tr("Wallet"));
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
QApplication::setWindowIcon(QIcon(":icons/bitcoin"));
|
QApplication::setWindowIcon(QIcon(":icons/bitcoin"));
|
||||||
setWindowIcon(QIcon(":icons/bitcoin"));
|
setWindowIcon(QIcon(":icons/bitcoin"));
|
||||||
@ -81,7 +81,7 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("Bitcoin") + " - " + tr("Wallet") + " " + tr("[testnet]"));
|
setWindowTitle(tr("Bitcoin Core") + " - " + tr("Wallet") + " " + tr("[testnet]"));
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet"));
|
QApplication::setWindowIcon(QIcon(":icons/bitcoin_testnet"));
|
||||||
setWindowIcon(QIcon(":icons/bitcoin_testnet"));
|
setWindowIcon(QIcon(":icons/bitcoin_testnet"));
|
||||||
@ -229,9 +229,9 @@ void BitcoinGUI::createActions(bool fIsTestnet)
|
|||||||
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
|
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
|
||||||
quitAction->setMenuRole(QAction::QuitRole);
|
quitAction->setMenuRole(QAction::QuitRole);
|
||||||
if (!fIsTestnet)
|
if (!fIsTestnet)
|
||||||
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin"), this);
|
aboutAction = new QAction(QIcon(":/icons/bitcoin"), tr("&About Bitcoin Core"), this);
|
||||||
else
|
else
|
||||||
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin"), this);
|
aboutAction = new QAction(QIcon(":/icons/bitcoin_testnet"), tr("&About Bitcoin Core"), this);
|
||||||
aboutAction->setStatusTip(tr("Show information about Bitcoin"));
|
aboutAction->setStatusTip(tr("Show information about Bitcoin"));
|
||||||
aboutAction->setMenuRole(QAction::AboutRole);
|
aboutAction->setMenuRole(QAction::AboutRole);
|
||||||
#if QT_VERSION < 0x050000
|
#if QT_VERSION < 0x050000
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
<string>About Bitcoin</string>
|
<string>About Bitcoin Core</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||||
<item>
|
<item>
|
||||||
@ -50,7 +50,7 @@
|
|||||||
<cursorShape>IBeamCursor</cursorShape>
|
<cursorShape>IBeamCursor</cursorShape>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><b>Bitcoin</b> version</string>
|
<string><b>Bitcoin Core</b> version</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="textInteractionFlags">
|
<property name="textInteractionFlags">
|
||||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||||
@ -91,7 +91,7 @@
|
|||||||
<cursorShape>IBeamCursor</cursorShape>
|
<cursorShape>IBeamCursor</cursorShape>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string notr="true">Copyright &copy; 2009-YYYY The Bitcoin developers</string>
|
<string notr="true">Copyright &copy; 2009-YYYY The Bitcoin Core developers</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="textFormat">
|
<property name="textFormat">
|
||||||
<enum>Qt::RichText</enum>
|
<enum>Qt::RichText</enum>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
<string notr="true">QLabel { font-style:italic; }</string>
|
<string notr="true">QLabel { font-style:italic; }</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Welcome to Bitcoin-Qt.</string>
|
<string>Welcome to Bitcoin Core.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@ -46,7 +46,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="label_4">
|
<widget class="QLabel" name="label_4">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</string>
|
<string>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
@ -56,7 +56,7 @@
|
|||||||
<item>
|
<item>
|
||||||
<widget class="QLabel" name="sizeWarningLabel">
|
<widget class="QLabel" name="sizeWarningLabel">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
|
<string>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="wordWrap">
|
<property name="wordWrap">
|
||||||
<bool>true</bool>
|
<bool>true</bool>
|
||||||
|
@ -348,7 +348,7 @@
|
|||||||
<item row="17" column="0">
|
<item row="17" column="0">
|
||||||
<widget class="QPushButton" name="showCLOptionsButton">
|
<widget class="QPushButton" name="showCLOptionsButton">
|
||||||
<property name="toolTip">
|
<property name="toolTip">
|
||||||
<string>Show the Bitcoin-Qt help message to get a list with possible Bitcoin command-line options.</string>
|
<string>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>&Show</string>
|
<string>&Show</string>
|
||||||
|
@ -594,7 +594,7 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
|
|||||||
HelpMessageBox::HelpMessageBox(QWidget *parent) :
|
HelpMessageBox::HelpMessageBox(QWidget *parent) :
|
||||||
QMessageBox(parent)
|
QMessageBox(parent)
|
||||||
{
|
{
|
||||||
header = tr("Bitcoin-Qt") + " " + tr("version") + " " +
|
header = tr("Bitcoin Core") + tr("version") + " " +
|
||||||
QString::fromStdString(FormatFullVersion()) + "\n\n" +
|
QString::fromStdString(FormatFullVersion()) + "\n\n" +
|
||||||
tr("Usage:") + "\n" +
|
tr("Usage:") + "\n" +
|
||||||
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
|
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
|
||||||
@ -607,7 +607,7 @@ HelpMessageBox::HelpMessageBox(QWidget *parent) :
|
|||||||
" -splash " + tr("Show splash screen on startup (default: 1)") + "\n" +
|
" -splash " + tr("Show splash screen on startup (default: 1)") + "\n" +
|
||||||
" -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n";
|
" -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n";
|
||||||
|
|
||||||
setWindowTitle(tr("Bitcoin-Qt"));
|
setWindowTitle(tr("Bitcoin Core"));
|
||||||
setTextFormat(Qt::PlainText);
|
setTextFormat(Qt::PlainText);
|
||||||
// setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider.
|
// setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider.
|
||||||
setText(header + QString(QChar(0x2003)).repeated(50));
|
setText(header + QString(QChar(0x2003)).repeated(50));
|
||||||
|
@ -21,13 +21,13 @@ BEGIN
|
|||||||
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
BLOCK "040904E4" // U.S. English - multilingual (hex)
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "Bitcoin"
|
VALUE "CompanyName", "Bitcoin"
|
||||||
VALUE "FileDescription", "Bitcoin-Qt (OSS GUI client for Bitcoin)"
|
VALUE "FileDescription", "Bitcoin Core (OSS GUI client for Bitcoin)"
|
||||||
VALUE "FileVersion", VER_FILEVERSION_STR
|
VALUE "FileVersion", VER_FILEVERSION_STR
|
||||||
VALUE "InternalName", "bitcoin-qt"
|
VALUE "InternalName", "bitcoin-qt"
|
||||||
VALUE "LegalCopyright", COPYRIGHT_STR
|
VALUE "LegalCopyright", COPYRIGHT_STR
|
||||||
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
|
||||||
VALUE "OriginalFilename", "bitcoin-qt.exe"
|
VALUE "OriginalFilename", "bitcoin-qt.exe"
|
||||||
VALUE "ProductName", "Bitcoin-Qt"
|
VALUE "ProductName", "Bitcoin Core"
|
||||||
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
|
@ -23,9 +23,9 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
|
|||||||
float fontFactor = 1.0;
|
float fontFactor = 1.0;
|
||||||
|
|
||||||
// define text to place
|
// define text to place
|
||||||
QString titleText = QString(QApplication::applicationName()).replace(QString("-testnet"), QString(""), Qt::CaseSensitive); // cut of testnet, place it as single object further down
|
QString titleText = tr("Bitcoin Core");
|
||||||
QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
|
QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
|
||||||
QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin developers"));
|
QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
|
||||||
QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object
|
QString testnetAddText = QString(tr("[testnet]")); // define text to place as single text object
|
||||||
|
|
||||||
QString font = "Arial";
|
QString font = "Arial";
|
||||||
|
Loading…
Reference in New Issue
Block a user