make send coins dialog more user friendly (better checking)

This commit is contained in:
Wladimir J. van der Laan 2011-05-15 19:31:20 +02:00
parent 85663f2c18
commit 992ff49b43
6 changed files with 68 additions and 30 deletions

4
TODO
View file

@ -92,3 +92,7 @@ Todo:
- Check windows support / cross platform
Check send dialog:
1MCwBbhNGp5hRm5rC1Aims2YFRe2SXPYKt

View file

@ -64,6 +64,9 @@
<property name="text">
<string>&amp;Paste</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="3" column="3">
@ -71,6 +74,9 @@
<property name="text">
<string>Address &amp;Book...</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1">
@ -124,6 +130,9 @@
<iconset resource="../bitcoin.qrc">
<normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
@ -146,22 +155,5 @@
<resources>
<include location="../bitcoin.qrc"/>
</resources>
<connections>
<connection>
<sender>payAmount</sender>
<signal>returnPressed()</signal>
<receiver>sendButton</receiver>
<slot>click()</slot>
<hints>
<hint type="sourcelabel">
<x>191</x>
<y>65</y>
</hint>
<hint type="destinationlabel">
<x>570</x>
<y>121</y>
</hint>
</hints>
</connection>
</connections>
<connections/>
</ui>

View file

@ -12,7 +12,7 @@ class SendCoinsDialog : public QDialog
Q_OBJECT
public:
explicit SendCoinsDialog(QWidget *parent = 0);
explicit SendCoinsDialog(QWidget *parent = 0, const QString &address = "");
~SendCoinsDialog();
private:

View file

@ -127,6 +127,12 @@ void AddressBookDialog::on_buttonBox_accepted()
QVariant address = table->model()->data(index);
returnValue = address.toString();
}
accept();
if(!returnValue.isEmpty())
{
accept();
}
else
{
reject();
}
}

View file

@ -211,7 +211,12 @@ void BitcoinGUI::addressbookClicked()
qDebug() << "Address book clicked";
AddressBookDialog dlg;
dlg.setTab(AddressBookDialog::SendingTab);
dlg.exec();
/* if an address accepted, do a 'send' to specified address */
if(dlg.exec())
{
SendCoinsDialog send(0, dlg.getReturnValue());
send.exec();
}
}
void BitcoinGUI::receivingAddressesClicked()

View file

@ -6,17 +6,31 @@
#include <QApplication>
#include <QClipboard>
#include <QMessageBox>
#include <QLocale>
#include "base58.h"
SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
SendCoinsDialog::SendCoinsDialog(QWidget *parent, const QString &address) :
QDialog(parent),
ui(new Ui::SendCoinsDialog)
{
ui->setupUi(this);
/* Set up validators */
ui->payTo->setMaxLength(BitcoinAddressValidator::MaxAddressLength);
ui->payTo->setValidator(new BitcoinAddressValidator(this));
ui->payAmount->setValidator(new QDoubleValidator(this));
QDoubleValidator *amountValidator = new QDoubleValidator(this);
amountValidator->setDecimals(8);
amountValidator->setBottom(0.0);
ui->payAmount->setValidator(amountValidator);
/* Set initial address if provided */
if(!address.isEmpty())
{
ui->payTo->setText(address);
ui->payAmount->setFocus();
}
}
SendCoinsDialog::~SendCoinsDialog()
@ -28,14 +42,31 @@ void SendCoinsDialog::on_sendButton_clicked()
{
QByteArray payTo = ui->payTo->text().toUtf8();
uint160 payToHash = 0;
if(AddressToHash160(payTo.constData(), payToHash))
{
accept();
}
else
{
double payAmount = 0.0;
bool valid = false;
if(!AddressToHash160(payTo.constData(), payToHash))
{
QMessageBox::warning(this, tr("Warning"),
tr("The recepient address is not valid, please recheck."),
QMessageBox::Ok,
QMessageBox::Ok);
ui->payTo->setFocus();
return;
}
payAmount = QLocale::system().toDouble(ui->payAmount->text(), &valid);
if(!valid || payAmount <= 0.0)
{
QMessageBox::warning(this, tr("Warning"),
tr("The amount to pay must be a valid number larger than 0."),
QMessageBox::Ok,
QMessageBox::Ok);
ui->payAmount->setFocus();
return;
}
/* TODO: send command to core, once this succeeds do accept() */
accept();
}
void SendCoinsDialog::on_pasteButton_clicked()