Align USD prices properly
This commit is contained in:
@@ -72,7 +72,7 @@ QVariant BalancesTableModel::data(const QModelIndex &index, int role) const
|
|||||||
if (role == Qt::DisplayRole) {
|
if (role == Qt::DisplayRole) {
|
||||||
switch (index.column()) {
|
switch (index.column()) {
|
||||||
case 0: return std::get<0>(modeldata->at(index.row()));
|
case 0: return std::get<0>(modeldata->at(index.row()));
|
||||||
case 1: return QVariant(std::get<1>(modeldata->at(index.row())) % " " % Utils::getTokenName());
|
case 1: return Settings::getInstance()->getZECDisplayFormat(std::get<1>(modeldata->at(index.row())).toDouble());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,33 @@
|
|||||||
<string>To</string>
|
<string>To</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
|
<item row="3" column="1">
|
||||||
|
<widget class="QLabel" name="devFee">
|
||||||
|
<property name="text">
|
||||||
|
<string>Dev Fee Amount</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="1">
|
||||||
|
<widget class="QLabel" name="Amt1">
|
||||||
|
<property name="text">
|
||||||
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="3" column="0">
|
||||||
|
<widget class="QLabel" name="labelDevFee">
|
||||||
|
<property name="text">
|
||||||
|
<string>Dev Fee</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="2" column="1">
|
||||||
<widget class="QLabel" name="minerFee">
|
<widget class="QLabel" name="minerFee">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@@ -59,8 +86,15 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="Amt1">
|
<widget class="QLabel" name="labelMinerFee">
|
||||||
|
<property name="text">
|
||||||
|
<string>Miner Fee</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item row="0" column="2">
|
||||||
|
<widget class="QLabel" name="AmtUSD1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
@@ -69,31 +103,27 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="1" column="0" colspan="3">
|
||||||
<widget class="QLabel" name="Memo1">
|
<widget class="QLabel" name="Memo1">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="2">
|
||||||
<widget class="QLabel" name="labelMinerFee">
|
<widget class="QLabel" name="minerFeeUSD">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Miner Fee</string>
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
<property name="alignment">
|
||||||
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0">
|
<item row="3" column="2">
|
||||||
<widget class="QLabel" name="labelDevFee">
|
<widget class="QLabel" name="devFeeUSD">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Dev Fee</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="3" column="1">
|
|
||||||
<widget class="QLabel" name="devFee">
|
|
||||||
<property name="text">
|
|
||||||
<string>Dev Fee Amount</string>
|
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<item row="0" column="0">
|
<item row="0" column="0">
|
||||||
<widget class="QTabWidget" name="tabWidget">
|
<widget class="QTabWidget" name="tabWidget">
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>2</number>
|
<number>1</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab">
|
<widget class="QWidget" name="tab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@@ -242,6 +242,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="sendAddressBalanceUSD">
|
||||||
|
<property name="text">
|
||||||
|
<string> </string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_6">
|
<spacer name="horizontalSpacer_6">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
@@ -483,6 +490,13 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QLabel" name="sendTxFeesUSD">
|
||||||
|
<property name="text">
|
||||||
|
<string>TextLabel</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<spacer name="horizontalSpacer_5">
|
<spacer name="horizontalSpacer_5">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|||||||
@@ -42,10 +42,10 @@ RPC::RPC(QNetworkAccessManager* client, MainWindow* main) {
|
|||||||
|
|
||||||
// Set up timer to refresh Price
|
// Set up timer to refresh Price
|
||||||
priceTimer = new QTimer(main);
|
priceTimer = new QTimer(main);
|
||||||
QObject::connect(timer, &QTimer::timeout, [=]() {
|
QObject::connect(priceTimer, &QTimer::timeout, [=]() {
|
||||||
refreshZECPrice();
|
refreshZECPrice();
|
||||||
});
|
});
|
||||||
priceTimer->start(60 * 60 * 60 * 1000); // Every hour
|
priceTimer->start(60 * 60 * 1000); // Every hour
|
||||||
}
|
}
|
||||||
|
|
||||||
RPC::~RPC() {
|
RPC::~RPC() {
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ void MainWindow::setupSendTab() {
|
|||||||
// Set the fees
|
// Set the fees
|
||||||
ui->sendTxFees->setText(QString::number(Utils::getTotalFee(), 'g', 8) %
|
ui->sendTxFees->setText(QString::number(Utils::getTotalFee(), 'g', 8) %
|
||||||
" " % Utils::getTokenName());
|
" " % Utils::getTokenName());
|
||||||
|
ui->sendTxFeesUSD->setText(Settings::getInstance()->getUSDFormat(Utils::getTotalFee()));
|
||||||
// Set focus to the first address box
|
// Set focus to the first address box
|
||||||
ui->Address1->setFocus();
|
ui->Address1->setFocus();
|
||||||
}
|
}
|
||||||
@@ -85,7 +85,9 @@ void MainWindow::setDefaultPayFrom() {
|
|||||||
void MainWindow::inputComboTextChanged(const QString& text) {
|
void MainWindow::inputComboTextChanged(const QString& text) {
|
||||||
auto bal = rpc->getAllBalances()->value(text.split("(")[0].trimmed());
|
auto bal = rpc->getAllBalances()->value(text.split("(")[0].trimmed());
|
||||||
auto balFmt = QString::number(bal, 'g', 8) + " " % Utils::getTokenName();
|
auto balFmt = QString::number(bal, 'g', 8) + " " % Utils::getTokenName();
|
||||||
|
|
||||||
ui->sendAddressBalance->setText(balFmt);
|
ui->sendAddressBalance->setText(balFmt);
|
||||||
|
ui->sendAddressBalanceUSD->setText(Settings::getInstance()->getUSDFormat(bal));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -290,13 +292,15 @@ void MainWindow::sendButton() {
|
|||||||
// Remove all existing address/amt qlabels
|
// Remove all existing address/amt qlabels
|
||||||
int totalConfirmAddrItems = confirm.sendToAddrs->children().size();
|
int totalConfirmAddrItems = confirm.sendToAddrs->children().size();
|
||||||
for (int i = 0; i < totalConfirmAddrItems / 3; i++) {
|
for (int i = 0; i < totalConfirmAddrItems / 3; i++) {
|
||||||
auto addr = confirm.sendToAddrs->findChild<QLabel*>(QString("Addr") % QString::number(i+1));
|
auto addr = confirm.sendToAddrs->findChild<QLabel*>(QString("Addr") % QString::number(i+1));
|
||||||
auto amt = confirm.sendToAddrs->findChild<QLabel*>(QString("Amt") % QString::number(i+1));
|
auto amt = confirm.sendToAddrs->findChild<QLabel*>(QString("Amt") % QString::number(i+1));
|
||||||
auto memo = confirm.sendToAddrs->findChild<QLabel*>(QString("Memo") % QString::number(i+1));
|
auto memo = confirm.sendToAddrs->findChild<QLabel*>(QString("Memo") % QString::number(i+1));
|
||||||
|
auto amtUSD = confirm.sendToAddrs->findChild<QLabel*>(QString("AmtUSD") % QString::number(i+1));
|
||||||
|
|
||||||
delete memo;
|
delete memo;
|
||||||
delete addr;
|
delete addr;
|
||||||
delete amt;
|
delete amt;
|
||||||
|
delete amtUSD;
|
||||||
}
|
}
|
||||||
|
|
||||||
// For each addr/amt/memo, construct the JSON and also build the confirm dialog box
|
// For each addr/amt/memo, construct the JSON and also build the confirm dialog box
|
||||||
@@ -314,18 +318,28 @@ void MainWindow::sendButton() {
|
|||||||
|
|
||||||
// Add new Address widgets instead of the same one.
|
// Add new Address widgets instead of the same one.
|
||||||
{
|
{
|
||||||
|
// Address
|
||||||
auto Addr = new QLabel(confirm.sendToAddrs);
|
auto Addr = new QLabel(confirm.sendToAddrs);
|
||||||
Addr->setObjectName(QString("Addr") % QString::number(i + 1));
|
Addr->setObjectName(QString("Addr") % QString::number(i + 1));
|
||||||
Addr->setWordWrap(true);
|
Addr->setWordWrap(true);
|
||||||
Addr->setText(fnSplitAddressForWrap(toAddr.addr));
|
Addr->setText(fnSplitAddressForWrap(toAddr.addr));
|
||||||
confirm.gridLayout->addWidget(Addr, i*2, 0, 1, 1);
|
confirm.gridLayout->addWidget(Addr, i*2, 0, 1, 1);
|
||||||
|
|
||||||
|
// Amount (ZEC)
|
||||||
auto Amt = new QLabel(confirm.sendToAddrs);
|
auto Amt = new QLabel(confirm.sendToAddrs);
|
||||||
Amt->setObjectName(QString("Amt") % QString::number(i + 1));
|
Amt->setObjectName(QString("Amt") % QString::number(i + 1));
|
||||||
Amt->setText(Settings::getInstance()->getZECDisplayFormat(toAddr.amount));
|
Amt->setText(Settings::getInstance()->getZECDisplayFormat(toAddr.amount));
|
||||||
Amt->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
|
Amt->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
|
||||||
confirm.gridLayout->addWidget(Amt, i*2, 1, 1, 1);
|
confirm.gridLayout->addWidget(Amt, i*2, 1, 1, 1);
|
||||||
|
|
||||||
|
// Amount (USD)
|
||||||
|
auto AmtUSD = new QLabel(confirm.sendToAddrs);
|
||||||
|
AmtUSD->setObjectName(QString("AmtUSD") % QString::number(i + 1));
|
||||||
|
AmtUSD->setText(Settings::getInstance()->getUSDFormat(toAddr.amount));
|
||||||
|
Amt->setAlignment(Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
|
||||||
|
confirm.gridLayout->addWidget(AmtUSD, i*2, 2, 1, 1);
|
||||||
|
|
||||||
|
// Memo
|
||||||
if (toAddr.addr.startsWith("z")) {
|
if (toAddr.addr.startsWith("z")) {
|
||||||
auto Memo = new QLabel(confirm.sendToAddrs);
|
auto Memo = new QLabel(confirm.sendToAddrs);
|
||||||
Memo->setObjectName(QStringLiteral("Memo") % QString::number(i + 1));
|
Memo->setObjectName(QStringLiteral("Memo") % QString::number(i + 1));
|
||||||
@@ -334,7 +348,7 @@ void MainWindow::sendButton() {
|
|||||||
font1.setPointSize(10);
|
font1.setPointSize(10);
|
||||||
Memo->setFont(font1);
|
Memo->setFont(font1);
|
||||||
|
|
||||||
confirm.gridLayout->addWidget(Memo, (i*2)+1, 0, 1, 2);
|
confirm.gridLayout->addWidget(Memo, (i*2)+1, 0, 1, 3);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -350,14 +364,17 @@ void MainWindow::sendButton() {
|
|||||||
// Add two rows for fees
|
// Add two rows for fees
|
||||||
{
|
{
|
||||||
confirm.labelMinerFee->setText("Miner Fee");
|
confirm.labelMinerFee->setText("Miner Fee");
|
||||||
confirm.minerFee->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
|
confirm.minerFee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
|
||||||
|
confirm.minerFeeUSD ->setText(Settings::getInstance()->getUSDFormat(Utils::getMinerFee()));
|
||||||
|
|
||||||
if (!devAddress.isEmpty() && Utils::getDevFee() > 0) {
|
if (!devAddress.isEmpty() && Utils::getDevFee() > 0) {
|
||||||
confirm.labelDevFee->setText("Dev Fee");
|
confirm.labelDevFee ->setText("Dev Fee");
|
||||||
confirm.devFee->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee()));
|
confirm.devFee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee()));
|
||||||
|
confirm.devFeeUSD ->setText(Settings::getInstance()->getUSDFormat(Utils::getDevFee()));
|
||||||
} else {
|
} else {
|
||||||
confirm.labelDevFee->setText("");
|
confirm.labelDevFee ->setText("");
|
||||||
confirm.devFee->setText("");
|
confirm.devFee ->setText("");
|
||||||
|
confirm.devFeeUSD ->setText("");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -148,24 +148,24 @@ void Settings::setSyncing(bool syncing) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
double Settings::getZECPrice() {
|
double Settings::getZECPrice() {
|
||||||
//if (isTestnet())
|
return zecPrice;
|
||||||
// return 0;
|
|
||||||
//else
|
|
||||||
return zecPrice;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::getUSDFormat(double bal) {
|
QString Settings::getUSDFormat(double bal) {
|
||||||
if (getZECPrice() > 0)
|
if (!isTestnet() && getZECPrice() > 0)
|
||||||
return "$" + QString::number(bal * getZECPrice(), 'f', 2);
|
return "$" + QString::number(bal * getZECPrice(), 'f', 2);
|
||||||
else
|
else
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
|
|
||||||
QString Settings::getZECDisplayFormat(double bal) {
|
QString Settings::getZECDisplayFormat(double bal) {
|
||||||
|
return QString::number(bal, 'g', 8) % " " % Utils::getTokenName();
|
||||||
|
}
|
||||||
|
|
||||||
|
QString Settings::getZECUSDDisplayFormat(double bal) {
|
||||||
auto usdFormat = getUSDFormat(bal);
|
auto usdFormat = getUSDFormat(bal);
|
||||||
if (!usdFormat.isEmpty())
|
if (!usdFormat.isEmpty())
|
||||||
return QString::number(bal, 'g', 8) % " " % Utils::getTokenName() %
|
return getZECDisplayFormat(bal) % " (" % getUSDFormat(bal) % ")";
|
||||||
" (" % getUSDFormat(bal) % ")";
|
|
||||||
else
|
else
|
||||||
return QString::number(bal, 'g', 8) % " " % Utils::getTokenName();
|
return getZECDisplayFormat(bal);
|
||||||
}
|
}
|
||||||
@@ -32,9 +32,11 @@ public:
|
|||||||
const QString& getZcashdConfLocation() { return confLocation; }
|
const QString& getZcashdConfLocation() { return confLocation; }
|
||||||
|
|
||||||
void setZECPrice(double p) { zecPrice = p; }
|
void setZECPrice(double p) { zecPrice = p; }
|
||||||
double getZECPrice();
|
double getZECPrice();
|
||||||
QString getUSDFormat(double bal);
|
|
||||||
QString getZECDisplayFormat(double bal);
|
QString getUSDFormat (double bal);
|
||||||
|
QString getZECDisplayFormat (double bal);
|
||||||
|
QString getZECUSDDisplayFormat (double bal);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// This class can only be accessed through Settings::getInstance()
|
// This class can only be accessed through Settings::getInstance()
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ void TxTableModel::setNewData(QList<TransactionItem>* data) {
|
|||||||
case 2: return modeldata->at(index.row()).datetime;
|
case 2: return modeldata->at(index.row()).datetime;
|
||||||
case 3: {
|
case 3: {
|
||||||
if (role == Qt::DisplayRole)
|
if (role == Qt::DisplayRole)
|
||||||
return QVariant(QString::number(modeldata->at(index.row()).amount, 'g', 8) % " " % Utils::getTokenName());
|
return Settings::getInstance()->getZECDisplayFormat(modeldata->at(index.row()).amount);
|
||||||
else {
|
else {
|
||||||
return Settings::getInstance()->getUSDFormat(modeldata->at(index.row()).amount);
|
return Settings::getInstance()->getUSDFormat(modeldata->at(index.row()).amount);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,13 +31,16 @@ public:
|
|||||||
QLabel *sendFrom;
|
QLabel *sendFrom;
|
||||||
QGroupBox *sendToAddrs;
|
QGroupBox *sendToAddrs;
|
||||||
QGridLayout *gridLayout;
|
QGridLayout *gridLayout;
|
||||||
|
QLabel *devFee;
|
||||||
|
QLabel *Amt1;
|
||||||
|
QLabel *labelDevFee;
|
||||||
QLabel *minerFee;
|
QLabel *minerFee;
|
||||||
QLabel *Addr1;
|
QLabel *Addr1;
|
||||||
QLabel *Amt1;
|
|
||||||
QLabel *Memo1;
|
|
||||||
QLabel *labelMinerFee;
|
QLabel *labelMinerFee;
|
||||||
QLabel *labelDevFee;
|
QLabel *AmtUSD1;
|
||||||
QLabel *devFee;
|
QLabel *Memo1;
|
||||||
|
QLabel *minerFeeUSD;
|
||||||
|
QLabel *devFeeUSD;
|
||||||
QSpacerItem *verticalSpacer;
|
QSpacerItem *verticalSpacer;
|
||||||
QFrame *line;
|
QFrame *line;
|
||||||
QDialogButtonBox *buttonBox;
|
QDialogButtonBox *buttonBox;
|
||||||
@@ -66,6 +69,23 @@ public:
|
|||||||
sendToAddrs->setObjectName(QStringLiteral("sendToAddrs"));
|
sendToAddrs->setObjectName(QStringLiteral("sendToAddrs"));
|
||||||
gridLayout = new QGridLayout(sendToAddrs);
|
gridLayout = new QGridLayout(sendToAddrs);
|
||||||
gridLayout->setObjectName(QStringLiteral("gridLayout"));
|
gridLayout->setObjectName(QStringLiteral("gridLayout"));
|
||||||
|
devFee = new QLabel(sendToAddrs);
|
||||||
|
devFee->setObjectName(QStringLiteral("devFee"));
|
||||||
|
devFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
|
gridLayout->addWidget(devFee, 3, 1, 1, 1);
|
||||||
|
|
||||||
|
Amt1 = new QLabel(sendToAddrs);
|
||||||
|
Amt1->setObjectName(QStringLiteral("Amt1"));
|
||||||
|
Amt1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
|
gridLayout->addWidget(Amt1, 0, 1, 1, 1);
|
||||||
|
|
||||||
|
labelDevFee = new QLabel(sendToAddrs);
|
||||||
|
labelDevFee->setObjectName(QStringLiteral("labelDevFee"));
|
||||||
|
|
||||||
|
gridLayout->addWidget(labelDevFee, 3, 0, 1, 1);
|
||||||
|
|
||||||
minerFee = new QLabel(sendToAddrs);
|
minerFee = new QLabel(sendToAddrs);
|
||||||
minerFee->setObjectName(QStringLiteral("minerFee"));
|
minerFee->setObjectName(QStringLiteral("minerFee"));
|
||||||
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
@@ -78,32 +98,33 @@ public:
|
|||||||
|
|
||||||
gridLayout->addWidget(Addr1, 0, 0, 1, 1);
|
gridLayout->addWidget(Addr1, 0, 0, 1, 1);
|
||||||
|
|
||||||
Amt1 = new QLabel(sendToAddrs);
|
|
||||||
Amt1->setObjectName(QStringLiteral("Amt1"));
|
|
||||||
Amt1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
|
||||||
|
|
||||||
gridLayout->addWidget(Amt1, 0, 1, 1, 1);
|
|
||||||
|
|
||||||
Memo1 = new QLabel(sendToAddrs);
|
|
||||||
Memo1->setObjectName(QStringLiteral("Memo1"));
|
|
||||||
|
|
||||||
gridLayout->addWidget(Memo1, 1, 0, 1, 2);
|
|
||||||
|
|
||||||
labelMinerFee = new QLabel(sendToAddrs);
|
labelMinerFee = new QLabel(sendToAddrs);
|
||||||
labelMinerFee->setObjectName(QStringLiteral("labelMinerFee"));
|
labelMinerFee->setObjectName(QStringLiteral("labelMinerFee"));
|
||||||
|
|
||||||
gridLayout->addWidget(labelMinerFee, 2, 0, 1, 1);
|
gridLayout->addWidget(labelMinerFee, 2, 0, 1, 1);
|
||||||
|
|
||||||
labelDevFee = new QLabel(sendToAddrs);
|
AmtUSD1 = new QLabel(sendToAddrs);
|
||||||
labelDevFee->setObjectName(QStringLiteral("labelDevFee"));
|
AmtUSD1->setObjectName(QStringLiteral("AmtUSD1"));
|
||||||
|
AmtUSD1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(labelDevFee, 3, 0, 1, 1);
|
gridLayout->addWidget(AmtUSD1, 0, 2, 1, 1);
|
||||||
|
|
||||||
devFee = new QLabel(sendToAddrs);
|
Memo1 = new QLabel(sendToAddrs);
|
||||||
devFee->setObjectName(QStringLiteral("devFee"));
|
Memo1->setObjectName(QStringLiteral("Memo1"));
|
||||||
devFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
|
||||||
|
|
||||||
gridLayout->addWidget(devFee, 3, 1, 1, 1);
|
gridLayout->addWidget(Memo1, 1, 0, 1, 3);
|
||||||
|
|
||||||
|
minerFeeUSD = new QLabel(sendToAddrs);
|
||||||
|
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
|
||||||
|
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
|
gridLayout->addWidget(minerFeeUSD, 2, 2, 1, 1);
|
||||||
|
|
||||||
|
devFeeUSD = new QLabel(sendToAddrs);
|
||||||
|
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
|
||||||
|
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
|
gridLayout->addWidget(devFeeUSD, 3, 2, 1, 1);
|
||||||
|
|
||||||
|
|
||||||
verticalLayout->addWidget(sendToAddrs);
|
verticalLayout->addWidget(sendToAddrs);
|
||||||
@@ -140,13 +161,16 @@ public:
|
|||||||
groupBox->setTitle(QApplication::translate("confirm", "From", nullptr));
|
groupBox->setTitle(QApplication::translate("confirm", "From", nullptr));
|
||||||
sendFrom->setText(QString());
|
sendFrom->setText(QString());
|
||||||
sendToAddrs->setTitle(QApplication::translate("confirm", "To", nullptr));
|
sendToAddrs->setTitle(QApplication::translate("confirm", "To", nullptr));
|
||||||
|
devFee->setText(QApplication::translate("confirm", "Dev Fee Amount", nullptr));
|
||||||
|
Amt1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
|
labelDevFee->setText(QApplication::translate("confirm", "Dev Fee", nullptr));
|
||||||
minerFee->setText(QApplication::translate("confirm", "Miner Amount", nullptr));
|
minerFee->setText(QApplication::translate("confirm", "Miner Amount", nullptr));
|
||||||
Addr1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
Addr1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
Amt1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
|
||||||
Memo1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
|
||||||
labelMinerFee->setText(QApplication::translate("confirm", "Miner Fee", nullptr));
|
labelMinerFee->setText(QApplication::translate("confirm", "Miner Fee", nullptr));
|
||||||
labelDevFee->setText(QApplication::translate("confirm", "Dev Fee", nullptr));
|
AmtUSD1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
devFee->setText(QApplication::translate("confirm", "Dev Fee Amount", nullptr));
|
Memo1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
|
minerFeeUSD->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
|
devFeeUSD->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
} // retranslateUi
|
} // retranslateUi
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ public:
|
|||||||
QHBoxLayout *horizontalLayout_15;
|
QHBoxLayout *horizontalLayout_15;
|
||||||
QLabel *label_5;
|
QLabel *label_5;
|
||||||
QLineEdit *sendAddressBalance;
|
QLineEdit *sendAddressBalance;
|
||||||
|
QLabel *sendAddressBalanceUSD;
|
||||||
QSpacerItem *horizontalSpacer_6;
|
QSpacerItem *horizontalSpacer_6;
|
||||||
QGroupBox *groupBox_3;
|
QGroupBox *groupBox_3;
|
||||||
QVBoxLayout *verticalLayout_3;
|
QVBoxLayout *verticalLayout_3;
|
||||||
@@ -106,6 +107,7 @@ public:
|
|||||||
QHBoxLayout *horizontalLayout_14;
|
QHBoxLayout *horizontalLayout_14;
|
||||||
QLabel *label_7;
|
QLabel *label_7;
|
||||||
QLineEdit *sendTxFees;
|
QLineEdit *sendTxFees;
|
||||||
|
QLabel *sendTxFeesUSD;
|
||||||
QSpacerItem *horizontalSpacer_5;
|
QSpacerItem *horizontalSpacer_5;
|
||||||
QHBoxLayout *horizontalLayout_6;
|
QHBoxLayout *horizontalLayout_6;
|
||||||
QSpacerItem *horizontalSpacer;
|
QSpacerItem *horizontalSpacer;
|
||||||
@@ -330,6 +332,11 @@ public:
|
|||||||
|
|
||||||
horizontalLayout_15->addWidget(sendAddressBalance);
|
horizontalLayout_15->addWidget(sendAddressBalance);
|
||||||
|
|
||||||
|
sendAddressBalanceUSD = new QLabel(groupBox_4);
|
||||||
|
sendAddressBalanceUSD->setObjectName(QStringLiteral("sendAddressBalanceUSD"));
|
||||||
|
|
||||||
|
horizontalLayout_15->addWidget(sendAddressBalanceUSD);
|
||||||
|
|
||||||
horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
horizontalLayout_15->addItem(horizontalSpacer_6);
|
horizontalLayout_15->addItem(horizontalSpacer_6);
|
||||||
@@ -471,6 +478,11 @@ public:
|
|||||||
|
|
||||||
horizontalLayout_14->addWidget(sendTxFees);
|
horizontalLayout_14->addWidget(sendTxFees);
|
||||||
|
|
||||||
|
sendTxFeesUSD = new QLabel(tab_2);
|
||||||
|
sendTxFeesUSD->setObjectName(QStringLiteral("sendTxFeesUSD"));
|
||||||
|
|
||||||
|
horizontalLayout_14->addWidget(sendTxFeesUSD);
|
||||||
|
|
||||||
horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
|
||||||
|
|
||||||
horizontalLayout_14->addItem(horizontalSpacer_5);
|
horizontalLayout_14->addItem(horizontalSpacer_5);
|
||||||
@@ -647,7 +659,7 @@ public:
|
|||||||
|
|
||||||
retranslateUi(MainWindow);
|
retranslateUi(MainWindow);
|
||||||
|
|
||||||
tabWidget->setCurrentIndex(2);
|
tabWidget->setCurrentIndex(1);
|
||||||
|
|
||||||
|
|
||||||
QMetaObject::connectSlotsByName(MainWindow);
|
QMetaObject::connectSlotsByName(MainWindow);
|
||||||
@@ -674,6 +686,7 @@ public:
|
|||||||
tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("MainWindow", "Balance", nullptr));
|
tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("MainWindow", "Balance", nullptr));
|
||||||
groupBox_4->setTitle(QApplication::translate("MainWindow", "Pay From", nullptr));
|
groupBox_4->setTitle(QApplication::translate("MainWindow", "Pay From", nullptr));
|
||||||
label_5->setText(QApplication::translate("MainWindow", "Address Balance", nullptr));
|
label_5->setText(QApplication::translate("MainWindow", "Address Balance", nullptr));
|
||||||
|
sendAddressBalanceUSD->setText(QString());
|
||||||
groupBox_3->setTitle(QApplication::translate("MainWindow", "Send To", nullptr));
|
groupBox_3->setTitle(QApplication::translate("MainWindow", "Send To", nullptr));
|
||||||
verticalGroupBox->setTitle(QApplication::translate("MainWindow", "Recipient", nullptr));
|
verticalGroupBox->setTitle(QApplication::translate("MainWindow", "Recipient", nullptr));
|
||||||
label_4->setText(QApplication::translate("MainWindow", "Address", nullptr));
|
label_4->setText(QApplication::translate("MainWindow", "Address", nullptr));
|
||||||
@@ -689,6 +702,7 @@ public:
|
|||||||
addAddressButton->setText(QApplication::translate("MainWindow", "Add Address", nullptr));
|
addAddressButton->setText(QApplication::translate("MainWindow", "Add Address", nullptr));
|
||||||
label_7->setText(QApplication::translate("MainWindow", "Fee", nullptr));
|
label_7->setText(QApplication::translate("MainWindow", "Fee", nullptr));
|
||||||
sendTxFees->setText(QString());
|
sendTxFees->setText(QString());
|
||||||
|
sendTxFeesUSD->setText(QApplication::translate("MainWindow", "TextLabel", nullptr));
|
||||||
sendTransactionButton->setText(QApplication::translate("MainWindow", "Send", nullptr));
|
sendTransactionButton->setText(QApplication::translate("MainWindow", "Send", nullptr));
|
||||||
cancelSendButton->setText(QApplication::translate("MainWindow", "Cancel", nullptr));
|
cancelSendButton->setText(QApplication::translate("MainWindow", "Cancel", nullptr));
|
||||||
tabWidget->setTabText(tabWidget->indexOf(tab_2), QApplication::translate("MainWindow", "Send", nullptr));
|
tabWidget->setTabText(tabWidget->indexOf(tab_2), QApplication::translate("MainWindow", "Send", nullptr));
|
||||||
|
|||||||
Reference in New Issue
Block a user