kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

qt: show payment information in one text area 

Simplifies the dialog (makes it look less crowded) as well
as the code and makes it possible to copy multiple fields at once.
Also format bitcoin URI as URI, add copy button for URI.
0.10
Wladimir J. van der Laan 11 years ago
parent
786b066f03
commit
33a2febf5d
4 changed files with 84 additions and 219 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 175
      src/qt/forms/receiverequestdialog.ui
  2. 3
      src/qt/receivecoinsdialog.cpp
  3. 83
      src/qt/receiverequestdialog.cpp
  4. 12
      src/qt/receiverequestdialog.h

175
src/qt/forms/receiverequestdialog.ui
Unescape View File

@ -17,7 +17,7 @@
<item> <item>
<widget class="QRImageWidget" name="lblQRCode"> <widget class="QRImageWidget" name="lblQRCode">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -40,40 +40,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QTextEdit" name="outUri">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnSaveAs">
<property name="text">
<string>&amp;Save Image...</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Bitcoin URI:</string>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="outUri">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -93,130 +62,38 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_2"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="text">
<string>Payment information:</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <spacer name="horizontalSpacer">
<property name="fieldGrowthPolicy"> <property name="orientation">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>Qt::Horizontal</enum>
</property>
<item row="2" column="0">
<widget class="QLabel" name="lblLabel">
<property name="text">
<string>Label:</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>lnLabel</cstring>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lnLabel">
<property name="enabled">
<bool>true</bool>
</property> </property>
<property name="readOnly"> <property name="sizeHint" stdset="0">
<bool>true</bool> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="3" column="0"> <item>
<widget class="QLabel" name="lblMessage"> <widget class="QPushButton" name="btnCopyURI">
<property name="text"> <property name="text">
<string>Message:</string> <string>Copy &amp;URI</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>lnMessage</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lnMessage">
<property name="enabled">
<bool>true</bool>
</property>
<property name="readOnly">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item>
<widget class="QLabel" name="lblAmount"> <widget class="QPushButton" name="btnCopyImage">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text"> <property name="text">
<string>Amount:</string> <string>&amp;Copy Image</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>lnReqAmount</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item>
<widget class="BitcoinAmountField" name="lnReqAmount" native="true"> <widget class="QPushButton" name="btnSaveAs">
<property name="enabled">
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="readOnly" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>Address:</string> <string>&amp;Save Image...</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="buddy">
<cstring>reqAddress</cstring>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="lnAddress">
<property name="readOnly">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -224,15 +101,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<customwidgets> <customwidgets>
<customwidget>
<class>BitcoinAmountField</class>
<extends>QWidget</extends>
<header>bitcoinamountfield.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QRImageWidget</class> <class>QRImageWidget</class>
<extends>QLabel</extends> <extends>QLabel</extends>

3
src/qt/receivecoinsdialog.cpp
Unescape View File

@ -98,8 +98,9 @@ void ReceiveCoinsDialog::on_receiveButton_clicked()
} }
SendCoinsRecipient info(address, label, SendCoinsRecipient info(address, label,
ui->reqAmount->value(), ui->reqMessage->text()); ui->reqAmount->value(), ui->reqMessage->text());
ReceiveRequestDialog *dialog = new ReceiveRequestDialog(info, this); ReceiveRequestDialog *dialog = new ReceiveRequestDialog(this);
dialog->setModel(model->getOptionsModel()); dialog->setModel(model->getOptionsModel());
dialog->setInfo(info);
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->show(); dialog->show();
clear(); clear();

83
src/qt/receiverequestdialog.cpp
Unescape View File

