Skip to content

Commit f193c57

Browse files
laanwjlaanwj
committed
introduce bitcoin amount field with split amount/decimals, to protect against mistakes (https://forum.bitcoin.org/index.php?topic=19168.0)
1 parent 18b99e3 commit f193c57

File tree

6 files changed

+130
-24
lines changed

6 files changed

+130
-24
lines changed

‎bitcoin-qt.pro‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ HEADERS += src/qt/bitcoingui.h \
6868
src/qt/monitoreddatamapper.h \
6969
src/externui.h \
7070
src/qt/transactiondesc.h \
71-
src/qt/transactiondescdialog.h
71+
src/qt/transactiondescdialog.h \
72+
src/qt/bitcoinamountfield.h
7273
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
7374
src/qt/transactiontablemodel.cpp \
7475
src/qt/addresstablemodel.cpp \
@@ -98,7 +99,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
9899
src/qt/monitoreddatamapper.cpp \
99100
src/qt/transactiondesc.cpp \
100101
src/qt/transactiondescdialog.cpp \
101-
src/qt/bitcoinstrings.cpp
102+
src/qt/bitcoinstrings.cpp \
103+
src/qt/bitcoinamountfield.cpp
102104

103105
RESOURCES += \
104106
src/qt/bitcoin.qrc

‎src/qt/bitcoinamountfield.cpp‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#include "bitcoinamountfield.h"
2+
3+
#include <QLabel>
4+
#include <QLineEdit>
5+
#include <QRegExpValidator>
6+
#include <QHBoxLayout>
7+
#include <QKeyEvent>
8+
9+
BitcoinAmountField::BitcoinAmountField(QWidget *parent):
10+
QWidget(parent), amount(0), decimals(0)
11+
{
12+
amount = new QLineEdit(this);
13+
amount->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
14+
amount->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
15+
amount->installEventFilter(this);
16+
amount->setMaximumWidth(80);
17+
decimals = new QLineEdit(this);
18+
decimals->setValidator(new QRegExpValidator(QRegExp("[0-9]+"), this));
19+
decimals->setMaxLength(8);
20+
decimals->setAlignment(Qt::AlignLeft|Qt::AlignVCenter);
21+
decimals->setMaximumWidth(75);
22+
23+
QHBoxLayout *layout = new QHBoxLayout(this);
24+
layout->setSpacing(0);
25+
layout->addWidget(amount);
26+
layout->addWidget(new QLabel(QString(".")));
27+
layout->addWidget(decimals);
28+
layout->addStretch(1);
29+
30+
setFocusPolicy(Qt::TabFocus);
31+
setLayout(layout);
32+
setFocusProxy(amount);
33+
34+
// If one if the widgets changes, the combined content changes as well
35+
connect(amount, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged()));
36+
connect(decimals, SIGNAL(textChanged(QString)), this, SIGNAL(textChanged()));
37+
}
38+
39+
void BitcoinAmountField::setText(const QString &text)
40+
{
41+
const QStringList parts = text.split(QString("."));
42+
if(parts.size() == 2)
43+
{
44+
amount->setText(parts[0]);
45+
decimals->setText(parts[1]);
46+
}
47+
}
48+
49+
QString BitcoinAmountField::text() const
50+
{
51+
return amount->text() + QString(".") + decimals->text();
52+
}
53+
54+
// Intercept '.' and ',' keys, if pressed focus a specified widget
55+
bool BitcoinAmountField::eventFilter(QObject *object, QEvent *event)
56+
{
57+
Q_UNUSED(object);
58+
if(event->type() == QEvent::KeyPress)
59+
{
60+
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
61+
if(keyEvent->key() == Qt::Key_Period || keyEvent->key() == Qt::Key_Comma)
62+
{
63+
decimals->setFocus();
64+
}
65+
}
66+
return false;
67+
}

