diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index c9718c37b..7fbdf2e9c 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -31,8 +31,6 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
ui->newAddress->setIcon(QIcon());
ui->copyAddress->setIcon(QIcon());
ui->deleteAddress->setIcon(QIcon());
- ui->verifyMessage->setIcon(QIcon());
- ui->signMessage->setIcon(QIcon());
ui->exportButton->setIcon(QIcon());
#endif
@@ -62,12 +60,10 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
case SendingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
ui->deleteAddress->setVisible(true);
- ui->signMessage->setVisible(false);
break;
case ReceivingTab:
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
ui->deleteAddress->setVisible(false);
- ui->signMessage->setVisible(true);
break;
}
@@ -75,9 +71,6 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
QAction *copyAddressAction = new QAction(ui->copyAddress->text(), this);
QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
QAction *editAction = new QAction(tr("&Edit"), this);
- QAction *sendCoinsAction = new QAction(tr("Send &Coins"), this);
- QAction *signMessageAction = new QAction(ui->signMessage->text(), this);
- QAction *verifyMessageAction = new QAction(ui->verifyMessage->text(), this);
deleteAction = new QAction(ui->deleteAddress->text(), this);
// Build context menu
@@ -88,21 +81,12 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) :
if(tab == SendingTab)
contextMenu->addAction(deleteAction);
contextMenu->addSeparator();
- if(tab == SendingTab)
- contextMenu->addAction(sendCoinsAction);
- if(tab == ReceivingTab)
- contextMenu->addAction(signMessageAction);
- else if(tab == SendingTab)
- contextMenu->addAction(verifyMessageAction);
// Connect signals for context menu actions
connect(copyAddressAction, SIGNAL(triggered()), this, SLOT(on_copyAddress_clicked()));
connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(onCopyLabelAction()));
connect(editAction, SIGNAL(triggered()), this, SLOT(onEditAction()));
connect(deleteAction, SIGNAL(triggered()), this, SLOT(on_deleteAddress_clicked()));
- connect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(onSendCoinsAction()));
- connect(signMessageAction, SIGNAL(triggered()), this, SLOT(on_signMessage_clicked()));
- connect(verifyMessageAction, SIGNAL(triggered()), this, SLOT(on_verifyMessage_clicked()));
connect(ui->tableView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextualMenu(QPoint)));
@@ -193,42 +177,6 @@ void AddressBookPage::onEditAction()
dlg.exec();
}
-void AddressBookPage::on_signMessage_clicked()
-{
- QTableView *table = ui->tableView;
- QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
-
- foreach (QModelIndex index, indexes)
- {
- QString address = index.data().toString();
- emit signMessage(address);
- }
-}
-
-void AddressBookPage::on_verifyMessage_clicked()
-{
- QTableView *table = ui->tableView;
- QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
-
- foreach (QModelIndex index, indexes)
- {
- QString address = index.data().toString();
- emit verifyMessage(address);
- }
-}
-
-void AddressBookPage::onSendCoinsAction()
-{
- QTableView *table = ui->tableView;
- QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address);
-
- foreach (QModelIndex index, indexes)
- {
- QString address = index.data().toString();
- emit sendCoins(address);
- }
-}
-
void AddressBookPage::on_newAddress_clicked()
{
if(!model)
@@ -274,20 +222,12 @@ void AddressBookPage::selectionChanged()
ui->deleteAddress->setEnabled(true);
ui->deleteAddress->setVisible(true);
deleteAction->setEnabled(true);
- ui->signMessage->setEnabled(false);
- ui->signMessage->setVisible(false);
- ui->verifyMessage->setEnabled(true);
- ui->verifyMessage->setVisible(true);
break;
case ReceivingTab:
// Deleting receiving addresses, however, is not allowed
ui->deleteAddress->setEnabled(false);
ui->deleteAddress->setVisible(false);
deleteAction->setEnabled(false);
- ui->signMessage->setEnabled(true);
- ui->signMessage->setVisible(true);
- ui->verifyMessage->setEnabled(false);
- ui->verifyMessage->setVisible(false);
break;
}
ui->copyAddress->setEnabled(true);
@@ -296,8 +236,6 @@ void AddressBookPage::selectionChanged()
{
ui->deleteAddress->setEnabled(false);
ui->copyAddress->setEnabled(false);
- ui->signMessage->setEnabled(false);
- ui->verifyMessage->setEnabled(false);
}
}
diff --git a/src/qt/addressbookpage.h b/src/qt/addressbookpage.h
index 70ff3984b..9255e5814 100644
--- a/src/qt/addressbookpage.h
+++ b/src/qt/addressbookpage.h
@@ -63,12 +63,6 @@ private slots:
void on_newAddress_clicked();
/** Copy address of currently selected address entry to clipboard */
void on_copyAddress_clicked();
- /** Open the sign message tab in the Sign/Verify Message dialog with currently selected address */
- void on_signMessage_clicked();
- /** Open the verify message tab in the Sign/Verify Message dialog with currently selected address */
- void on_verifyMessage_clicked();
- /** Open send coins dialog for currently selected address (no button) */
- void onSendCoinsAction();
/** Copy label of currently selected address entry to clipboard (no button) */
void onCopyLabelAction();
/** Edit currently selected address entry (no button) */
@@ -84,8 +78,6 @@ private slots:
void selectNewAddress(const QModelIndex &parent, int begin, int /*end*/);
signals:
- void signMessage(QString addr);
- void verifyMessage(QString addr);
void sendCoins(QString addr);
};
diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui
index 836d61024..9edaf7402 100644
--- a/src/qt/forms/addressbookpage.ui
+++ b/src/qt/forms/addressbookpage.ui
@@ -82,34 +82,6 @@
- -
-
-
- Sign a message to prove you own a Bitcoin address
-
-
- Sign &Message
-
-
-
- :/icons/edit:/icons/edit
-
-
-
- -
-
-
- Verify a message to ensure it was signed with a specified Bitcoin address
-
-
- &Verify Message
-
-
-
- :/icons/transaction_0:/icons/transaction_0
-
-
-
-