From 6420fb2005db1490d77c6df45d0b97d7389ff609 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Mon, 30 May 2022 17:41:37 +0200
Subject: [PATCH] qt, refactor: Drop unused `QFrame`s in `SendCoinsEntry`
---
src/qt/forms/sendcoinsentry.ui | 1039 --------------------------------
src/qt/sendcoinsentry.cpp | 25 +-
2 files changed, 2 insertions(+), 1062 deletions(-)
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index 934363af1f..0e9abc1728 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -219,1041 +219,6 @@
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 255
- 255
- 191
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 170
- 170
- 84
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 191
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 255
- 255
- 191
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 170
- 170
- 84
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 191
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 255
- 255
- 191
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 170
- 170
- 84
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 255
- 255
- 255
-
-
-
-
-
-
- 127
- 127
- 63
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 255
- 255
- 127
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
- This is an unauthenticated payment request.
-
-
- true
-
-
- QFrame::NoFrame
-
-
-
- 12
-
- -
-
-
- Pay To:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 0
-
-
-
-
-
- -
-
-
- Remove this entry
-
-
-
-
-
-
- :/icons/remove:/icons/remove
-
-
-
-
-
- -
-
-
- Memo:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::PlainText
-
-
-
- -
-
-
- A&mount:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- payAmount_is
-
-
-
- -
-
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 230
- 255
- 224
-
-
-
-
-
-
- 185
- 243
- 171
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 93
- 155
- 79
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 155
- 255
- 147
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 119
- 255
- 233
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 197
- 243
- 187
-
-
-
-
-
-
- 125
- 194
- 122
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 230
- 255
- 224
-
-
-
-
-
-
- 185
- 243
- 171
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 93
- 155
- 79
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 155
- 255
- 147
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 119
- 255
- 233
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 197
- 243
- 187
-
-
-
-
-
-
- 125
- 194
- 122
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 230
- 255
- 224
-
-
-
-
-
-
- 185
- 243
- 171
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 93
- 155
- 79
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 155
- 255
- 147
-
-
-
-
-
-
- 70
- 116
- 59
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
- 140
- 232
- 119
-
-
-
-
-
-
- 125
- 194
- 122
-
-
-
-
-
-
- 255
- 255
- 220
-
-
-
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
- This is an authenticated payment request.
-
-
- true
-
-
- QFrame::NoFrame
-
-
-
- 12
-
- -
-
-
- Pay To:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- 0
-
-
-
-
-
- Qt::PlainText
-
-
-
- -
-
-
- Remove this entry
-
-
-
-
-
-
- :/icons/remove:/icons/remove
-
-
-
-
-
- -
-
-
- Memo:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::PlainText
-
-
-
- -
-
-
- A&mount:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- payAmount_s
-
-
-
- -
-
-
- false
-
-
-
-
-
@@ -1274,10 +239,6 @@
deleteButton
addAsLabel
payAmount
- payAmount_is
- deleteButton_is
- payAmount_s
- deleteButton_s
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 339ac580d8..ba9af382a3 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -30,25 +30,18 @@ SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *par
ui->addressBookButton->setIcon(platformStyle->SingleColorIcon(":/icons/address-book"));
ui->pasteButton->setIcon(platformStyle->SingleColorIcon(":/icons/editpaste"));
ui->deleteButton->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
- ui->deleteButton_is->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
- ui->deleteButton_s->setIcon(platformStyle->SingleColorIcon(":/icons/remove"));
setCurrentWidget(ui->SendCoins);
if (platformStyle->getUseExtraSpacing())
ui->payToLayout->setSpacing(4);
- // normal bitcoin address field
GUIUtil::setupAddressWidget(ui->payTo, this);
- // just a label for displaying bitcoin address(es)
- ui->payTo_is->setFont(GUIUtil::fixedPitchFont());
// Connect signals
connect(ui->payAmount, &BitcoinAmountField::valueChanged, this, &SendCoinsEntry::payAmountChanged);
connect(ui->checkboxSubtractFeeFromAmount, &QCheckBox::toggled, this, &SendCoinsEntry::subtractFeeFromAmountChanged);
connect(ui->deleteButton, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked);
- connect(ui->deleteButton_is, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked);
- connect(ui->deleteButton_s, &QPushButton::clicked, this, &SendCoinsEntry::deleteClicked);
connect(ui->useAvailableBalanceButton, &QPushButton::clicked, this, &SendCoinsEntry::useAvailableBalanceClicked);
}
@@ -103,14 +96,6 @@ void SendCoinsEntry::clear()
ui->messageTextLabel->clear();
ui->messageTextLabel->hide();
ui->messageLabel->hide();
- // clear UI elements for unauthenticated payment request
- ui->payTo_is->clear();
- ui->memoTextLabel_is->clear();
- ui->payAmount_is->clear();
- // clear UI elements for authenticated payment request
- ui->payTo_s->clear();
- ui->memoTextLabel_s->clear();
- ui->payAmount_s->clear();
// update the display unit, to not use the default ("BTC")
updateDisplayUnit();
@@ -219,7 +204,7 @@ void SendCoinsEntry::setAmount(const CAmount &amount)
bool SendCoinsEntry::isClear()
{
- return ui->payTo->text().isEmpty() && ui->payTo_is->text().isEmpty() && ui->payTo_s->text().isEmpty();
+ return ui->payTo->text().isEmpty();
}
void SendCoinsEntry::setFocus()
@@ -229,12 +214,8 @@ void SendCoinsEntry::setFocus()
void SendCoinsEntry::updateDisplayUnit()
{
- if(model && model->getOptionsModel())
- {
- // Update payAmount with the current unit
+ if (model && model->getOptionsModel()) {
ui->payAmount->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
- ui->payAmount_is->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
- ui->payAmount_s->setDisplayUnit(model->getOptionsModel()->getDisplayUnit());
}
}
@@ -244,8 +225,6 @@ void SendCoinsEntry::changeEvent(QEvent* e)
ui->addressBookButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/address-book")));
ui->pasteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/editpaste")));
ui->deleteButton->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
- ui->deleteButton_is->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
- ui->deleteButton_s->setIcon(platformStyle->SingleColorIcon(QStringLiteral(":/icons/remove")));
}
QStackedWidget::changeEvent(e);