Fix fee display
This commit is contained in:
parent
bc493bee2a
commit
ffa0641b33
|
@ -41,6 +41,12 @@
|
||||||
<layout class="QGridLayout" name="gridLayout">
|
<layout class="QGridLayout" name="gridLayout">
|
||||||
<item row="3" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QLabel" name="devFee">
|
<widget class="QLabel" name="devFee">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Dev Fee Amount</string>
|
<string>Dev Fee Amount</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -51,6 +57,12 @@
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="1">
|
<item row="0" column="1">
|
||||||
<widget class="QLabel" name="Amt1">
|
<widget class="QLabel" name="Amt1">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -62,12 +74,18 @@
|
||||||
<item row="3" column="0">
|
<item row="3" column="0">
|
||||||
<widget class="QLabel" name="labelDevFee">
|
<widget class="QLabel" name="labelDevFee">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Dev Fee</string>
|
<string>Dev Textlabel</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="2" column="1">
|
||||||
<widget class="QLabel" name="minerFee">
|
<widget class="QLabel" name="minerFee">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Miner Amount</string>
|
<string>Miner Amount</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -89,12 +107,18 @@
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
<widget class="QLabel" name="labelMinerFee">
|
<widget class="QLabel" name="labelMinerFee">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Miner Fee</string>
|
<string>Miner Textlabel</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="0" column="2">
|
<item row="0" column="2">
|
||||||
<widget class="QLabel" name="AmtUSD1">
|
<widget class="QLabel" name="AmtUSD1">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -112,6 +136,12 @@
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="2">
|
<item row="2" column="2">
|
||||||
<widget class="QLabel" name="minerFeeUSD">
|
<widget class="QLabel" name="minerFeeUSD">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
|
@ -122,6 +152,12 @@
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="2">
|
<item row="3" column="2">
|
||||||
<widget class="QLabel" name="devFeeUSD">
|
<widget class="QLabel" name="devFeeUSD">
|
||||||
|
<property name="sizePolicy">
|
||||||
|
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
|
||||||
|
<horstretch>0</horstretch>
|
||||||
|
<verstretch>0</verstretch>
|
||||||
|
</sizepolicy>
|
||||||
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>TextLabel</string>
|
<string>TextLabel</string>
|
||||||
</property>
|
</property>
|
||||||
|
|
|
@ -452,12 +452,17 @@ void RPC::refreshTransactions() {
|
||||||
|
|
||||||
getTransactions([=] (json reply) {
|
getTransactions([=] (json reply) {
|
||||||
for (auto& it : reply.get<json::array_t>()) {
|
for (auto& it : reply.get<json::array_t>()) {
|
||||||
|
double fee = 0;
|
||||||
|
if (std::find(it.begin(), it.end(), "fee") != it.end()) {
|
||||||
|
fee = it["fee"].get<json::number_float_t>();
|
||||||
|
}
|
||||||
|
|
||||||
TransactionItem tx(
|
TransactionItem tx(
|
||||||
QString::fromStdString(it["category"]),
|
QString::fromStdString(it["category"]),
|
||||||
QDateTime::fromSecsSinceEpoch(it["time"].get<json::number_unsigned_t>()).toLocalTime().toString(),
|
QDateTime::fromSecsSinceEpoch(it["time"].get<json::number_unsigned_t>()).toLocalTime().toString(),
|
||||||
(it["address"].is_null() ? "" : QString::fromStdString(it["address"])),
|
(it["address"].is_null() ? "" : QString::fromStdString(it["address"])),
|
||||||
QString::fromStdString(it["txid"]),
|
QString::fromStdString(it["txid"]),
|
||||||
it["amount"].get<json::number_float_t>(),
|
it["amount"].get<json::number_float_t>() + fee,
|
||||||
it["confirmations"].get<json::number_float_t>()
|
it["confirmations"].get<json::number_float_t>()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -411,12 +411,16 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
|
||||||
labelMinerFee->setText("Miner Fee");
|
labelMinerFee->setText("Miner Fee");
|
||||||
|
|
||||||
auto minerFee = new QLabel(confirm.sendToAddrs);
|
auto minerFee = new QLabel(confirm.sendToAddrs);
|
||||||
|
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||||
|
minerFee->setSizePolicy(sizePolicy);
|
||||||
minerFee->setObjectName(QStringLiteral("minerFee"));
|
minerFee->setObjectName(QStringLiteral("minerFee"));
|
||||||
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
confirm.gridLayout->addWidget(minerFee, i, 1, 1, 1);
|
confirm.gridLayout->addWidget(minerFee, i, 1, 1, 1);
|
||||||
minerFee->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
|
minerFee->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getMinerFee()));
|
||||||
|
|
||||||
auto minerFeeUSD = new QLabel(confirm.sendToAddrs);
|
auto minerFeeUSD = new QLabel(confirm.sendToAddrs);
|
||||||
|
QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Preferred);
|
||||||
|
minerFeeUSD->setSizePolicy(sizePolicy1);
|
||||||
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
|
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
|
||||||
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
confirm.gridLayout->addWidget(minerFeeUSD, i, 2, 1, 1);
|
confirm.gridLayout->addWidget(minerFeeUSD, i, 2, 1, 1);
|
||||||
|
@ -435,6 +439,7 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) {
|
||||||
fee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee()));
|
fee ->setText(Settings::getInstance()->getZECDisplayFormat(Utils::getDevFee()));
|
||||||
|
|
||||||
auto devFeeUSD = new QLabel(confirm.sendToAddrs);
|
auto devFeeUSD = new QLabel(confirm.sendToAddrs);
|
||||||
|
devFeeUSD->setSizePolicy(sizePolicy1);
|
||||||
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
|
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
|
||||||
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
confirm.gridLayout->addWidget(devFeeUSD, i+1, 2, 1, 1);
|
confirm.gridLayout->addWidget(devFeeUSD, i+1, 2, 1, 1);
|
||||||
|
|
|
@ -71,12 +71,19 @@ public:
|
||||||
gridLayout->setObjectName(QStringLiteral("gridLayout"));
|
gridLayout->setObjectName(QStringLiteral("gridLayout"));
|
||||||
devFee = new QLabel(sendToAddrs);
|
devFee = new QLabel(sendToAddrs);
|
||||||
devFee->setObjectName(QStringLiteral("devFee"));
|
devFee->setObjectName(QStringLiteral("devFee"));
|
||||||
|
QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||||
|
sizePolicy.setHorizontalStretch(0);
|
||||||
|
sizePolicy.setVerticalStretch(0);
|
||||||
|
sizePolicy.setHeightForWidth(devFee->sizePolicy().hasHeightForWidth());
|
||||||
|
devFee->setSizePolicy(sizePolicy);
|
||||||
devFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
devFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(devFee, 3, 1, 1, 1);
|
gridLayout->addWidget(devFee, 3, 1, 1, 1);
|
||||||
|
|
||||||
Amt1 = new QLabel(sendToAddrs);
|
Amt1 = new QLabel(sendToAddrs);
|
||||||
Amt1->setObjectName(QStringLiteral("Amt1"));
|
Amt1->setObjectName(QStringLiteral("Amt1"));
|
||||||
|
sizePolicy.setHeightForWidth(Amt1->sizePolicy().hasHeightForWidth());
|
||||||
|
Amt1->setSizePolicy(sizePolicy);
|
||||||
Amt1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
Amt1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(Amt1, 0, 1, 1, 1);
|
gridLayout->addWidget(Amt1, 0, 1, 1, 1);
|
||||||
|
@ -88,6 +95,8 @@ public:
|
||||||
|
|
||||||
minerFee = new QLabel(sendToAddrs);
|
minerFee = new QLabel(sendToAddrs);
|
||||||
minerFee->setObjectName(QStringLiteral("minerFee"));
|
minerFee->setObjectName(QStringLiteral("minerFee"));
|
||||||
|
sizePolicy.setHeightForWidth(minerFee->sizePolicy().hasHeightForWidth());
|
||||||
|
minerFee->setSizePolicy(sizePolicy);
|
||||||
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(minerFee, 2, 1, 1, 1);
|
gridLayout->addWidget(minerFee, 2, 1, 1, 1);
|
||||||
|
@ -105,6 +114,11 @@ public:
|
||||||
|
|
||||||
AmtUSD1 = new QLabel(sendToAddrs);
|
AmtUSD1 = new QLabel(sendToAddrs);
|
||||||
AmtUSD1->setObjectName(QStringLiteral("AmtUSD1"));
|
AmtUSD1->setObjectName(QStringLiteral("AmtUSD1"));
|
||||||
|
QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Preferred);
|
||||||
|
sizePolicy1.setHorizontalStretch(0);
|
||||||
|
sizePolicy1.setVerticalStretch(0);
|
||||||
|
sizePolicy1.setHeightForWidth(AmtUSD1->sizePolicy().hasHeightForWidth());
|
||||||
|
AmtUSD1->setSizePolicy(sizePolicy1);
|
||||||
AmtUSD1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
AmtUSD1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(AmtUSD1, 0, 2, 1, 1);
|
gridLayout->addWidget(AmtUSD1, 0, 2, 1, 1);
|
||||||
|
@ -116,12 +130,16 @@ public:
|
||||||
|
|
||||||
minerFeeUSD = new QLabel(sendToAddrs);
|
minerFeeUSD = new QLabel(sendToAddrs);
|
||||||
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
|
minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD"));
|
||||||
|
sizePolicy1.setHeightForWidth(minerFeeUSD->sizePolicy().hasHeightForWidth());
|
||||||
|
minerFeeUSD->setSizePolicy(sizePolicy1);
|
||||||
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(minerFeeUSD, 2, 2, 1, 1);
|
gridLayout->addWidget(minerFeeUSD, 2, 2, 1, 1);
|
||||||
|
|
||||||
devFeeUSD = new QLabel(sendToAddrs);
|
devFeeUSD = new QLabel(sendToAddrs);
|
||||||
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
|
devFeeUSD->setObjectName(QStringLiteral("devFeeUSD"));
|
||||||
|
sizePolicy1.setHeightForWidth(devFeeUSD->sizePolicy().hasHeightForWidth());
|
||||||
|
devFeeUSD->setSizePolicy(sizePolicy1);
|
||||||
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
|
||||||
|
|
||||||
gridLayout->addWidget(devFeeUSD, 3, 2, 1, 1);
|
gridLayout->addWidget(devFeeUSD, 3, 2, 1, 1);
|
||||||
|
@ -163,10 +181,10 @@ public:
|
||||||
sendToAddrs->setTitle(QApplication::translate("confirm", "To", nullptr));
|
sendToAddrs->setTitle(QApplication::translate("confirm", "To", nullptr));
|
||||||
devFee->setText(QApplication::translate("confirm", "Dev Fee Amount", nullptr));
|
devFee->setText(QApplication::translate("confirm", "Dev Fee Amount", nullptr));
|
||||||
Amt1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
Amt1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
labelDevFee->setText(QApplication::translate("confirm", "Dev Fee", nullptr));
|
labelDevFee->setText(QApplication::translate("confirm", "Dev Textlabel", 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));
|
||||||
labelMinerFee->setText(QApplication::translate("confirm", "Miner Fee", nullptr));
|
labelMinerFee->setText(QApplication::translate("confirm", "Miner Textlabel", nullptr));
|
||||||
AmtUSD1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
AmtUSD1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
Memo1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
Memo1->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
minerFeeUSD->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
minerFeeUSD->setText(QApplication::translate("confirm", "TextLabel", nullptr));
|
||||||
|
|
Loading…
Reference in New Issue