Rename "History" tab to more logical "Transactions", move "Number of transactions...

[novacoin.git] / src / qt / sendcoinsdialog.cpp

diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index d83962d..4b97437 100644 (file)
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -1,6 +1,6 @@
 #include "sendcoinsdialog.h"
 #include "ui_sendcoinsdialog.h"
-#include "clientmodel.h"
+#include "walletmodel.h"
 #include "guiutil.h"
 
 #include "addressbookdialog.h"
@@ -18,7 +18,9 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent, const QString &address) :
     model(0)
 {
     ui->setupUi(this);
-
+#if QT_VERSION >= 0x040700
+    ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
+#endif
     GUIUtil::setupAddressWidget(ui->payTo, this);
 
     // Set initial send-to address if provided
@@ -29,7 +31,7 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent, const QString &address) :
     }
 }
 
-void SendCoinsDialog::setModel(ClientModel *model)
+void SendCoinsDialog::setModel(WalletModel *model)
 {
     this->model = model;
 }
@@ -56,40 +58,37 @@ void SendCoinsDialog::on_sendButton_clicked()
         return;
     }
 
-    if(ui->addToAddressBook->isChecked())
-    {
-        // Add address to address book under label, if specified
-        label = ui->addAsLabel->text();
-    }
+    // Add address to address book under label, if specified
+    label = ui->addAsLabel->text();
 
     switch(model->sendCoins(ui->payTo->text(), payAmountParsed, label))
     {
-    case ClientModel::InvalidAddress:
+    case WalletModel::InvalidAddress:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("The recepient address is not valid, please recheck."),
             QMessageBox::Ok, QMessageBox::Ok);
         ui->payTo->setFocus();
         break;
-    case ClientModel::InvalidAmount:
+    case WalletModel::InvalidAmount:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("The amount to pay must be larger than 0."),
             QMessageBox::Ok, QMessageBox::Ok);
         ui->payAmount->setFocus();
         break;
-    case ClientModel::AmountExceedsBalance:
+    case WalletModel::AmountExceedsBalance:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("Amount exceeds your balance"),
             QMessageBox::Ok, QMessageBox::Ok);
         ui->payAmount->setFocus();
         break;
-    case ClientModel::AmountWithFeeExceedsBalance:
+    case WalletModel::AmountWithFeeExceedsBalance:
         QMessageBox::warning(this, tr("Send Coins"),
             tr("Total exceeds your balance when the %1 transaction fee is included").
             arg(GUIUtil::formatMoney(model->getOptionsModel()->getTransactionFee())),
             QMessageBox::Ok, QMessageBox::Ok);
         ui->payAmount->setFocus();
         break;
-    case ClientModel::OK:
+    case WalletModel::OK:
         accept();
         break;
     }
@@ -108,6 +107,7 @@ void SendCoinsDialog::on_addressBookButton_clicked()
     dlg.setTab(AddressBookDialog::SendingTab);
     dlg.exec();
     ui->payTo->setText(dlg.getReturnValue());
+    ui->payAmount->setFocus();
 }
 
 void SendCoinsDialog::on_buttonBox_rejected()
@@ -115,7 +115,7 @@ void SendCoinsDialog::on_buttonBox_rejected()
     reject();
 }
 
-void SendCoinsDialog::on_addToAddressBook_toggled(bool checked)
+void SendCoinsDialog::on_payTo_textChanged(const QString &address)
 {
-    ui->addAsLabel->setEnabled(checked);
+    ui->addAsLabel->setText(model->labelForAddress(address));
 }