Updating translations and some UI stuff
This commit is contained in:
fekt
@@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Configure hush.conf</string>
|
||||
<string>Configure dragonx.conf</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="4" column="1">
|
||||
@@ -57,7 +57,7 @@
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>Allow connections to the internet to check for updates, get hush prices etc...</string>
|
||||
<string>Allow connections to the internet to check for updates, get dragonx prices etc...</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -143,7 +143,7 @@
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Your hush node will be configured for you automatically</string>
|
||||
<string>Your dragonx node will be configured for you automatically</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Deposit Hush</string>
|
||||
<string>Deposit DragonX</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="2" column="3">
|
||||
@@ -101,7 +101,7 @@ li.checked::marker { content: "\2612"; }
|
||||
<item row="3" column="0" colspan="4">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p align="center"><span style=" text-decoration: underline;">Your Hush Address </span></p></body></html></string>
|
||||
<string><html><head/><body><p align="center"><span style=" text-decoration: underline;">Your DragonX Address </span></p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
@@ -111,7 +111,7 @@ li.checked::marker { content: "\2612"; }
|
||||
<item row="4" column="0" colspan="4">
|
||||
<widget class="QLabel" name="zaddr">
|
||||
<property name="text">
|
||||
<string>Hush zaddr</string>
|
||||
<string>DragonX zaddr</string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
@@ -131,7 +131,7 @@ li.checked::marker { content: "\2612"; }
|
||||
<item row="1" column="0" colspan="4">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string><html><head/><body><p align="center">QR Code of your Hush Address</p></body></html></string>
|
||||
<string><html><head/><body><p align="center">QR Code of your DragonX Address</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="lblHeader">
|
||||
<property name="text">
|
||||
<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>
|
||||
<string>Request payment from a Sapling address. You'll send a dragonx 0.0001 transaction to the address with a dragonx payment URI. The memo will be included in the transaction when the address pays you.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@@ -129,12 +129,12 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
Recurring::getInstance()->showRecurringDialog(this);
|
||||
});
|
||||
|
||||
// Request hush
|
||||
// Request drgx
|
||||
QObject::connect(ui->actionRequest_hush, &QAction::triggered, [=]() {
|
||||
RequestDialog::showRequesthush(this);
|
||||
});
|
||||
|
||||
// Pay hush URI
|
||||
// Pay drgx URI
|
||||
QObject::connect(ui->actionPay_URI, &QAction::triggered, [=] () {
|
||||
payhushURI();
|
||||
});
|
||||
@@ -1013,7 +1013,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 HUSH URI"),
|
||||
uri = QInputDialog::getText(this, tr("Paste DRGX URI"),
|
||||
"HUSH URI" + QString(" ").repeated(180));
|
||||
}
|
||||
|
||||
@@ -1025,7 +1025,7 @@ void MainWindow::payhushURI(QString uri, QString myAddr) {
|
||||
qDebug() << "Received URI " << uri;
|
||||
PaymentURI paymentInfo = Settings::parseURI(uri);
|
||||
if (!paymentInfo.error.isEmpty()) {
|
||||
QMessageBox::critical(this, tr("Error paying HUSH URI"),
|
||||
QMessageBox::critical(this, tr("Error paying DRGX URI"),
|
||||
tr("URI should be of the form 'hush:<addr>?amt=x&memo=y") + "\n" + paymentInfo.error);
|
||||
return;
|
||||
}
|
||||
@@ -1703,7 +1703,7 @@ if (-1 != pos)
|
||||
QAction* editAction;
|
||||
QAction* HushAction;
|
||||
contextMenu = new QMenu(ui->listContactWidget);
|
||||
HushAction = new QAction("Send or Request Hush ",contextMenu);
|
||||
HushAction = new QAction("Send or Request drgx ",contextMenu);
|
||||
editAction = new QAction("Delete this contact",contextMenu);
|
||||
|
||||
///////// Set selected Zaddr for Chat with click
|
||||
|
||||
@@ -800,7 +800,7 @@
|
||||
<item row="9" column="0">
|
||||
<widget class="QPushButton" name="depositHushButton">
|
||||
<property name="text">
|
||||
<string>Deposit Hush</string>
|
||||
<string>Deposit DragonX</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -1525,7 +1525,7 @@
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_5">
|
||||
<attribute name="title">
|
||||
<string>Information about Hush</string>
|
||||
<string>Information about DragonX</string>
|
||||
</attribute>
|
||||
<widget class="FilledIconLabel" name="hushdlogo">
|
||||
<property name="enabled">
|
||||
@@ -1600,7 +1600,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p align="center"><span style=" font-weight:600;">Hush Blockchain Information</span></p></body></html></string>
|
||||
<string><html><head/><body><p align="center"><span style=" font-weight:600;">DragonX Blockchain Information</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -1819,7 +1819,7 @@
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_19">
|
||||
<property name="text">
|
||||
<string>Version hushlightd</string>
|
||||
<string>Version drgxlightd</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -1882,7 +1882,7 @@
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p align="center"><span style=" font-weight:600;">Hush Market Information</span></p></body></html></string>
|
||||
<string><html><head/><body><p align="center"><span style=" font-weight:600;">DragonX Market Information</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@@ -2050,12 +2050,12 @@
|
||||
</action>
|
||||
<action name="actionTelegram">
|
||||
<property name="text">
|
||||
<string>&Hush Telegram</string>
|
||||
<string>&DragonX Telegram</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionWebsite">
|
||||
<property name="text">
|
||||
<string>&Hush Website</string>
|
||||
<string>&DragonX Website</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionCheck_for_Updates">
|
||||
@@ -2088,7 +2088,7 @@
|
||||
</action>
|
||||
<action name="actionPay_URI">
|
||||
<property name="text">
|
||||
<string>Pay hush &URI...</string>
|
||||
<string>Pay drgx &URI...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="action_Recurring_Payments">
|
||||
@@ -2098,7 +2098,7 @@
|
||||
</action>
|
||||
<action name="actionRequest_hush">
|
||||
<property name="text">
|
||||
<string>Request hush...</string>
|
||||
<string>Request drgx...</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="actionFile_a_bug">
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
<h1 align="center" style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">Hush + HushChat Terms of Service</span></h1>
|
||||
<h1 align="center" style=" margin-top:18px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:xx-large; font-weight:600;">DragonX + HushChat Terms of Service</span></h1>
|
||||
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">All users of this platform agree to not use it for initiating or threatening any forceful interference or violence on an individual or their property, aka, the <a href="https://en.wikipedia.org/wiki/Non-aggression_principle"><span style=" text-decoration: underline; color:#0000ff;">Non-Aggression Principle</span></a>.</p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">THE SERVICE IS PROVIDED “AS IS” AND The Hush Developers DO NOT MAKE ANY SPECIFIC COMMITMENTS OR WARRANTIES ABOUT THE SERVICE.</p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
|
||||
@@ -550,7 +550,7 @@ void Recurring::executeRecurringPayment(MainWindow* main, RecurringPaymentInfo r
|
||||
if (Settings::getInstance()->getDRAGONXPrice() == 0) {
|
||||
for (auto paymentNumber: paymentNumbers) {
|
||||
updatePaymentItem(rpi.getHash(), paymentNumber,
|
||||
"", QObject::tr("No hush price was available to convert from USD"),
|
||||
"", QObject::tr("No dragonx price was available to convert from USD"),
|
||||
PaymentStatus::ERROR);
|
||||
}
|
||||
return;
|
||||
|
||||
@@ -49,7 +49,7 @@ void RequestDialog::setupDialog(MainWindow* main, QDialog* d, Ui_RequestDialog*
|
||||
void RequestDialog::showPaymentConfirmation(MainWindow* main, QString paymentURI) {
|
||||
PaymentURI payInfo = Settings::parseURI(paymentURI);
|
||||
if (!payInfo.error.isEmpty()) {
|
||||
QMessageBox::critical(main, tr("Error paying hush URI"),
|
||||
QMessageBox::critical(main, tr("Error paying DRGX URI"),
|
||||
tr("URI should be of the form 'hush:<addr>?amt=x&memo=y") + "\n" + payInfo.error);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -159,7 +159,7 @@
|
||||
<item row="0" column="2" colspan="2">
|
||||
<widget class="QLabel" name="lblHeader">
|
||||
<property name="text">
|
||||
<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>
|
||||
<string>Request payment from a Sapling address. You'll send a dragonx 0.0001 transaction to the address with a dragonx payment URI. The memo will be included in the transaction when the address pays you.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Send or Request Hush</string>
|
||||
<string>Send or Request DRGX</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
@@ -204,7 +204,7 @@
|
||||
<item>
|
||||
<widget class="QPushButton" name="requestHush">
|
||||
<property name="text">
|
||||
<string>Request Hush</string>
|
||||
<string>Request DRGX</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Fetch hush prices</string>
|
||||
<string>Fetch dragonx prices</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" name="chkCheckUpdates">
|
||||
@@ -259,7 +259,7 @@
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Connect to the internet to fetch hush prices</string>
|
||||
<string>Connect to the internet to Fetch dragonx prices</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_21">
|
||||
|
||||
Reference in New Issue
Block a user