diff --git a/src/confirm.ui b/src/confirm.ui index 00ccb44..96193b0 100644 --- a/src/confirm.ui +++ b/src/confirm.ui @@ -41,6 +41,12 @@ + + + 0 + 0 + + Dev Fee Amount @@ -51,6 +57,12 @@ + + + 0 + 0 + + TextLabel @@ -62,12 +74,18 @@ - Dev Fee + Dev Textlabel + + + 0 + 0 + + Miner Amount @@ -89,12 +107,18 @@ - Miner Fee + Miner Textlabel + + + 0 + 0 + + TextLabel @@ -112,6 +136,12 @@ + + + 0 + 0 + + TextLabel @@ -122,6 +152,12 @@ + + + 0 + 0 + + TextLabel diff --git a/src/rpc.cpp b/src/rpc.cpp index 07988a6..894faa9 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -452,12 +452,17 @@ void RPC::refreshTransactions() { getTransactions([=] (json reply) { for (auto& it : reply.get()) { + double fee = 0; + if (std::find(it.begin(), it.end(), "fee") != it.end()) { + fee = it["fee"].get(); + } + TransactionItem tx( QString::fromStdString(it["category"]), QDateTime::fromSecsSinceEpoch(it["time"].get()).toLocalTime().toString(), (it["address"].is_null() ? "" : QString::fromStdString(it["address"])), QString::fromStdString(it["txid"]), - it["amount"].get(), + it["amount"].get() + fee, it["confirmations"].get() ); diff --git a/src/sendtab.cpp b/src/sendtab.cpp index 101abd1..cbf9f1d 100644 --- a/src/sendtab.cpp +++ b/src/sendtab.cpp @@ -411,12 +411,16 @@ bool MainWindow::confirmTx(Tx tx, ToFields devFee) { labelMinerFee->setText("Miner Fee"); auto minerFee = new QLabel(confirm.sendToAddrs); + QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + minerFee->setSizePolicy(sizePolicy); 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); + QSizePolicy sizePolicy1(QSizePolicy::Minimum, QSizePolicy::Preferred); + minerFeeUSD->setSizePolicy(sizePolicy1); minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD")); minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); 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())); auto devFeeUSD = new QLabel(confirm.sendToAddrs); + devFeeUSD->setSizePolicy(sizePolicy1); devFeeUSD->setObjectName(QStringLiteral("devFeeUSD")); devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); confirm.gridLayout->addWidget(devFeeUSD, i+1, 2, 1, 1); diff --git a/src/ui_confirm.h b/src/ui_confirm.h index 4e5c62d..234138e 100644 --- a/src/ui_confirm.h +++ b/src/ui_confirm.h @@ -71,12 +71,19 @@ public: gridLayout->setObjectName(QStringLiteral("gridLayout")); devFee = new QLabel(sendToAddrs); 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); gridLayout->addWidget(devFee, 3, 1, 1, 1); Amt1 = new QLabel(sendToAddrs); Amt1->setObjectName(QStringLiteral("Amt1")); + sizePolicy.setHeightForWidth(Amt1->sizePolicy().hasHeightForWidth()); + Amt1->setSizePolicy(sizePolicy); Amt1->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); gridLayout->addWidget(Amt1, 0, 1, 1, 1); @@ -88,6 +95,8 @@ public: minerFee = new QLabel(sendToAddrs); minerFee->setObjectName(QStringLiteral("minerFee")); + sizePolicy.setHeightForWidth(minerFee->sizePolicy().hasHeightForWidth()); + minerFee->setSizePolicy(sizePolicy); minerFee->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); gridLayout->addWidget(minerFee, 2, 1, 1, 1); @@ -105,6 +114,11 @@ public: AmtUSD1 = new QLabel(sendToAddrs); 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); gridLayout->addWidget(AmtUSD1, 0, 2, 1, 1); @@ -116,12 +130,16 @@ public: minerFeeUSD = new QLabel(sendToAddrs); minerFeeUSD->setObjectName(QStringLiteral("minerFeeUSD")); + sizePolicy1.setHeightForWidth(minerFeeUSD->sizePolicy().hasHeightForWidth()); + minerFeeUSD->setSizePolicy(sizePolicy1); minerFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); gridLayout->addWidget(minerFeeUSD, 2, 2, 1, 1); devFeeUSD = new QLabel(sendToAddrs); devFeeUSD->setObjectName(QStringLiteral("devFeeUSD")); + sizePolicy1.setHeightForWidth(devFeeUSD->sizePolicy().hasHeightForWidth()); + devFeeUSD->setSizePolicy(sizePolicy1); devFeeUSD->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); gridLayout->addWidget(devFeeUSD, 3, 2, 1, 1); @@ -163,10 +181,10 @@ public: 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)); + labelDevFee->setText(QApplication::translate("confirm", "Dev Textlabel", nullptr)); minerFee->setText(QApplication::translate("confirm", "Miner Amount", 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)); Memo1->setText(QApplication::translate("confirm", "TextLabel", nullptr)); minerFeeUSD->setText(QApplication::translate("confirm", "TextLabel", nullptr));