github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-19 05:58:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Initial GUI changes

Browse Source
This commit is contained in:
nzsquirrell
2016-02-26 20:36:31 +13:00
parent 20f4666699
commit a7924882e5
29 changed files with 125 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.qt.include
+4 -4
View File
@@ -1,4 +1,4 @@
bin_PROGRAMS += qt/bitcoin-qt
bin_PROGRAMS += qt/myriad-qt
EXTRA_LIBRARIES += qt/libbitcoinqt.a
# bitcoin qt core #
@@ -387,7 +387,7 @@ $(QT_QRC_LOCALE_CPP): $(QT_QRC_LOCALE) $(QT_QM)
$(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES) $(PROTOBUF_H)
@test -f $(RCC)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name bitcoin $< | \
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name myriad $< | \
$(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@
CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno
@@ -395,9 +395,9 @@ CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda
CLEANFILES += $(CLEAN_QT)
bitcoin_qt_clean: FORCE
rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/bitcoin-qt$(EXEEXT) $(LIBBITCOINQT)
rm -f $(CLEAN_QT) $(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) qt/myriad-qt$(EXEEXT) $(LIBBITCOINQT)
bitcoin_qt : qt/bitcoin-qt$(EXEEXT)
bitcoin_qt : qt/myriad-qt$(EXEEXT)
ui_%.h: %.ui
@test -f $(UIC)
src/qt/addressbookpage.cpp
+2 -2
View File
@@ -67,11 +67,11 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
switch(tab)
{
case SendingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
ui->labelExplanation->setText(tr("These are your Myriad addresses for sending payments. Always check the amount and the receiving address before sending coins."));
ui->deleteAddress->setVisible(true);
break;
case ReceivingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
ui->labelExplanation->setText(tr("These are your Myriad addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
ui->deleteAddress->setVisible(false);
break;
}
src/qt/askpassphrasedialog.cpp
+2 -2
View File
@@ -108,7 +108,7 @@ void AskPassphraseDialog::accept()
break;
}
QMessageBox::StandardButton retval = QMessageBox::question(this, tr("Confirm wallet encryption"),
tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR BITCOINS</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),
tr("Warning: If you encrypt your wallet and lose your passphrase, you will <b>LOSE ALL OF YOUR MYRIAD</b>!") + "<br><br>" + tr("Are you sure you wish to encrypt your wallet?"),
QMessageBox::Yes|QMessageBox::Cancel,
QMessageBox::Cancel);
if(retval == QMessageBox::Yes)
@@ -119,7 +119,7 @@ void AskPassphraseDialog::accept()
{
QMessageBox::warning(this, tr("Wallet encrypted"),
"<qt>" +
tr("Bitcoin Core will close now to finish the encryption process. "
tr("Myriad Core will close now to finish the encryption process. "
"Remember that encrypting your wallet cannot fully protect "
"your bitcoins from being stolen by malware infecting your computer.") +
"<br><br><b>" +
src/qt/bitcoin.cpp
+5 -5
View File
@@ -474,7 +474,7 @@ void BitcoinApplication::shutdownResult(int retval)
void BitcoinApplication::handleRunawayException(const QString &message)
{
QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Bitcoin can no longer continue safely and will quit.") + QString("\n\n") + message);
QMessageBox::critical(0, "Runaway exception", BitcoinGUI::tr("A fatal error occurred. Myriad can no longer continue safely and will quit.") + QString("\n\n") + message);
::exit(1);
}
@@ -553,14 +553,14 @@ int main(int argc, char *argv[])
/// - Do not call GetDataDir(true) before this step finishes
if (!boost::filesystem::is_directory(GetDataDir(false)))
{
QMessageBox::critical(0, QObject::tr("Bitcoin Core"),
QMessageBox::critical(0, QObject::tr("Myriad Core"),
QObject::tr("Error: Specified data directory \"%1\" does not exist.").arg(QString::fromStdString(mapArgs["-datadir"])));
return 1;
}
try {
ReadConfigFile(mapArgs, mapMultiArgs);
} catch (const std::exception& e) {
QMessageBox::critical(0, QObject::tr("Bitcoin Core"),
QMessageBox::critical(0, QObject::tr("Myriad Core"),
QObject::tr("Error: Cannot parse configuration file: %1. Only use key=value syntax.").arg(e.what()));
return false;
}
@@ -573,7 +573,7 @@ int main(int argc, char *argv[])
// Check for -testnet or -regtest parameter (Params() calls are only valid after this clause)
if (!SelectParamsFromCommandLine()) {
QMessageBox::critical(0, QObject::tr("Bitcoin Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet."));
QMessageBox::critical(0, QObject::tr("Myriad Core"), QObject::tr("Error: Invalid combination of -regtest and -testnet."));
return 1;
}
#ifdef ENABLE_WALLET
@@ -631,7 +631,7 @@ int main(int argc, char *argv[])
app.createWindow(networkStyle.data());
app.requestInitialize();
#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Bitcoin Core didn't yet exit safely..."), (HWND)app.getMainWinId());
WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Myriad Core didn't yet exit safely..."), (HWND)app.getMainWinId());
#endif
app.exec();
app.requestShutdown();
src/qt/bitcoingui.cpp
+12 -12
View File
@@ -102,7 +102,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
{
GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
QString windowTitle = tr("Bitcoin Core") + " - ";
QString windowTitle = tr("Myriad Core") + " - ";
#ifdef ENABLE_WALLET
/* if compiled with wallet support, -disablewallet can still disable the wallet */
enableWallet = !GetBoolArg("-disablewallet", false);
@@ -255,7 +255,7 @@ void BitcoinGUI::createActions()
tabGroup->addAction(overviewAction);
sendCoinsAction = new QAction(SingleColorIcon(":/icons/send"), tr("&Send"), this);
sendCoinsAction->setStatusTip(tr("Send coins to a Bitcoin address"));
sendCoinsAction->setStatusTip(tr("Send coins to a Myriad address"));
sendCoinsAction->setToolTip(sendCoinsAction->statusTip());
sendCoinsAction->setCheckable(true);
sendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));
@@ -266,7 +266,7 @@ void BitcoinGUI::createActions()
sendCoinsMenuAction->setToolTip(sendCoinsMenuAction->statusTip());
receiveCoinsAction = new QAction(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 myriad: URIs)"));
receiveCoinsAction->setToolTip(receiveCoinsAction->statusTip());
receiveCoinsAction->setCheckable(true);
receiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));
@@ -304,14 +304,14 @@ void BitcoinGUI::createActions()
quitAction->setStatusTip(tr("Quit application"));
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
quitAction->setMenuRole(QAction::QuitRole);
aboutAction = new QAction(TextColorIcon(":/icons/about"), tr("&About Bitcoin Core"), this);
aboutAction->setStatusTip(tr("Show information about Bitcoin Core"));
aboutAction = new QAction(TextColorIcon(":/icons/about"), tr("&About Myriad Core"), this);
aboutAction->setStatusTip(tr("Show information about Myriad Core"));
aboutAction->setMenuRole(QAction::AboutRole);
aboutQtAction = new QAction(TextColorIcon(":/icons/about_qt"), tr("About &Qt"), this);
aboutQtAction->setStatusTip(tr("Show information about Qt"));
aboutQtAction->setMenuRole(QAction::AboutQtRole);
optionsAction = new QAction(TextColorIcon(":/icons/options"), tr("&Options..."), this);
optionsAction->setStatusTip(tr("Modify configuration options for Bitcoin Core"));
optionsAction->setStatusTip(tr("Modify configuration options for Myriad Core"));
optionsAction->setMenuRole(QAction::PreferencesRole);
toggleHideAction = new QAction(TextColorIcon(":/icons/about"), tr("&Show / Hide"), this);
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
@@ -324,9 +324,9 @@ void BitcoinGUI::createActions()
changePassphraseAction = new QAction(TextColorIcon(":/icons/key"), tr("&Change Passphrase..."), this);
changePassphraseAction->setStatusTip(tr("Change the passphrase used for wallet encryption"));
signMessageAction = new QAction(TextColorIcon(":/icons/edit"), 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 Myriad addresses to prove you own them"));
verifyMessageAction = new QAction(TextColorIcon(":/icons/verify"), 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 Myriad addresses"));
openRPCConsoleAction = new QAction(TextColorIcon(":/icons/debugwindow"), tr("&Debug window"), this);
openRPCConsoleAction->setStatusTip(tr("Open debugging and diagnostic console"));
@@ -337,11 +337,11 @@ void BitcoinGUI::createActions()
usedReceivingAddressesAction->setStatusTip(tr("Show the list of used receiving addresses and labels"));
openAction = new QAction(TextColorIcon(":/icons/open"), tr("Open &URI..."), this);
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
openAction->setStatusTip(tr("Open a myriad: URI or payment request"));
showHelpMessageAction = new QAction(TextColorIcon(":/icons/info"), tr("&Command-line options"), this);
showHelpMessageAction->setMenuRole(QAction::NoRole);
showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options"));
showHelpMessageAction->setStatusTip(tr("Show the Myriad Core help message to get a list with possible Myriad command-line options"));
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
@@ -512,7 +512,7 @@ void BitcoinGUI::createTrayIcon(const NetworkStyle *networkStyle)
{
#ifndef Q_OS_MAC
trayIcon = new QSystemTrayIcon(this);
QString toolTip = tr("Bitcoin Core client") + " " + networkStyle->getTitleAddText();
QString toolTip = tr("Myriad Core client") + " " + networkStyle->getTitleAddText();
trayIcon->setToolTip(toolTip);
trayIcon->setIcon(networkStyle->getTrayAndWindowIcon());
trayIcon->show();
@@ -651,7 +651,7 @@ void BitcoinGUI::setNumConnections(int count)
default: icon = ":/icons/connect_4"; break;
}
labelConnectionsIcon->setPixmap(SingleColorIcon(icon).pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Bitcoin network", "", count));
labelConnectionsIcon->setToolTip(tr("%n active connection(s) to Myriad network", "", count));
}
void BitcoinGUI::setNumBlocks(int count, const QDateTime& blockDate)
src/qt/bitcoinunits.cpp
+20 -7
View File
@@ -18,8 +18,10 @@ QList<BitcoinUnits::Unit> BitcoinUnits::availableUnits()
{
QList<BitcoinUnits::Unit> unitlist;
unitlist.append(BTC);
unitlist.append(mBTC);
unitlist.append(uBTC);
unitlist.append(kBTC);
unitlist.append(MBTC);
//unitlist.append(mBTC);
//unitlist.append(uBTC);
return unitlist;
}
@@ -27,10 +29,13 @@ bool BitcoinUnits::valid(int unit)
{
switch(unit)
{
case MBTC:
case kBTC:
case BTC:
return true;
case mBTC:
case uBTC:
return true;
default:
return false;
}
@@ -40,9 +45,11 @@ QString BitcoinUnits::name(int unit)
{
switch(unit)
{
case BTC: return QString("BTC");
case mBTC: return QString("mBTC");
case uBTC: return QString::fromUtf8("μBTC");
case MBTC: return QString("MMYR");
case kBTC: return QString("kMYR");
case BTC: return QString("MYR");
case mBTC: return QString("mMYR");
case uBTC: return QString::fromUtf8("μMYR");
default: return QString("???");
}
}
@@ -51,7 +58,9 @@ QString BitcoinUnits::description(int unit)
{
switch(unit)
{
case BTC: return QString("Bitcoins");
case MBTC: return QString("Mega-Myriad (1,000,000)");
case kBTC: return QString("Kilo-Myriad" (1,000));
case BTC: return QString("Myriad");
case mBTC: return QString("Milli-Bitcoins (1 / 1" THIN_SP_UTF8 "000)");
case uBTC: return QString("Micro-Bitcoins (1 / 1" THIN_SP_UTF8 "000" THIN_SP_UTF8 "000)");
default: return QString("???");
@@ -62,6 +71,8 @@ qint64 BitcoinUnits::factor(int unit)
{
switch(unit)
{
case MBTC: return 100000000000000;
case kBTC: return 100000000000;
case BTC: return 100000000;
case mBTC: return 100000;
case uBTC: return 100;
@@ -73,6 +84,8 @@ int BitcoinUnits::decimals(int unit)
{
switch(unit)
{
case MBTC: return 14;
case kBTC: return 11;
case BTC: return 8;
case mBTC: return 5;
case uBTC: return 2;
src/qt/bitcoinunits.h
+2
View File
@@ -56,6 +56,8 @@ public:
*/
enum Unit
{
MBTC,
kBTC,
BTC,
mBTC,
uBTC
src/qt/editaddressdialog.cpp
+1 -1
View File
@@ -107,7 +107,7 @@ void EditAddressDialog::accept()
break;
case AddressTableModel::INVALID_ADDRESS:
QMessageBox::warning(this, windowTitle(),
tr("The entered address \"%1\" is not a valid Bitcoin address.").arg(ui->addressEdit->text()),
tr("The entered address \"%1\" is not a valid Myriad address.").arg(ui->addressEdit->text()),
QMessageBox::Ok, QMessageBox::Ok);
break;
case AddressTableModel::DUPLICATE_ADDRESS:
src/qt/forms/helpmessagedialog.ui
+1 -1
View File
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string notr="true">Bitcoin Core - Command-line options</string>
<string notr="true">Myriad Core - Command-line options</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
src/qt/forms/intro.ui
+3 -3
View File
@@ -20,7 +20,7 @@
<string notr="true">QLabel { font-style:italic; }</string>
</property>
<property name="text">
<string>Welcome to Bitcoin Core.</string>
<string>Welcome to Myriad Core.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -46,7 +46,7 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</string>
<string>As this is the first time the program is launched, you can choose where Myriad Core will store its data.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -56,7 +56,7 @@
<item>
<widget class="QLabel" name="sizeWarningLabel">
<property name="text">
<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>
<string>Myriad Core will download and store a copy of the Myriad 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 name="wordWrap">
<bool>true</bool>
src/qt/forms/optionsdialog.ui
+4 -4
View File
@@ -30,10 +30,10 @@
<item>
<widget class="QCheckBox" name="bitcoinAtStartup">
<property name="toolTip">
<string>Automatically start Bitcoin Core after logging in to the system.</string>
<string>Automatically start Myriad Core after logging in to the system.</string>
</property>
<property name="text">
<string>&amp;Start Bitcoin Core on system login</string>
<string>&amp;Start Myriad Core on system login</string>
</property>
</widget>
</item>
@@ -189,7 +189,7 @@
<item>
<widget class="QCheckBox" name="mapPortUpnp">
<property name="toolTip">
<string>Automatically open the Bitcoin client port on the router. This only works when your router supports UPnP and it is enabled.</string>
<string>Automatically open the Myriad client port on the router. This only works when your router supports UPnP and it is enabled.</string>
</property>
<property name="text">
<string>Map port using &amp;UPnP</string>
@@ -209,7 +209,7 @@
<item>
<widget class="QCheckBox" name="connectSocks">
<property name="toolTip">
<string>Connect to the Bitcoin network through a SOCKS5 proxy.</string>
<string>Connect to the Myriad network through a SOCKS5 proxy.</string>
</property>
<property name="text">
<string>&amp;Connect through SOCKS5 proxy (default proxy):</string>
src/qt/forms/overviewpage.ui
+10 -10
View File
@@ -70,7 +70,7 @@
</size>
</property>
<property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Myriad network after a connection is established, but this process has not completed yet.</string>
</property>
<property name="text">
<string/>
@@ -126,7 +126,7 @@
<string>Unconfirmed transactions to watch-only addresses</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -151,7 +151,7 @@
<string>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -176,7 +176,7 @@
<string>Mined balance in watch-only addresses that has not yet matured</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -234,7 +234,7 @@
<string>Mined balance that has not yet matured</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -279,7 +279,7 @@
<string>Your current total balance</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -304,7 +304,7 @@
<string>Current total balance in watch-only addresses</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -346,7 +346,7 @@
<string>Your current spendable balance</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -371,7 +371,7 @@
<string>Your current balance in watch-only addresses</string>
</property>
<property name="text">
<string notr="true">0.000 000 00 BTC</string>
<string notr="true">0.000 000 00 MYR</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -456,7 +456,7 @@
</size>
</property>
<property name="toolTip">
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Bitcoin network after a connection is established, but this process has not completed yet.</string>
<string>The displayed information may be out of date. Your wallet automatically synchronizes with the Myriad network after a connection is established, but this process has not completed yet.</string>
</property>
<property name="text">
<string/>
src/qt/forms/receivecoinsdialog.ui
+2 -2
View File
@@ -48,7 +48,7 @@
<item row="6" column="0">
<widget class="QLabel" name="label_3">
<property name="toolTip">
<string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
<string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Myriad network.</string>
</property>
<property name="text">
<string>&amp;Message:</string>
@@ -71,7 +71,7 @@
<item row="6" column="2">
<widget class="QLineEdit" name="reqMessage">
<property name="toolTip">
<string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
<string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Myriad network.</string>
</property>
</widget>
</item>
src/qt/forms/rpcconsole.ui
+1 -1
View File
@@ -331,7 +331,7 @@
<item row="15" column="0">
<widget class="QPushButton" name="openDebugLogfileButton">
<property name="toolTip">
<string>Open the Bitcoin Core debug log file from the current data directory. This can take a few seconds for large log files.</string>
<string>Open the Myriad Core debug log file from the current data directory. This can take a few seconds for large log files.</string>
</property>
<property name="text">
<string>&amp;Open</string>
src/qt/forms/sendcoinsdialog.ui
+7 -7
View File
@@ -324,7 +324,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 MYR</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -404,7 +404,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 MYR</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -484,7 +484,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 MYR</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -513,7 +513,7 @@
<enum>Qt::ActionsContextMenu</enum>
</property>
<property name="text">
<string notr="true">0.00 BTC</string>
<string notr="true">0.00 MYR</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
@@ -904,7 +904,7 @@
<item>
<widget class="QCheckBox" name="checkBoxMinimumFee">
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Myriad transactions than the network can process.</string>
</property>
<property name="text">
<string/>
@@ -917,7 +917,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for bitcoin transactions than the network can process.</string>
<string>Paying only the minimum fee is just fine as long as there is less transaction volume than space in the blocks. But be aware that this can end up in a never confirming transaction once there is more demand for Myriad transactions than the network can process.</string>
</property>
<property name="text">
<string>(read the tooltip)</string>
@@ -1352,7 +1352,7 @@
<cursorShape>IBeamCursor</cursorShape>
</property>
<property name="text">
<string notr="true">123.456 BTC</string>
<string notr="true">123.456 MYR</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
src/qt/forms/sendcoinsentry.ui
+2 -2
View File
@@ -57,7 +57,7 @@
<item>
<widget class="QValidatedLineEdit" name="payTo">
<property name="toolTip">
<string>The Bitcoin address to send the payment to</string>
<string>The Myriad address to send the payment to</string>
</property>
</widget>
</item>
@@ -192,7 +192,7 @@
<item row="3" column="1">
<widget class="QLabel" name="messageTextLabel">
<property name="toolTip">
<string>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string>
<string>A message that was attached to the Myriad: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Myriad network.</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
src/qt/forms/signverifymessagedialog.ui
+4 -4
View File
@@ -48,7 +48,7 @@
<item>
<widget class="QValidatedLineEdit" name="addressIn_SM">
<property name="toolTip">
<string>The Bitcoin address to sign the message with</string>
<string>The Myriad address to sign the message with</string>
</property>
</widget>
</item>
@@ -152,7 +152,7 @@
<item>
<widget class="QPushButton" name="signMessageButton_SM">
<property name="toolTip">
<string>Sign the message to prove you own this Bitcoin address</string>
<string>Sign the message to prove you own this Myriad address</string>
</property>
<property name="text">
<string>Sign &amp;Message</string>
@@ -258,7 +258,7 @@
<item>
<widget class="QValidatedLineEdit" name="addressIn_VM">
<property name="toolTip">
<string>The Bitcoin address the message was signed with</string>
<string>The Myriad address the message was signed with</string>
</property>
</widget>
</item>
@@ -295,7 +295,7 @@
<item>
<widget class="QPushButton" name="verifyMessageButton_VM">
<property name="toolTip">
<string>Verify the message to ensure it was signed with the specified Bitcoin address</string>
<string>Verify the message to ensure it was signed with the specified Myriad address</string>
</property>
<property name="text">
<string>Verify &amp;Message</string>
src/qt/guiconstants.h
+4 -4
View File
@@ -44,9 +44,9 @@ static const int MAX_URI_LENGTH = 255;
/* Number of frames in spinner animation */
#define SPINNER_FRAMES 35
#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_ORG_NAME "Myriad"
#define QAPP_ORG_DOMAIN "myriadcoin.org"
#define QAPP_APP_NAME_DEFAULT "Myriad-Qt"
#define QAPP_APP_NAME_TESTNET "Myriad-Qt-testnet"
#endif // BITCOIN_QT_GUICONSTANTS_H
src/qt/guiutil.cpp
+11 -11
View File
@@ -107,7 +107,7 @@ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
#if QT_VERSION >= 0x040700
// We don't want translators to use own addresses in translations
// and this is the only place, where this address is supplied.
widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. %1)").arg("1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L"));
widget->setPlaceholderText(QObject::tr("Enter a Myriad address (e.g. %1)").arg("ML9cbXEQ47DPZcVR2F4RzXd3DKo886kQ7J"));
#endif
widget->setValidator(new BitcoinAddressEntryValidator(parent));
widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));
@@ -189,9 +189,9 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
//
// Cannot handle this later, because bitcoin:// will cause Qt to see the part after // as host,
// which will lower-case it (and thus invalidate the address).
if(uri.startsWith("bitcoin://", Qt::CaseInsensitive))
if(uri.startsWith("myriad://", Qt::CaseInsensitive))
{
uri.replace(0, 10, "bitcoin:");
uri.replace(0, 10, "myriad:");
}
QUrl uriInstance(uri);
return parseBitcoinURI(uriInstance, out);
@@ -199,7 +199,7 @@ bool parseBitcoinURI(QString uri, SendCoinsRecipient *out)
QString formatBitcoinURI(const SendCoinsRecipient &info)
{
QString ret = QString("bitcoin:%1").arg(info.address);
QString ret = QString("myriad:%1").arg(info.address);
int paramCount = 0;
if (info.amount)
@@ -569,11 +569,11 @@ TableViewLastColumnResizingFixer::TableViewLastColumnResizingFixer(QTableView* t
boost::filesystem::path static StartupShortcutPath()
{
if (GetBoolArg("-testnet", false))
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (testnet).lnk";
return GetSpecialFolderPath(CSIDL_STARTUP) / "Myriad (testnet).lnk";
else if (GetBoolArg("-regtest", false))
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin (regtest).lnk";
return GetSpecialFolderPath(CSIDL_STARTUP) / "Myriad (regtest).lnk";
return GetSpecialFolderPath(CSIDL_STARTUP) / "Bitcoin.lnk";
return GetSpecialFolderPath(CSIDL_STARTUP) / "Myriad.lnk";
}
bool GetStartOnSystemStartup()
@@ -668,7 +668,7 @@ boost::filesystem::path static GetAutostartDir()
boost::filesystem::path static GetAutostartFilePath()
{
return GetAutostartDir() / "bitcoin.desktop";
return GetAutostartDir() / "myriad.desktop";
}
bool GetStartOnSystemStartup()
@@ -710,11 +710,11 @@ bool SetStartOnSystemStartup(bool fAutoStart)
optionFile << "[Desktop Entry]\n";
optionFile << "Type=Application\n";
if (GetBoolArg("-testnet", false))
optionFile << "Name=Bitcoin (testnet)\n";
optionFile << "Name=Myriad (testnet)\n";
else if (GetBoolArg("-regtest", false))
optionFile << "Name=Bitcoin (regtest)\n";
optionFile << "Name=Myriad (regtest)\n";
else
optionFile << "Name=Bitcoin\n";
optionFile << "Name=Myriad\n";
optionFile << "Exec=" << pszExePath << strprintf(" -min -testnet=%d -regtest=%d\n", GetBoolArg("-testnet", false), GetBoolArg("-regtest", false));
optionFile << "Terminal=false\n";
optionFile << "Hidden=false\n";
src/qt/intro.cpp
+2 -2
View File
@@ -18,7 +18,7 @@
/* Minimum free space (in bytes) needed for data directory */
static const uint64_t GB_BYTES = 1000000000LL;
static const uint64_t BLOCK_CHAIN_SIZE = 20LL * GB_BYTES;
static const uint64_t BLOCK_CHAIN_SIZE = 3LL * GB_BYTES;
/* Check free space asynchronously to prevent hanging the UI thread.
@@ -182,7 +182,7 @@ void Intro::pickDataDirectory()
TryCreateDirectory(GUIUtil::qstringToBoostPath(dataDir));
break;
} catch (const fs::filesystem_error&) {
QMessageBox::critical(0, tr("Bitcoin Core"),
QMessageBox::critical(0, tr("Myriad Core"),
tr("Error: Specified data directory \"%1\" cannot be created.").arg(dataDir));
/* fall through, back to choosing screen */
}
src/qt/openuridialog.cpp
+2 -2
View File
@@ -16,7 +16,7 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) :
{
ui->setupUi(this);
#if QT_VERSION >= 0x040700
ui->uriEdit->setPlaceholderText("bitcoin:");
ui->uriEdit->setPlaceholderText("myriad:");
#endif
}
@@ -48,5 +48,5 @@ void OpenURIDialog::on_selectFileButton_clicked()
if(filename.isEmpty())
return;
QUrl fileUri = QUrl::fromLocalFile(filename);
ui->uriEdit->setText("bitcoin:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
ui->uriEdit->setText("myriad:?r=" + QUrl::toPercentEncoding(fileUri.toString()));
}
src/qt/optionsmodel.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void OptionsModel::Init()
nDisplayUnit = settings.value("nDisplayUnit").toInt();
if (!settings.contains("strThirdPartyTxUrls"))
settings.setValue("strThirdPartyTxUrls", "");
settings.setValue("strThirdPartyTxUrls", "https://cryptap.us/myr/explorer/tx/%s");
strThirdPartyTxUrls = settings.value("strThirdPartyTxUrls", "").toString();
if (!settings.contains("fCoinControlFeatures"))
src/qt/paymentserver.cpp
+6 -6
View File
@@ -49,14 +49,14 @@
using namespace std;
const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds
const QString BITCOIN_IPC_PREFIX("bitcoin:");
const QString BITCOIN_IPC_PREFIX("myriad:");
// BIP70 payment protocol messages
const char* BIP70_MESSAGE_PAYMENTACK = "PaymentACK";
const char* BIP70_MESSAGE_PAYMENTREQUEST = "PaymentRequest";
// BIP71 payment protocol media types
const char* BIP71_MIMETYPE_PAYMENT = "application/bitcoin-payment";
const char* BIP71_MIMETYPE_PAYMENTACK = "application/bitcoin-paymentack";
const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/bitcoin-paymentrequest";
const char* BIP71_MIMETYPE_PAYMENT = "application/myriad-payment";
const char* BIP71_MIMETYPE_PAYMENTACK = "application/myriad-paymentack";
const char* BIP71_MIMETYPE_PAYMENTREQUEST = "application/myriad-paymentrequest";
// BIP70 max payment request size in bytes (DoS protection)
const qint64 BIP70_MAX_PAYMENTREQUEST_SIZE = 50000;
@@ -77,7 +77,7 @@ void PaymentServer::freeCertStore()
//
static QString ipcServerName()
{
QString name("BitcoinQt");
QString name("MyriadQt");
// Append a simple hash of the datadir
// Note that GetDataDir(true) returns a different path
@@ -328,7 +328,7 @@ PaymentServer::PaymentServer(QObject* parent, bool startLocalServer) :
if (!uriServer->listen(name)) {
// constructor is called early in init, so don't use "emit message()" here
QMessageBox::critical(0, tr("Payment request error"),
tr("Cannot start bitcoin: click-to-pay handler"));
tr("Cannot start myriad: click-to-pay handler"));
}
else {
connect(uriServer, SIGNAL(newConnection()), this, SLOT(handleURIConnection()));
src/qt/res/bitcoin-qt-res.rc
+5 -5
View File
@@ -18,14 +18,14 @@ BEGIN
BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN
VALUE "CompanyName", "Bitcoin"
VALUE "FileDescription", "Bitcoin Core (GUI node for Bitcoin)"
VALUE "CompanyName", "Myriad"
VALUE "FileDescription", "Myriad Core (GUI node for Myriad)"
VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "bitcoin-qt"
VALUE "InternalName", "myriad-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 "ProductName", "Bitcoin Core"
VALUE "OriginalFilename", "myriad-qt.exe"
VALUE "ProductName", "myriad Core"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END
END
src/qt/res/icons/bitcoin.ico
Executable → Regular
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 31 KiB

src/qt/res/icons/bitcoin.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 66 KiB

src/qt/rpcconsole.cpp
+1 -1
View File
@@ -362,7 +362,7 @@ void RPCConsole::clear()
"b { color: #006060; } "
);
message(CMD_REPLY, (tr("Welcome to the Bitcoin Core RPC console.") + "<br>" +
message(CMD_REPLY, (tr("Welcome to the Myriad Core RPC console.") + "<br>" +
tr("Use up and down arrows to navigate history, and <b>Ctrl-L</b> to clear screen.") + "<br>" +
tr("Type <b>help</b> for an overview of available commands.")), true);
}
src/qt/splashscreen.cpp
+7 -3
View File
@@ -30,6 +30,8 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
int paddingTop = 50;
int titleVersionVSpace = 17;
int titleCopyrightVSpace = 40;
int titleCopyrightVSpaceMYR = 54;
int titleCopyrightVSpaceBTC = 40;
float fontFactor = 1.0;
float devicePixelRatio = 1.0;
@@ -38,9 +40,10 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
#endif
// define text to place
QString titleText = tr("Bitcoin Core");
QString titleText = tr("Myriad Core");
QString versionText = QString("Version %1").arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
QString copyrightTextBTC = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
QString copyrightTextMYR = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Myriad developers"));
QString titleAddText = networkStyle->getTitleAddText();
QString font = QApplication::font().toString();
@@ -99,7 +102,8 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
// draw copyright stuff
pixPaint.setFont(QFont(font, 10*fontFactor));
pixPaint.drawText(pixmap.width()/devicePixelRatio-titleTextWidth-paddingRight,paddingTop+titleCopyrightVSpace,copyrightText);
pixPaint.drawText(pixmap.width()/devicePixelRatio-titleTextWidth-paddingRight,paddingTop+titleCopyrightVSpaceMYR,copyrightTextBTC);
pixPaint.drawText(pixmap.width()/devicePixelRatio-titleTextWidth-paddingRight,paddingTop+titleCopyrightVSpaceBTC,copyrightTextMYR);
// draw additional text if special network
if(!titleAddText.isEmpty()) {
src/qt/utilitydialog.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
{
ui->setupUi(this);
QString version = tr("Bitcoin Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
QString version = tr("Myriad Core") + " " + tr("version") + " " + QString::fromStdString(FormatFullVersion());
/* On x86 add a bit specifier to the version so that users can distinguish between
* 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
*/
@@ -42,7 +42,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
if (about)
{
setWindowTitle(tr("About Bitcoin Core"));
setWindowTitle(tr("About Myriad Core"));
/// HTML-format the license message from the core
QString licenseInfo = QString::fromStdString(LicenseInfo());
@@ -63,7 +63,7 @@ HelpMessageDialog::HelpMessageDialog(QWidget *parent, bool about) :
} else {
setWindowTitle(tr("Command-line options"));
QString header = tr("Usage:") + "\n" +
" bitcoin-qt [" + tr("command-line options") + "] " + "\n";
" myriad-qt [" + tr("command-line options") + "] " + "\n";
QTextCursor cursor(ui->helpMessage->document());
cursor.insertText(version);
cursor.insertBlock();
@@ -144,7 +144,7 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f):
{
QVBoxLayout *layout = new QVBoxLayout();
layout->addWidget(new QLabel(
tr("Bitcoin Core is shutting down...") + "<br /><br />" +
tr("Myriad Core is shutting down...") + "<br /><br />" +
tr("Do not shut down the computer until this window disappears.")));
setLayout(layout);
}