DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix ZEC rendering on send tab

Browse Source
This commit is contained in:
Aditya Kulkarni
2018-10-18 18:16:27 -07:00
parent d2a1b2c673
commit 18209ad68d
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc.cpp
View File

@@ -331,8 +331,10 @@ void RPC::getInfoThenRefresh() {
")"; ")";
main->statusLabel->setText(statusText); main->statusLabel->setText(statusText);
auto zecPrice = Settings::getInstance()->getUSDFormat(1); auto zecPrice = Settings::getInstance()->getUSDFormat(1);
if (!zecPrice.isEmpty()) if (!zecPrice.isEmpty()) {
main->statusLabel->setToolTip("1 ZEC = " + zecPrice); main->statusLabel->setToolTip("1 ZEC = " + zecPrice);
main->statusIcon->setToolTip("1 ZEC = " + zecPrice);
}
}); });
}); });

56
src/sendtab.cpp
View File

@@ -7,6 +7,8 @@
#include "precompiled.h" #include "precompiled.h"
#include <iostream>
#include <iomanip>
using json = nlohmann::json; using json = nlohmann::json;
void MainWindow::setupSendTab() { void MainWindow::setupSendTab() {
@@ -350,6 +352,15 @@ void MainWindow::sendButton() {
delete amtUSD; delete amtUSD;
} }
// Remove the fee labels
delete confirm.sendToAddrs->findChild<QLabel*>("labelMinerFee");
delete confirm.sendToAddrs->findChild<QLabel*>("minerFee");
delete confirm.sendToAddrs->findChild<QLabel*>("minerFeeUSD");
delete confirm.sendToAddrs->findChild<QLabel*>("labelDevFee");
delete confirm.sendToAddrs->findChild<QLabel*>("devFee");
delete confirm.sendToAddrs->findChild<QLabel*>("devFeeUSD");
// 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
for (int i=0; i < toAddrs.size(); i++) { for (int i=0; i < toAddrs.size(); i++) {
auto toAddr = toAddrs[i]; auto toAddr = toAddrs[i];
@@ -410,18 +421,42 @@ void MainWindow::sendButton() {
// Add two rows for fees // Add two rows for fees
{ {
confirm.labelMinerFee->setText("Miner Fee"); auto i = toAddrs.size() * 2;
confirm.minerFee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
confirm.minerFeeUSD ->setText(Settings::getInstance()->getUSDFormat(Utils::getMinerFee())); auto labelMinerFee = new QLabel(confirm.sendToAddrs);
labelMinerFee->setObjectName(QStringLiteral("labelMinerFee"));
confirm.gridLayout->addWidget(labelMinerFee, i, 0, 1, 1);
labelMinerFee->setText("Miner Fee");
auto minerFee = new QLabel(confirm.sendToAddrs);
minerFee->setObjectName(QStringLiteral("minerFee"));
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(minerFee, i, 1, 1, 1);
minerFee->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
auto minerFeeUSD = new QLabel(confirm.sendToAddrs);
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(minerFeeUSD, i, 2, 1, 1);
minerFeeUSD->setText(Settings::getInstance()->getUSDFormat(Utils::getMinerFee()));
if (!devAddress.isEmpty() && Utils::getDevFee() > 0) { if (!devAddress.isEmpty() && Utils::getDevFee() > 0) {
confirm.labelDevFee ->setText("Dev Fee"); auto labelDevFee = new QLabel(confirm.sendToAddrs);
confirm.devFee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee())); labelDevFee->setObjectName(QStringLiteral("labelDevFee"));
confirm.devFeeUSD ->setText(Settings::getInstance()->getUSDFormat(Utils::getDevFee())); confirm.gridLayout->addWidget(labelDevFee, i+1, 0, 1, 1);
} else { labelDevFee ->setText("Dev Fee");
confirm.labelDevFee ->setText("");
confirm.devFee ->setText(""); auto devFee = new QLabel(confirm.sendToAddrs);
confirm.devFeeUSD ->setText(""); devFee->setObjectName(QStringLiteral("devFee"));
devFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(devFee, i+1, 1, 1, 1);
devFee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee()));
auto devFeeUSD = new QLabel(confirm.sendToAddrs);
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
confirm.gridLayout->addWidget(devFeeUSD, i+1, 2, 1, 1);
devFeeUSD ->setText(Settings::getInstance()->getUSDFormat(Utils::getDevFee()));
} }
} }
@@ -435,6 +470,7 @@ void MainWindow::sendButton() {
// Show the dialog and submit it if the user confirms // Show the dialog and submit it if the user confirms
if (d.exec() == QDialog::Accepted) { if (d.exec() == QDialog::Accepted) {
std::cout << std::setw(2) << params << std::endl;
rpc->sendZTransaction(params, [=](const json& reply) { rpc->sendZTransaction(params, [=](const json& reply) {
QString opid = QString::fromStdString(reply.get<json::string_t>()); QString opid = QString::fromStdString(reply.get<json::string_t>());
ui->statusBar->showMessage("Computing Tx: " % opid); ui->statusBar->showMessage("Computing Tx: " % opid);