@ -9,6 +9,9 @@
#include <QPixmap> #include <QPixmap>
#include <QClipboard> #include <QClipboard>
#include <QMouseEvent>
#include <QDrag>
#include <QMimeData>
#if QT_VERSION < 0x050000 #if QT_VERSION < 0x050000
#include <QUrl> #include <QUrl>
#endif #endif
@ -64,34 +67,21 @@ void QRImageWidget::copyImage()
QApplication::clipboard()->setImage(exportImage()); QApplication::clipboard()->setImage(exportImage());
} }
ReceiveRequestDialog::ReceiveRequestDialog(const SendCoinsRecipient &info, QWidget *parent) : ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
ui(new Ui::ReceiveRequestDialog), ui(new Ui::ReceiveRequestDialog),
model(0), model(0)
info(info)
{ {
ui->setupUi(this); ui->setupUi(this);
QString target = info.label;
if(target.isEmpty())
target = info.address;
setWindowTitle(tr("Request payment to %1").arg(target));
ui->lnAddress->setText(info.address);
if(info.amount)
ui->lnReqAmount->setValue(info.amount);
ui->lnReqAmount->setReadOnly(true);
ui->lnLabel->setText(info.label);
ui->lnMessage->setText(info.message);
#ifndef USE_QRCODE #ifndef USE_QRCODE
ui->btnSaveAs->setVisible(false); ui->btnSaveAs->setVisible(false);
ui->btnCopyImage->setVisible(false);
ui->lblQRCode->setVisible(false); ui->lblQRCode->setVisible(false);
#endif #endif
connect(ui->btnSaveAs, SIGNAL(clicked()), ui->lblQRCode, SLOT(saveImage())); connect(ui->btnSaveAs, SIGNAL(clicked()), ui->lblQRCode, SLOT(saveImage()));
connect(ui->btnCopyImage, SIGNAL(clicked()), ui->lblQRCode, SLOT(copyImage()));
genCode();
} }
ReceiveRequestDialog::~ReceiveRequestDialog() ReceiveRequestDialog::~ReceiveRequestDialog()
@ -104,17 +94,42 @@ void ReceiveRequestDialog::setModel(OptionsModel *model)
this->model = model; this->model = model;
if (model) if (model)
connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(updateDisplayUnit())); connect(model, SIGNAL(displayUnitChanged(int)), this, SLOT(update()));
// update the display unit, to not use the default ("BTC") // update the display unit if necessary
updateDisplayUnit(); update();
} }
void ReceiveRequestDialog::genCode() void ReceiveRequestDialog::setInfo(const SendCoinsRecipient &info)
{ {
this->info = info;
update();
}
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); QString uri = GUIUtil::formatBitcoinURI(info);
ui->btnSaveAs->setEnabled(false); ui->btnSaveAs->setEnabled(false);
ui->outUri->setPlainText(uri); QString html;
html += "<html><font face='verdana, arial, helvetica, sans-serif'>";
html += "<a href=\""+uri+"\">" + GUIUtil::HtmlEscape(uri) + "</a><br>";
html += "<br>";
html += "<b>"+tr("Payment information")+"</b><br>";
html += "<b>"+tr("Address")+"</b>: " + GUIUtil::HtmlEscape(info.address) + "<br>";
if(info.amount)
html += "<b>"+tr("Amount")+"</b>: " + BitcoinUnits::formatWithUnit(model->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>";
ui->outUri->setText(html);
#ifdef USE_QRCODE #ifdef USE_QRCODE
ui->lblQRCode->setText(""); ui->lblQRCode->setText("");
@ -151,26 +166,10 @@ void ReceiveRequestDialog::genCode()
#endif #endif
} }
void ReceiveRequestDialog::on_lnReqAmount_textChanged() void ReceiveRequestDialog::on_btnCopyURI_clicked()
{
genCode();
}
void ReceiveRequestDialog::on_lnLabel_textChanged()
{ {
genCode(); QString uri = GUIUtil::formatBitcoinURI(info);
} QApplication::clipboard()->setText(uri, QClipboard::Clipboard);
QApplication::clipboard()->setText(uri, QClipboard::Selection);
void ReceiveRequestDialog::on_lnMessage_textChanged()
{
genCode();
} }
void ReceiveRequestDialog::updateDisplayUnit()
{
if (model)
{
// Update lnReqAmount with the current unit
ui->lnReqAmount->setDisplayUnit(model->getDisplayUnit());
}
}

12
src/qt/receiverequestdialog.h
Unescape View File

@ -36,25 +36,21 @@ class ReceiveRequestDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit ReceiveRequestDialog(const SendCoinsRecipient &info, QWidget *parent = 0); explicit ReceiveRequestDialog(QWidget *parent = 0);
~ReceiveRequestDialog(); ~ReceiveRequestDialog();
void setModel(OptionsModel *model); void setModel(OptionsModel *model);
void setInfo(const SendCoinsRecipient &info);
private slots: private slots:
void on_lnReqAmount_textChanged(); void on_btnCopyURI_clicked();
void on_lnLabel_textChanged();
void on_lnMessage_textChanged();
void updateDisplayUnit(); void update();
private: private:
Ui::ReceiveRequestDialog *ui; Ui::ReceiveRequestDialog *ui;
OptionsModel *model; OptionsModel *model;
SendCoinsRecipient info; SendCoinsRecipient info;
void genCode();
QString getURI();
}; };
#endif // QRCODEDIALOG_H #endif // QRCODEDIALOG_H

Write Preview
Loading…
Cancel
Save