hush
/
SilentDragon
9
1
Fork 7
Code Issues 75 Pull Requests 1 Projects Releases 8 Wiki Activity
Browse Source

initial rebrand for HUSH

pull/45/head
Jane Mercer 5 years ago
parent
d3e8bd06e4
commit
6d038430f8
11 changed files with 40 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/about.ui
  2. 34
      src/connection.cpp
  3. 4
      src/main.cpp
  4. 16
      src/mainwindow.cpp
  5. 4
      src/mainwindow.ui
  6. 2
      src/requestdialog.cpp
  7. 2
      src/requestdialog.ui
  8. 8
      src/rpc.cpp
  9. 4
      src/settings.cpp
  10. 2
      src/websockets.cpp
  11. 2
      zec-qt-wallet.pro

2
src/about.ui
View File

@ -17,7 +17,7 @@
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string notr="true">SevenSeas</string> <string notr="true">SilentDragon</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>

34
src/connection.cpp
View File

@ -75,12 +75,12 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
QString explanation; QString explanation;
if (config->zcashDaemon) { if (config->zcashDaemon) {
explanation = QString() % QObject::tr("You have komodod set to start as a daemon, which can cause problems " explanation = QString() % QObject::tr("You have komodod set to start as a daemon, which can cause problems "
"with SevenSeas\n\n." "with SilentDragon\n\n."
"Please remove the following line from your PIRATE.conf and restart SevenSeas\n" "Please remove the following line from your HUSH3.conf and restart SilentDragon\n"
"daemon=1"); "daemon=1");
} else { } else {
explanation = QString() % QObject::tr("Couldn't start the embedded komodod.\n\n" explanation = QString() % QObject::tr("Couldn't start the embedded komodod.\n\n"
"Please try restarting.\n\nIf you previously started komodod with custom arguments, you might need to reset PIRATE.conf.\n\n" "Please try restarting.\n\nIf you previously started komodod with custom arguments, you might need to reset HUSH3.conf.\n\n"
"If all else fails, please run zcashd manually.") % "If all else fails, please run zcashd manually.") %
(ezcashd ? QObject::tr("The process returned") + ":\n\n" % ezcashd->errorString() : QString("")); (ezcashd ? QObject::tr("The process returned") + ":\n\n" % ezcashd->errorString() : QString(""));
} }
@ -88,16 +88,16 @@ void ConnectionLoader::doAutoConnect(bool tryEzcashdStart) {
this->showError(explanation); this->showError(explanation);
} }
} else { } else {
// PIRATE.conf exists, there's no connection, and the user asked us not to start zcashd. Error! // HUSH3.conf exists, there's no connection, and the user asked us not to start zcashd. Error!
main->logger->write("Not using embedded and couldn't connect to zcashd"); main->logger->write("Not using embedded and couldn't connect to zcashd");
QString explanation = QString() % QObject::tr("Couldn't connect to zcashd configured in PIRATE.conf.\n\n" QString explanation = QString() % QObject::tr("Couldn't connect to zcashd configured in HUSH3.conf.\n\n"
"Not starting embedded zcashd because --no-embedded was passed"); "Not starting embedded zcashd because --no-embedded was passed");
this->showError(explanation); this->showError(explanation);
} }
}); });
} else { } else {
if (Settings::getInstance()->useEmbedded()) { if (Settings::getInstance()->useEmbedded()) {
// PIRATE.conf was not found, so create one // HUSH3.conf was not found, so create one
createZcashConf(); createZcashConf();
} else { } else {
// Fall back to manual connect // Fall back to manual connect
@ -124,7 +124,7 @@ QString randomPassword() {
} }
/** /**
* This will create a new PIRATE.conf, download Zcash parameters. * This will create a new HUSH3.conf, download Zcash parameters.
*/ */
void ConnectionLoader::createZcashConf() { void ConnectionLoader::createZcashConf() {
main->logger->write("createZcashConf"); main->logger->write("createZcashConf");
@ -175,7 +175,7 @@ void ConnectionLoader::createZcashConf() {
QFile file(confLocation); QFile file(confLocation);
if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) { if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) {
main->logger->write("Could not create PIRATE.conf, returning"); main->logger->write("Could not create HUSH3.conf, returning");
return; return;
} }
@ -194,7 +194,7 @@ void ConnectionLoader::createZcashConf() {
file.close(); file.close();
// Now that PIRATE.conf exists, try to autoconnect again // Now that HUSH3.conf exists, try to autoconnect again
this->doAutoConnect(); this->doAutoConnect();
} }
@ -511,11 +511,11 @@ void ConnectionLoader::showError(QString explanation) {
QString ConnectionLoader::locateZcashConfFile() { QString ConnectionLoader::locateZcashConfFile() {
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".komodo/PIRATE/PIRATE.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, ".komodo/HUSH3/HUSH3.conf");
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "Library/Application Support/Komodo/PIRATE/PIRATE.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::HomeLocation, "Library/Application Support/Komodo/HUSH3/HUSH3.conf");
#else #else
auto confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Komodo/PIRATE/PIRATE.conf"); auto confLocation = QStandardPaths::locate(QStandardPaths::AppDataLocation, "../../Komodo/HUSH3/HUSH3.conf");
#endif #endif
main->logger->write("Found zcashconf at " + QDir::cleanPath(confLocation)); main->logger->write("Found zcashconf at " + QDir::cleanPath(confLocation));
@ -524,11 +524,11 @@ QString ConnectionLoader::locateZcashConfFile() {
QString ConnectionLoader::zcashConfWritableLocation() { QString ConnectionLoader::zcashConfWritableLocation() {
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".komodo/PIRATE/PIRATE.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath(".komodo/HUSH3/HUSH3.conf");
#elif defined(Q_OS_DARWIN) #elif defined(Q_OS_DARWIN)
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/Zcash/PIRATE/PIRATE.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::HomeLocation)).filePath("Library/Application Support/Zcash/HUSH3/HUSH3.conf");
#else #else
auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../Komodo/PIRATE/PIRATE.conf"); auto confLocation = QDir(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)).filePath("../../Komodo/HUSH3/HUSH3.conf");
#endif #endif
main->logger->write("Found zcashconf at " + QDir::cleanPath(confLocation)); main->logger->write("Found zcashconf at " + QDir::cleanPath(confLocation));
@ -566,7 +566,7 @@ bool ConnectionLoader::verifyParams() {
} }
/** /**
* Try to automatically detect a PIRATE/PIRATE.conf file in the correct location and load parameters * Try to automatically detect a HUSH3/HUSH3.conf file in the correct location and load parameters
*/ */
std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectZcashConf() { std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectZcashConf() {
auto confLocation = locateZcashConfFile(); auto confLocation = locateZcashConfFile();
@ -625,7 +625,7 @@ std::shared_ptr<ConnectionConfig> ConnectionLoader::autoDetectZcashConf() {
if (zcashconf->port.isEmpty()) zcashconf->port = "8232"; if (zcashconf->port.isEmpty()) zcashconf->port = "8232";
file.close(); file.close();
// In addition to the PIRATE/PIRATE.conf file, also double check the params. // In addition to the HUSH3/HUSH3.conf file, also double check the params.
return std::shared_ptr<ConnectionConfig>(zcashconf); return std::shared_ptr<ConnectionConfig>(zcashconf);
} }

4
src/main.cpp
View File

@ -160,7 +160,7 @@ public:
parser.addOption(noembeddedOption); parser.addOption(noembeddedOption);
// Positional argument will specify a zcash payment URI // Positional argument will specify a zcash payment URI
parser.addPositionalArgument("zcashURI", "An optional ARRR URI to pay"); parser.addPositionalArgument("zcashURI", "An optional HUSH URI to pay");
parser.process(a); parser.process(a);
@ -218,7 +218,7 @@ public:
} }
w = new MainWindow(); w = new MainWindow();
w->setWindowTitle("SevenSeas v" + QString(APP_VERSION)); w->setWindowTitle("SilentDragon v" + QString(APP_VERSION));
// If there was a payment URI on the command line, pay it // If there was a payment URI on the command line, pay it
if (parser.positionalArguments().length() > 0) { if (parser.positionalArguments().length() > 0) {

16
src/mainwindow.cpp
View File

@ -538,7 +538,7 @@ void MainWindow::setupSettingsModal() {
rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050"; rpc->getConnection()->config->proxy = "proxy=127.0.0.1:9050";
QMessageBox::information(this, tr("Enable Tor"), QMessageBox::information(this, tr("Enable Tor"),
tr("Connection over Tor has been enabled. To use this feature, you need to restart SevenSeas."), tr("Connection over Tor has been enabled. To use this feature, you need to restart SilentDragon."),
QMessageBox::Ok); QMessageBox::Ok);
} }
@ -548,7 +548,7 @@ void MainWindow::setupSettingsModal() {
rpc->getConnection()->config->proxy.clear(); rpc->getConnection()->config->proxy.clear();
QMessageBox::information(this, tr("Disable Tor"), QMessageBox::information(this, tr("Disable Tor"),
tr("Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SevenSeas."), tr("Connection over Tor has been disabled. To fully disconnect from Tor, you need to restart SilentDragon."),
QMessageBox::Ok); QMessageBox::Ok);
} }
@ -577,9 +577,9 @@ void MainWindow::setupSettingsModal() {
} }
if (showRestartInfo) { if (showRestartInfo) {
auto desc = tr("SevenSeas needs to restart to rescan/reindex. SevenSeas will now close, please restart SevenSeas to continue"); auto desc = tr("SilentDragon needs to restart to rescan/reindex. SilentDragon will now close, please restart SilentDragon to continue");
QMessageBox::information(this, tr("Restart SevenSeas"), desc, QMessageBox::Ok); QMessageBox::information(this, tr("Restart SilentDragon"), desc, QMessageBox::Ok);
QTimer::singleShot(1, [=]() { this->close(); }); QTimer::singleShot(1, [=]() { this->close(); });
} }
} }
@ -609,9 +609,9 @@ void MainWindow::donate() {
Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText()))); Settings::getInstance()->isSaplingAddress(ui->inputsCombo->currentText())));
ui->Address1->setCursorPosition(0); ui->Address1->setCursorPosition(0);
ui->Amount1->setText("0.01"); ui->Amount1->setText("0.01");
ui->MemoTxt1->setText(tr("Thanks for supporting SevenSeas!")); ui->MemoTxt1->setText(tr("Thanks for supporting SilentDragon!"));
ui->statusBar->showMessage(tr("Donate 0.01 ") % Settings::getTokenName() % tr(" to support SevenSeas")); ui->statusBar->showMessage(tr("Donate 0.01 ") % Settings::getTokenName() % tr(" to support SilentDragon"));
// And switch to the send tab. // And switch to the send tab.
ui->tabWidget->setCurrentIndex(1); ui->tabWidget->setCurrentIndex(1);
@ -807,8 +807,8 @@ void MainWindow::payZcashURI(QString uri, QString myAddr) {
// If there was no URI passed, ask the user for one. // If there was no URI passed, ask the user for one.
if (uri.isEmpty()) { if (uri.isEmpty()) {
uri = QInputDialog::getText(this, tr("Paste Pirate URI"), uri = QInputDialog::getText(this, tr("Paste HUSH URI"),
"Pirate URI" + QString(" ").repeated(180)); "HUSH URI" + QString(" ").repeated(180));
} }
// If there's no URI, just exit // If there's no URI, just exit

4
src/mainwindow.ui
View File

@ -1146,7 +1146,7 @@
</action> </action>
<action name="actionPay_URI"> <action name="actionPay_URI">
<property name="text"> <property name="text">
<string>Pay Pirate &amp;URI...</string> <string>Pay HUSH &amp;URI...</string>
</property> </property>
</action> </action>
<action name="actionConnect_Mobile_App"> <action name="actionConnect_Mobile_App">
@ -1159,7 +1159,7 @@
</action> </action>
<action name="actionRequest_zcash"> <action name="actionRequest_zcash">
<property name="text"> <property name="text">
<string>Request Pirate...</string> <string>Request HUSH...</string>
</property> </property>
</action> </action>
</widget> </widget>

2
src/requestdialog.cpp
View File

@ -47,7 +47,7 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog*
void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI) { void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI) {
PaymentURI payInfo = Settings::parseURI(paymentURI); PaymentURI payInfo = Settings::parseURI(paymentURI);
if (!payInfo.error.isEmpty()) { if (!payInfo.error.isEmpty()) {
QMessageBox::critical(main, tr("Error paying Pirate URI"), QMessageBox::critical(main, tr("Error paying HUSH URI"),
tr("URI should be of the form 'pirate:<addr>?amt=x&memo=y") + "\n" + payInfo.error); tr("URI should be of the form 'pirate:<addr>?amt=x&memo=y") + "\n" + payInfo.error);
return; return;
} }

2
src/requestdialog.ui
View File

@ -216,7 +216,7 @@
<item row="0" column="2" colspan="2"> <item row="0" column="2" colspan="2">
<widget class="QLabel" name="lblHeader"> <widget class="QLabel" name="lblHeader">
<property name="text"> <property name="text">
<string>Request payment from a Sapling address. You'll send a ARRR 0.0001 transaction to the address with a Pirate payment URI. The memo will be included in the transaction when the address pays you.</string> <string>Request payment from a Sapling address. You'll send a HUSH 0.0001 transaction to the address with a HUSH payment URI. The memo will be included in the transaction when the address pays you.</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

8
src/rpc.cpp
View File

@ -971,7 +971,7 @@ void RPC::checkForUpdate(bool silent) {
if (conn == nullptr) if (conn == nullptr)
return noConnection(); return noConnection();
QUrl cmcURL("https://api.github.com/repos/radix42/SevenSeas/releases"); QUrl cmcURL("https://api.github.com/repos/radix42/SilentDragon/releases");
QNetworkRequest req; QNetworkRequest req;
req.setUrl(cmcURL); req.setUrl(cmcURL);
@ -1017,7 +1017,7 @@ void RPC::checkForUpdate(bool silent) {
.arg(currentVersion.toString()), .arg(currentVersion.toString()),
QMessageBox::Yes, QMessageBox::Cancel); QMessageBox::Yes, QMessageBox::Cancel);
if (ans == QMessageBox::Yes) { if (ans == QMessageBox::Yes) {
QDesktopServices::openUrl(QUrl("https://github.com/radix42/SevenSeas/releases")); QDesktopServices::openUrl(QUrl("https://github.com/radix42/SilentDragon/releases"));
} else { } else {
// If the user selects cancel, don't bother them again for this version // If the user selects cancel, don't bother them again for this version
s.setValue("update/lastversion", maxVersion.toString()); s.setValue("update/lastversion", maxVersion.toString());
@ -1077,7 +1077,7 @@ void RPC::refreshZECPrice() {
const json& item = parsed.get<json::object_t>(); const json& item = parsed.get<json::object_t>();
if (item["coin"].get<json::string_t>() == "PIRATE") { if (item["coin"].get<json::string_t>() == "PIRATE") {
QString price = QString::fromStdString(item["priceUSD"].get<json::string_t>()); QString price = QString::fromStdString(item["priceUSD"].get<json::string_t>());
qDebug() << "ARRR Price=" << price; qDebug() << "HUSH Price=" << price;
Settings::getInstance()->setZECPrice(price.toDouble()); Settings::getInstance()->setZECPrice(price.toDouble());
return; return;
@ -1113,7 +1113,7 @@ void RPC::shutdownZcashd() {
Ui_ConnectionDialog connD; Ui_ConnectionDialog connD;
connD.setupUi(&d); connD.setupUi(&d);
connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256)); connD.topIcon->setBasePixmap(QIcon(":/icons/res/icon.ico").pixmap(256, 256));
connD.status->setText(QObject::tr("Please wait for SevenSeas to exit")); connD.status->setText(QObject::tr("Please wait for SilentDragon to exit"));
connD.statusDetail->setText(QObject::tr("Waiting for zcashd to exit")); connD.statusDetail->setText(QObject::tr("Waiting for zcashd to exit"));
QTimer waiter(main); QTimer waiter(main);

4
src/settings.cpp
View File

@ -195,7 +195,7 @@ QString Settings::getTokenName() {
if (Settings::getInstance()->isTestnet()) { if (Settings::getInstance()->isTestnet()) {
return "TAZ"; return "TAZ";
} else { } else {
return "ARRR"; return "HUSH";
} }
} }
@ -297,7 +297,7 @@ PaymentURI Settings::parseURI(QString uri) {
PaymentURI ans; PaymentURI ans;
if (!uri.startsWith("pirate:")) { if (!uri.startsWith("pirate:")) {
ans.error = "Not a Pirate payment URI"; ans.error = "Not a HUSH payment URI";
return ans; return ans;
} }

2
src/websockets.cpp
View File

@ -356,7 +356,7 @@ QString AppDataServer::connDesc(AppConnectionType t) {
return QObject::tr("Connected directly"); return QObject::tr("Connected directly");
} }
else { else {
return QObject::tr("Connected over the internet via SevenSeas wormhole service"); return QObject::tr("Connected over the internet via SilentDragon wormhole service");
} }
} }

2
zec-qt-wallet.pro
View File

@ -13,7 +13,7 @@ PRECOMPILED_HEADER = src/precompiled.h
QT += widgets QT += widgets
QT += websockets QT += websockets
TARGET = sevenseas TARGET = silentdragon
TEMPLATE = app TEMPLATE = app

Write Preview
Loading…
Cancel
Save