More translations and UI stuff
This commit is contained in:
@@ -171,7 +171,7 @@ NewOrRestorePage::NewOrRestorePage(FirstTimeWizard *parent) : QWizardPage(parent
|
||||
auto fnPasswordEdited = [=](const QString&) {
|
||||
// Enable the Finish button if the passwords match.
|
||||
QString passphraseBlank = form.txtPassword->text();
|
||||
QString passphrase = QString("HUSH3") + passphraseBlank + QString("SDL");
|
||||
QString passphrase = QString("DRGX") + passphraseBlank + QString("SDXL");
|
||||
|
||||
if (!form.txtPassword->text().isEmpty() &&
|
||||
form.txtPassword->text() == form.txtConfirmPassword->text() && passphraseBlank.size() >= 16 ){
|
||||
|
||||
@@ -467,7 +467,7 @@ void MainWindow::encryptWallet() {
|
||||
{
|
||||
|
||||
QString passphraseBlank = ed.txtPassword->text(); // data comes from user inputs
|
||||
QString passphrase = QString("HUSH3") + passphraseBlank + QString("SDL");
|
||||
QString passphrase = QString("DRGX") + passphraseBlank + QString("SDXL");
|
||||
int length = passphrase.length();
|
||||
|
||||
|
||||
@@ -563,7 +563,7 @@ void MainWindow::removeWalletEncryption() {
|
||||
|
||||
if (d.exec() == QDialog::Accepted) {
|
||||
QString passphraseBlank = ed.txtPassword->text(); // data comes from user inputs
|
||||
QString passphrase = QString("HUSH3") + passphraseBlank + QString("SDL");
|
||||
QString passphrase = QString("DRGX") + passphraseBlank + QString("SDXL");
|
||||
|
||||
int length = passphrase.length();
|
||||
|
||||
@@ -647,7 +647,7 @@ void MainWindow::removeWalletEncryptionStartUp() {
|
||||
if (d.exec() == QDialog::Accepted){
|
||||
QString passphraseBlank = ed.txtPassword->text(); // data comes from user inputs
|
||||
|
||||
QString passphrase = QString("HUSH3") + passphraseBlank + QString("SDL");
|
||||
QString passphrase = QString("DRGX") + passphraseBlank + QString("SDXL");
|
||||
int length = passphrase.length();
|
||||
|
||||
char *sequence = NULL;
|
||||
@@ -1014,7 +1014,7 @@ void MainWindow::payhushURI(QString uri, QString myAddr) {
|
||||
// If there was no URI passed, ask the user for one.
|
||||
if (uri.isEmpty()) {
|
||||
uri = QInputDialog::getText(this, tr("Paste DRGX URI"),
|
||||
"HUSH URI" + QString(" ").repeated(180));
|
||||
"DRGX URI" + QString(" ").repeated(180));
|
||||
}
|
||||
|
||||
// If there's no URI, just exit
|
||||
@@ -1869,7 +1869,7 @@ Tx MainWindow::createTxFromSendChatPage() {
|
||||
QString moneymemo = this->getMoneyMemo();
|
||||
|
||||
/////////User input for chatmemos
|
||||
QString memoplain = QString("Money transaction of : ") + amtStr + QString(" HUSH") + QString("\n") + QString("\n") + moneymemo;
|
||||
QString memoplain = QString("Money transaction of : ") + amtStr + QString(" DRGX") + QString("\n") + QString("\n") + moneymemo;
|
||||
|
||||
/////////We convert the user input from QString to unsigned char*, so we can encrypt it later
|
||||
int lengthmemo = memoplain.length();
|
||||
@@ -2157,7 +2157,7 @@ Tx MainWindow::createTxFromSendRequestChatPage() {
|
||||
QString moneymemo = this->getMoneyMemo();
|
||||
|
||||
/////////User input for chatmemos
|
||||
QString memoplain = QString("Request of : ") + amtStr + QString(" HUSH ") + QString("\n") + QString("\n") + moneymemo;
|
||||
QString memoplain = QString("Request of : ") + amtStr + QString(" DRGX ") + QString("\n") + QString("\n") + moneymemo;
|
||||
|
||||
/////////We convert the user input from QString to unsigned char*, so we can encrypt it later
|
||||
int lengthmemo = memoplain.length();
|
||||
|
||||
@@ -133,7 +133,7 @@ bool Settings::isSaplingActive() {
|
||||
}
|
||||
|
||||
double Settings::getDRAGONXPrice() {
|
||||
return HUSHPrice;
|
||||
return DRAGONXPrice;
|
||||
}
|
||||
double Settings::getEURPrice() {
|
||||
return EURPrice;
|
||||
@@ -358,7 +358,7 @@ QString Settings::getTokenName() {
|
||||
if (Settings::getInstance()->isTestnet()) {
|
||||
return "TUSH";
|
||||
} else {
|
||||
return "HUSH";
|
||||
return "DRAGONX";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -395,8 +395,8 @@ QString Settings::paymentURIPretty(PaymentURI uri) {
|
||||
PaymentURI Settings::parseURI(QString uri) {
|
||||
PaymentURI ans;
|
||||
|
||||
if (!uri.startsWith("hush:")) {
|
||||
ans.error = "Not a HUSH payment URI";
|
||||
if (!uri.startsWith("drgx:")) {
|
||||
ans.error = "Not a DRGX payment URI";
|
||||
return ans;
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
|
||||
bool isSaplingActive();
|
||||
|
||||
void setDRAGONXPrice(double p) { HUSHPrice = p; }
|
||||
void setDRAGONXPrice(double p) { DRGXPrice = p; }
|
||||
void setEURPrice(double p) { EURPrice = p; }
|
||||
void setBTCPrice(double p) { BTCPrice = p; }
|
||||
void setCNYPrice(double p) { CNYPrice = p; }
|
||||
@@ -200,7 +200,7 @@ private:
|
||||
bool _useEmbedded = false;
|
||||
bool _headless = false;
|
||||
|
||||
double HUSHPrice = 0.0;
|
||||
double DRGXPrice = 0.0;
|
||||
double BTCPrice = 0.0;
|
||||
double EURPrice = 0.0;
|
||||
double CNYPrice = 0.0;
|
||||
|
||||
Reference in New Issue
Block a user