highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-04 04:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt, refactor: Make AddressBookPage::deleteAction a local variable

Browse Source
This commit is contained in:
Hennadii Stepanov
2021-03-30 02:21:46 +03:00
parent 773f8c1a7d
commit 1398a6536c
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/qt/addressbookpage.cpp
View File

@ -116,22 +116,23 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
QAction *copyAddressAction = new QAction(tr("&Copy Address"), this); QAction *copyAddressAction = new QAction(tr("&Copy Address"), this);
QAction *copyLabelAction = new QAction(tr("Copy &Label"), this); QAction *copyLabelAction = new QAction(tr("Copy &Label"), this);
QAction *editAction = new QAction(tr("&Edit"), this); QAction *editAction = new QAction(tr("&Edit"), this);
deleteAction = new QAction(ui->deleteAddress->text(), this);
// Build context menu // Build context menu
contextMenu = new QMenu(this); contextMenu = new QMenu(this);
contextMenu->addAction(copyAddressAction); contextMenu->addAction(copyAddressAction);
contextMenu->addAction(copyLabelAction); contextMenu->addAction(copyLabelAction);
contextMenu->addAction(editAction); contextMenu->addAction(editAction);
if(tab == SendingTab) if (tab == SendingTab) {
QAction* deleteAction = new QAction(ui->deleteAddress->text(), this);
contextMenu->addAction(deleteAction); contextMenu->addAction(deleteAction);
connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteAddress_clicked);
}
contextMenu->addSeparator(); contextMenu->addSeparator();
// Connect signals for context menu actions // Connect signals for context menu actions
connect(copyAddressAction, &QAction::triggered, this, &AddressBookPage::on_copyAddress_clicked); connect(copyAddressAction, &QAction::triggered, this, &AddressBookPage::on_copyAddress_clicked);
connect(copyLabelAction, &QAction::triggered, this, &AddressBookPage::onCopyLabelAction); connect(copyLabelAction, &QAction::triggered, this, &AddressBookPage::onCopyLabelAction);
connect(editAction, &QAction::triggered, this, &AddressBookPage::onEditAction); connect(editAction, &QAction::triggered, this, &AddressBookPage::onEditAction);
connect(deleteAction, &QAction::triggered, this, &AddressBookPage::on_deleteAddress_clicked);
connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu); connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);
@ -249,13 +250,11 @@ void AddressBookPage::selectionChanged()
// In sending tab, allow deletion of selection // In sending tab, allow deletion of selection
ui->deleteAddress->setEnabled(true); ui->deleteAddress->setEnabled(true);
ui->deleteAddress->setVisible(true); ui->deleteAddress->setVisible(true);
deleteAction->setEnabled(true);
break; break;
case ReceivingTab: case ReceivingTab:
// Deleting receiving addresses, however, is not allowed // Deleting receiving addresses, however, is not allowed
ui->deleteAddress->setEnabled(false); ui->deleteAddress->setEnabled(false);
ui->deleteAddress->setVisible(false); ui->deleteAddress->setVisible(false);
deleteAction->setEnabled(false);
break; break;
} }
ui->copyAddress->setEnabled(true); ui->copyAddress->setEnabled(true);

1
src/qt/addressbookpage.h
View File

@ -55,7 +55,6 @@ private:
QString returnValue; QString returnValue;
AddressBookSortFilterProxyModel *proxyModel; AddressBookSortFilterProxyModel *proxyModel;
QMenu *contextMenu; QMenu *contextMenu;
QAction *deleteAction; // to be able to explicitly disable it
QString newAddressToSelect; QString newAddressToSelect;
private Q_SLOTS: private Q_SLOTS: