mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-12 04:42:36 -03:00
qt: Overhaul ReceiveRequestDialog
This commit is contained in:
Hennadii Stepanov
parent
e727c2bdca
commit
68288ef0c1
3 changed files with 281 additions and 107 deletions
|
|
@ -6,68 +6,233 @@
|
|||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>487</width>
|
||||
<height>597</height>
|
||||
<width>413</width>
|
||||
<height>229</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<widget class="QRImageWidget" name="lblQRCode">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<property name="windowTitle">
|
||||
<string>Request payment to ...</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
|
||||
<property name="sizeConstraint">
|
||||
<enum>QLayout::SetFixedSize</enum>
|
||||
</property>
|
||||
<item row="0" column="0" colspan="2" alignment="Qt::AlignHCenter">
|
||||
<widget class="QRImageWidget" name="qr_code">
|
||||
<property name="text">
|
||||
<string notr="true">QR image</string>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>300</width>
|
||||
<height>320</height>
|
||||
</size>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>QR Code</string>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0" colspan="2">
|
||||
<widget class="QLabel" name="payment_header">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Payment information</string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="uri_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true">URI:</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="uri_content">
|
||||
<property name="text">
|
||||
<string notr="true">bitcoin:BC1...</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QTextEdit" name="outUri">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
<item row="3" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="address_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>50</height>
|
||||
</size>
|
||||
<property name="text">
|
||||
<string>Address:</string>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::NoFrame</enum>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Plain</enum>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="address_content">
|
||||
<property name="text">
|
||||
<string notr="true">bc1...</string>
|
||||
</property>
|
||||
<property name="tabChangesFocus">
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="amount_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Amount:</string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="amount_content">
|
||||
<property name="text">
|
||||
<string notr="true">0.00000000 BTC</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="label_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Label:</string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="label_content">
|
||||
<property name="text">
|
||||
<string notr="true">label content</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<item row="6" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="message_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Message:</string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="message_content">
|
||||
<property name="text">
|
||||
<string notr="true">message content</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="0" alignment="Qt::AlignRight|Qt::AlignTop">
|
||||
<widget class="QLabel" name="wallet_tag">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Wallet:</string>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::NoTextInteraction</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="7" column="1" alignment="Qt::AlignTop">
|
||||
<widget class="QLabel" name="wallet_content">
|
||||
<property name="text">
|
||||
<string notr="true">wallet name</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="8" column="0" colspan="2">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QPushButton" name="btnCopyURI">
|
||||
|
|
@ -114,8 +279,11 @@
|
|||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="focusPolicy">
|
||||
<enum>Qt::StrongFocus</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Close</set>
|
||||
<set>QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -130,24 +298,14 @@
|
|||
<header>qt/qrimagewidget.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<tabstops>
|
||||
<tabstop>buttonBox</tabstop>
|
||||
<tabstop>btnCopyURI</tabstop>
|
||||
<tabstop>btnCopyAddress</tabstop>
|
||||
<tabstop>btnSaveAs</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>ReceiveRequestDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>452</x>
|
||||
<y>573</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>243</x>
|
||||
<y>298</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
|
|
@ -155,12 +313,12 @@
|
|||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>452</x>
|
||||
<y>573</y>
|
||||
<x>135</x>
|
||||
<y>230</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>243</x>
|
||||
<y>298</y>
|
||||
<x>135</x>
|
||||
<y>126</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@
|
|||
#include <qt/bitcoinunits.h>
|
||||
#include <qt/guiutil.h>
|
||||
#include <qt/optionsmodel.h>
|
||||
#include <qt/qrimagewidget.h>
|
||||
#include <qt/walletmodel.h>
|
||||
|
||||
#include <QClipboard>
|
||||
#include <QPixmap>
|
||||
#include <QDialog>
|
||||
#include <QString>
|
||||
|
||||
#if defined(HAVE_CONFIG_H)
|
||||
#include <config/bitcoin-config.h> /* for USE_QRCODE */
|
||||
|
|
@ -23,14 +24,6 @@ ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
|
|||
model(nullptr)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
#ifndef USE_QRCODE
|
||||
ui->btnSaveAs->setVisible(false);
|
||||
ui->lblQRCode->setVisible(false);
|
||||
#endif
|
||||
|
||||
connect(ui->btnSaveAs, &QPushButton::clicked, ui->lblQRCode, &QRImageWidget::saveImage);
|
||||
|
||||
GUIUtil::handleCloseWindowShortcut(this);
|
||||
}
|
||||
|
||||
|
|
@ -53,40 +46,55 @@ void ReceiveRequestDialog::setModel(WalletModel *_model)
|
|||
void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &_info)
|
||||
{
|
||||
this->info = _info;
|
||||
setWindowTitle(tr("Request payment to %1").arg(info.label.isEmpty() ? info.address : info.label));
|
||||
QString uri = GUIUtil::formatBitcoinURI(info);
|
||||
|
||||
#ifdef USE_QRCODE
|
||||
if (ui->qr_code->setQR(uri, info.address)) {
|
||||
connect(ui->btnSaveAs, &QPushButton::clicked, ui->qr_code, &QRImageWidget::saveImage);
|
||||
} else {
|
||||
ui->btnSaveAs->setEnabled(false);
|
||||
}
|
||||
#else
|
||||
ui->btnSaveAs->hide();
|
||||
ui->qr_code->hide();
|
||||
#endif
|
||||
|
||||
ui->uri_content->setText("<a href=\"" + uri + "\">" + GUIUtil::HtmlEscape(uri) + "</a>");
|
||||
ui->address_content->setText(info.address);
|
||||
|
||||
if (!info.amount) {
|
||||
ui->amount_tag->hide();
|
||||
ui->amount_content->hide();
|
||||
} // Amount is set in update() slot.
|
||||
update();
|
||||
|
||||
if (!info.label.isEmpty()) {
|
||||
ui->label_content->setText(info.label);
|
||||
} else {
|
||||
ui->label_tag->hide();
|
||||
ui->label_content->hide();
|
||||
}
|
||||
|
||||
if (!info.message.isEmpty()) {
|
||||
ui->message_content->setText(info.message);
|
||||
} else {
|
||||
ui->message_tag->hide();
|
||||
ui->message_content->hide();
|
||||
}
|
||||
|
||||
if (!model->getWalletName().isEmpty()) {
|
||||
ui->wallet_content->setText(model->getWalletName());
|
||||
} else {
|
||||
ui->wallet_tag->hide();
|
||||
ui->wallet_content->hide();
|
||||
}
|
||||
}
|
||||
|
||||
void ReceiveRequestDialog::update()
|
||||
{
|
||||
if(!model)
|
||||
return;
|
||||
QString target = info.label;
|
||||
if(target.isEmpty())
|
||||
target = info.address;
|
||||
setWindowTitle(tr("Request payment to %1").arg(target));
|
||||
|
||||
QString uri = GUIUtil::formatBitcoinURI(info);
|
||||
ui->btnSaveAs->setEnabled(false);
|
||||
QString html;
|
||||
html += "<html><font face='verdana, arial, helvetica, sans-serif'>";
|
||||
html += "<b>"+tr("Payment information")+"</b><br>";
|
||||
html += "<b>"+tr("URI")+"</b>: ";
|
||||
html += "<a href=\""+uri+"\">" + GUIUtil::HtmlEscape(uri) + "</a><br>";
|
||||
html += "<b>"+tr("Address")+"</b>: " + GUIUtil::HtmlEscape(info.address) + "<br>";
|
||||
if(info.amount)
|
||||
html += "<b>"+tr("Amount")+"</b>: " + BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount) + "<br>";
|
||||
if(!info.label.isEmpty())
|
||||
html += "<b>"+tr("Label")+"</b>: " + GUIUtil::HtmlEscape(info.label) + "<br>";
|
||||
if(!info.message.isEmpty())
|
||||
html += "<b>"+tr("Message")+"</b>: " + GUIUtil::HtmlEscape(info.message) + "<br>";
|
||||
if(model->isMultiwallet()) {
|
||||
html += "<b>"+tr("Wallet")+"</b>: " + GUIUtil::HtmlEscape(model->getWalletName()) + "<br>";
|
||||
}
|
||||
ui->outUri->setText(html);
|
||||
|
||||
if (ui->lblQRCode->setQR(uri, info.address)) {
|
||||
ui->btnSaveAs->setEnabled(true);
|
||||
}
|
||||
if (!model) return;
|
||||
ui->amount_content->setText(BitcoinUnits::formatWithUnit(model->getOptionsModel()->getDisplayUnit(), info.amount));
|
||||
}
|
||||
|
||||
void ReceiveRequestDialog::on_btnCopyURI_clicked()
|
||||
|
|
|
|||
|
|
@ -229,15 +229,23 @@ void TestGUI(interfaces::Node& node)
|
|||
for (QWidget* widget : QApplication::topLevelWidgets()) {
|
||||
if (widget->inherits("ReceiveRequestDialog")) {
|
||||
ReceiveRequestDialog* receiveRequestDialog = qobject_cast<ReceiveRequestDialog*>(widget);
|
||||
QTextEdit* rlist = receiveRequestDialog->QObject::findChild<QTextEdit*>("outUri");
|
||||
QString paymentText = rlist->toPlainText();
|
||||
QStringList paymentTextList = paymentText.split('\n');
|
||||
QCOMPARE(paymentTextList.at(0), QString("Payment information"));
|
||||
QVERIFY(paymentTextList.at(1).indexOf(QString("URI: bitcoin:")) != -1);
|
||||
QVERIFY(paymentTextList.at(2).indexOf(QString("Address:")) != -1);
|
||||
QCOMPARE(paymentTextList.at(3), QString("Amount: 0.00000001 ") + QString::fromStdString(CURRENCY_UNIT));
|
||||
QCOMPARE(paymentTextList.at(4), QString("Label: TEST_LABEL_1"));
|
||||
QCOMPARE(paymentTextList.at(5), QString("Message: TEST_MESSAGE_1"));
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("payment_header")->text(), QString("Payment information"));
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("uri_tag")->text(), QString("URI:"));
|
||||
QString uri = receiveRequestDialog->QObject::findChild<QLabel*>("uri_content")->text();
|
||||
QCOMPARE(uri.count("bitcoin:"), 2);
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("address_tag")->text(), QString("Address:"));
|
||||
|
||||
QCOMPARE(uri.count("amount=0.00000001"), 2);
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("amount_tag")->text(), QString("Amount:"));
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("amount_content")->text(), QString("0.00000001 ") + QString::fromStdString(CURRENCY_UNIT));
|
||||
|
||||
QCOMPARE(uri.count("label=TEST_LABEL_1"), 2);
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("label_tag")->text(), QString("Label:"));
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("label_content")->text(), QString("TEST_LABEL_1"));
|
||||
|
||||
QCOMPARE(uri.count("message=TEST_MESSAGE_1"), 2);
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("message_tag")->text(), QString("Message:"));
|
||||
QCOMPARE(receiveRequestDialog->QObject::findChild<QLabel*>("message_content")->text(), QString("TEST_MESSAGE_1"));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue