Remove "default address" from main GUI screen, it only confuses people

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

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 4e5eaa0..eeca18e 100644 (file)
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -18,8 +18,6 @@
 #include "addresstablemodel.h"
 #include "transactionview.h"
 
-#include "headers.h"
-
 #include <QApplication>
 #include <QMainWindow>
 #include <QMenuBar>
@@ -72,24 +70,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
     toolbar->addAction(sendcoins);
     toolbar->addAction(addressbook);
-
-    // Address: <address>: New... : Paste to clipboard
-    QHBoxLayout *hbox_address = new QHBoxLayout();
-    hbox_address->addWidget(new QLabel(tr("Your Bitcoin address:")));
-    address = new QLineEdit();
-    address->setReadOnly(true);
-    address->setFont(GUIUtil::bitcoinAddressFont());
-    address->setToolTip(tr("Your current default receiving address"));
-    hbox_address->addWidget(address);
-    
-    QPushButton *button_new = new QPushButton(tr("&New address..."));
-    button_new->setToolTip(tr("Create new receiving address"));
-    button_new->setIcon(QIcon(":/icons/add"));
-    QPushButton *button_clipboard = new QPushButton(tr("&Copy to clipboard"));
-    button_clipboard->setToolTip(tr("Copy current receiving address to the system clipboard"));
-    button_clipboard->setIcon(QIcon(":/icons/editcopy"));
-    hbox_address->addWidget(button_new);
-    hbox_address->addWidget(button_clipboard);
+    toolbar->addAction(receivingAddresses);
 
     // Balance: <balance>
     QHBoxLayout *hbox_balance = new QHBoxLayout();
@@ -103,7 +84,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     hbox_balance->addStretch(1);
     
     QVBoxLayout *vbox = new QVBoxLayout();
-    vbox->addLayout(hbox_address);
     vbox->addLayout(hbox_balance);
 
     transactionView = new TransactionView(this);
@@ -145,10 +125,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     statusBar()->addPermanentWidget(labelBlocks);
     statusBar()->addPermanentWidget(labelTransactions);
 
-    // Action bindings
-    connect(button_new, SIGNAL(clicked()), this, SLOT(newAddressClicked()));
-    connect(button_clipboard, SIGNAL(clicked()), this, SLOT(copyClipboardClicked()));
-
     createTrayIcon();
 }
 
@@ -162,8 +138,8 @@ void BitcoinGUI::createActions()
     addressbook->setToolTip(tr("Edit the list of stored addresses and labels"));
     about = new QAction(QIcon(":/icons/bitcoin"), tr("&About"), this);
     about->setToolTip(tr("Show information about Bitcoin"));
-    receivingAddresses = new QAction(QIcon(":/icons/receiving_addresses"), tr("Your &Receiving Addresses..."), this);
-    receivingAddresses->setToolTip(tr("Show the list of receiving addresses and edit their labels"));
+    receivingAddresses = new QAction(QIcon(":/icons/receiving_addresses"), tr("&Receiving Addresses..."), this);
+    receivingAddresses->setToolTip(tr("Show the list of addresses for receiving payments"));
     options = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
     options->setToolTip(tr("Modify configuration options for bitcoin"));
     openBitcoin = new QAction(QIcon(":/icons/bitcoin"), "Open &Bitcoin", this);
@@ -215,9 +191,6 @@ void BitcoinGUI::setWalletModel(WalletModel *walletModel)
     setNumTransactions(walletModel->getNumTransactions());
     connect(walletModel, SIGNAL(numTransactionsChanged(int)), this, SLOT(setNumTransactions(int)));
 
-    setAddress(walletModel->getAddressTableModel()->getDefaultAddress());
-    connect(walletModel->getAddressTableModel(), SIGNAL(defaultAddressChanged(QString)), this, SLOT(setAddress(QString)));
-
     // Report errors from wallet thread
     connect(walletModel, SIGNAL(error(QString,QString)), this, SLOT(error(QString,QString)));
 
@@ -289,33 +262,13 @@ void BitcoinGUI::optionsClicked()
 void BitcoinGUI::aboutClicked()
 {
     AboutDialog dlg;
+    dlg.setModel(clientModel);
     dlg.exec();
 }
 
-void BitcoinGUI::newAddressClicked()
-{
-    EditAddressDialog dlg(EditAddressDialog::NewReceivingAddress);
-    dlg.setModel(walletModel->getAddressTableModel());
-    if(dlg.exec())
-    {
-        QString newAddress = dlg.saveCurrentRow();
-    }
-}
-
-void BitcoinGUI::copyClipboardClicked()
-{
-    // Copy text in address to clipboard
-    QApplication::clipboard()->setText(address->text());
-}
-
 void BitcoinGUI::setBalance(qint64 balance)
 {
-    labelBalance->setText(QString::fromStdString(FormatMoney(balance)) + QString(" BTC"));
-}
-
-void BitcoinGUI::setAddress(const QString &addr)
-{
-    address->setText(addr);
+    labelBalance->setText(GUIUtil::formatMoney(balance) + QString(" BTC"));
 }
 
 void BitcoinGUI::setNumConnections(int count)
@@ -409,7 +362,7 @@ void BitcoinGUI::askFee(qint64 nFeeRequired, bool *payFee)
     QString strMessage =
         tr("This transaction is over the size limit.  You can still send it for a fee of %1, "
           "which goes to the nodes that process your transaction and helps to support the network.  "
-          "Do you want to pay the fee?").arg(QString::fromStdString(FormatMoney(nFeeRequired)));
+          "Do you want to pay the fee?").arg(GUIUtil::formatMoney(nFeeRequired));
     QMessageBox::StandardButton retval = QMessageBox::question(
           this, tr("Sending..."), strMessage,
           QMessageBox::Yes|QMessageBox::Cancel, QMessageBox::Yes);
@@ -441,7 +394,7 @@ void BitcoinGUI::incomingTransaction(const QModelIndex & parent, int start, int
 
         trayIcon->showMessage(tr("Incoming transaction"),
                               tr("Date: ") + date + "\n" +
-                              tr("Amount: ") + QString::fromStdString(FormatMoney(amount, true)) + "\n" +
+                              tr("Amount: ") + GUIUtil::formatMoney(amount, true) + "\n" +
                               tr("Type: ") + type + "\n" +
                               tr("Address: ") + address + "\n",
                               QSystemTrayIcon::Information);