‎src/qt/bitcoinamountfield.h‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#ifndef BITCOINFIELD_H
2+
#define BITCOINFIELD_H
3+
4+
#include <QWidget>
5+
6+
QT_BEGIN_NAMESPACE
7+
class QLineEdit;
8+
QT_END_NAMESPACE
9+
10+
class BitcoinAmountField: public QWidget
11+
{
12+
Q_OBJECT
13+
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true);
14+
public:
15+
explicit BitcoinAmountField(QWidget *parent = 0);
16+
17+
void setText(const QString &text);
18+
QString text() const;
19+
20+
signals:
21+
void textChanged();
22+
23+
protected:
24+
// Intercept '.' and ',' keys, if pressed focus a specified widget
25+
bool eventFilter(QObject *object, QEvent *event);
26+
27+
private:
28+
QLineEdit *amount;
29+
QLineEdit *decimals;
30+
};
31+
32+
33+
#endif // BITCOINFIELD_H

‎src/qt/forms/sendcoinsdialog.ui‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,6 @@
5252
</property>
5353
</widget>
5454
</item>
55-
<item row="4" column="1">
56-
<widget class="QLineEdit" name="payAmount">
57-
<property name="maximumSize">
58-
<size>
59-
<width>145</width>
60-
<height>16777215</height>
61-
</size>
62-
</property>
63-
<property name="toolTip">
64-
<string>Amount of bitcoins to send (e.g. 0.05)</string>
65-
</property>
66-
<property name="alignment">
67-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
68-
</property>
69-
</widget>
70-
</item>
7155
<item row="3" column="2">
7256
<widget class="QPushButton" name="pasteButton">
7357
<property name="toolTip">
@@ -106,6 +90,13 @@
10690
</property>
10791
</widget>
10892
</item>
93+
<item row="4" column="1">
94+
<widget class="BitcoinAmountField" name="payAmount" native="true">
95+
<property name="focusPolicy">
96+
<enum>Qt::TabFocus</enum>
97+
</property>
98+
</widget>
99+
</item>
109100
</layout>
110101
</item>
111102
<item>
@@ -173,6 +164,22 @@
173164
</item>
174165
</layout>
175166
</widget>
167+
<customwidgets>
168+
<customwidget>
169+
<class>BitcoinAmountField</class>
170+
<extends>QWidget</extends>
171+
<header>bitcoinamountfield.h</header>
172+
<container>1</container>
173+
</customwidget>
174+
</customwidgets>
175+
<tabstops>
176+
<tabstop>payTo</tabstop>
177+
<tabstop>payAmount</tabstop>
178+
<tabstop>pasteButton</tabstop>
179+
<tabstop>addressBookButton</tabstop>
180+
<tabstop>sendButton</tabstop>
181+
<tabstop>buttonBox</tabstop>
182+
</tabstops>
176183
<resources>
177184
<include location="../bitcoin.qrc"/>
178185
</resources>

‎src/qt/optionsdialog.cpp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include "optionsdialog.h"
22
#include "optionsmodel.h"
3+
#include "bitcoinamountfield.h"
34
#include "monitoreddatamapper.h"
45
#include "guiutil.h"
56

@@ -31,7 +32,7 @@ class MainOptionsPage : public QWidget
3132
QCheckBox *connect_socks4;
3233
QLineEdit *proxy_ip;
3334
QLineEdit *proxy_port;
34-
QLineEdit *fee_edit;
35+
BitcoinAmountField *fee_edit;
3536

3637
signals:
3738

@@ -195,12 +196,9 @@ MainOptionsPage::MainOptionsPage(QWidget *parent):
195196
fee_hbox->addSpacing(18);
196197
QLabel *fee_label = new QLabel(tr("Pay transaction &fee"));
197198
fee_hbox->addWidget(fee_label);
198-
fee_edit = new QLineEdit();
199-
fee_edit->setMaximumWidth(100);
199+
fee_edit = new BitcoinAmountField();
200200
fee_edit->setToolTip(tr("Optional transaction fee per KB that helps make sure your transactions are processed quickly. Most transactions are 1KB. Fee 0.01 recommended."));
201201

202-
GUIUtil::setupAmountWidget(fee_edit, this);
203-
204202
fee_label->setBuddy(fee_edit);
205203
fee_hbox->addWidget(fee_edit);
206204
fee_hbox->addStretch(1);

‎src/qt/sendcoinsdialog.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent, const QString &address) :
2323
ui->setupUi(this);
2424

2525
GUIUtil::setupAddressWidget(ui->payTo, this);
26-
GUIUtil::setupAmountWidget(ui->payAmount, this);
2726

2827
// Set initial send-to address if provided
2928
if(!address.isEmpty())

0 commit comments

Comments
 (0)