diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -110,6 +110,7 @@ "Always check the amount and the receiving address before " "sending coins.")); ui->deleteAddress->setVisible(true); + ui->newAddress->setVisible(true); break; case ReceivingTab: ui->labelExplanation->setText( @@ -117,6 +118,7 @@ "It is recommended to use a new receiving address for each " "transaction.")); ui->deleteAddress->setVisible(false); + ui->newAddress->setVisible(false); break; } @@ -225,10 +227,11 @@ return; } - EditAddressDialog dlg(tab == SendingTab - ? EditAddressDialog::NewSendingAddress - : EditAddressDialog::NewReceivingAddress, - this); + if (tab == ReceivingTab) { + return; + } + + EditAddressDialog dlg(EditAddressDialog::NewSendingAddress, this); dlg.setModel(model); if (dlg.exec()) { newAddressToSelect = dlg.getAddress(); diff --git a/src/qt/editaddressdialog.h b/src/qt/editaddressdialog.h --- a/src/qt/editaddressdialog.h +++ b/src/qt/editaddressdialog.h @@ -25,7 +25,6 @@ public: enum Mode { - NewReceivingAddress, NewSendingAddress, EditReceivingAddress, EditSendingAddress diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp --- a/src/qt/editaddressdialog.cpp +++ b/src/qt/editaddressdialog.cpp @@ -19,10 +19,6 @@ GUIUtil::setupAddressWidget(ui->addressEdit, this); switch (mode) { - case NewReceivingAddress: - setWindowTitle(tr("New receiving address")); - ui->addressEdit->setEnabled(false); - break; case NewSendingAddress: setWindowTitle(tr("New sending address")); break; @@ -64,13 +60,10 @@ } switch (mode) { - case NewReceivingAddress: case NewSendingAddress: address = model->addRow( - mode == NewSendingAddress ? AddressTableModel::Send - : AddressTableModel::Receive, - ui->labelEdit->text(), ui->addressEdit->text(), - model->GetDefaultAddressType()); + AddressTableModel::Send, ui->labelEdit->text(), + ui->addressEdit->text(), model->GetDefaultAddressType()); break; case EditReceivingAddress: case EditSendingAddress: