Skip to content

Commit d843db7

Browse files
committed
Qt: remove "new" button during receive-mode in addressbook
1 parent 00d1680 commit d843db7

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

src/qt/addressbookpage.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,12 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
104104
case SendingTab:
105105
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins."));
106106
ui->deleteAddress->setVisible(true);
107+
ui->newAddress->setVisible(true);
107108
break;
108109
case ReceivingTab:
109110
ui->labelExplanation->setText(tr("These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction."));
110111
ui->deleteAddress->setVisible(false);
112+
ui->newAddress->setVisible(false);
111113
break;
112114
}
113115

@@ -211,10 +213,11 @@ void AddressBookPage::on_newAddress_clicked()
211213
if(!model)
212214
return;
213215

214-
EditAddressDialog dlg(
215-
tab == SendingTab ?
216-
EditAddressDialog::NewSendingAddress :
217-
EditAddressDialog::NewReceivingAddress, this);
216+
if (tab == ReceivingTab) {
217+
return;
218+
}
219+
220+
EditAddressDialog dlg(EditAddressDialog::NewSendingAddress, this);
218221
dlg.setModel(model);
219222
if(dlg.exec())
220223
{

src/qt/editaddressdialog.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
2626

2727
switch(mode)
2828
{
29-
case NewReceivingAddress:
30-
setWindowTitle(tr("New receiving address"));
31-
ui->addressEdit->setEnabled(false);
32-
break;
3329
case NewSendingAddress:
3430
setWindowTitle(tr("New sending address"));
3531
break;
@@ -74,10 +70,9 @@ bool EditAddressDialog::saveCurrentRow()
7470

7571
switch(mode)
7672
{
77-
case NewReceivingAddress:
7873
case NewSendingAddress:
7974
address = model->addRow(
80-
mode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive,
75+
AddressTableModel::Send,
8176
ui->labelEdit->text(),
8277
ui->addressEdit->text(),
8378
g_address_type);

src/qt/editaddressdialog.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class EditAddressDialog : public QDialog
2525

2626
public:
2727
enum Mode {
28-
NewReceivingAddress,
2928
NewSendingAddress,
3029
EditReceivingAddress,
3130
EditSendingAddress

0 commit comments

Comments
 (0)