highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-25 08:21:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt, refactor: Use local QAction instances for the tray icon menu

Browse Source 
This change is required for the following commit.
This commit is contained in:
Hennadii Stepanov 2022-02-08 17:22:10 +02:00
parent 58e16035c1
commit 92427354dd
No known key found for this signature in database
GPG Key ID: 410108112E7EA81F
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qt/bitcoingui.cpp
View File

@ -778,20 +778,24 @@ void BitcoinGUI::createTrayIconMenu()
QAction* send_action{nullptr}; QAction* send_action{nullptr};
QAction* receive_action{nullptr}; QAction* receive_action{nullptr};
QAction* sign_action{nullptr};
QAction* verify_action{nullptr};
if (enableWallet) { if (enableWallet) {
send_action = trayIconMenu->addAction(sendCoinsAction->text(), sendCoinsAction, &QAction::trigger); send_action = trayIconMenu->addAction(sendCoinsAction->text(), sendCoinsAction, &QAction::trigger);
receive_action = trayIconMenu->addAction(receiveCoinsAction->text(), receiveCoinsAction, &QAction::trigger); receive_action = trayIconMenu->addAction(receiveCoinsAction->text(), receiveCoinsAction, &QAction::trigger);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(signMessageAction); sign_action = trayIconMenu->addAction(signMessageAction->text(), signMessageAction, &QAction::trigger);
trayIconMenu->addAction(verifyMessageAction); verify_action = trayIconMenu->addAction(verifyMessageAction->text(), verifyMessageAction, &QAction::trigger);
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
} }
trayIconMenu->addAction(optionsAction); QAction* options_action = trayIconMenu->addAction(optionsAction->text(), optionsAction, &QAction::trigger);
trayIconMenu->addAction(openRPCConsoleAction); options_action->setMenuRole(QAction::PreferencesRole);
QAction* node_window_action = trayIconMenu->addAction(openRPCConsoleAction->text(), openRPCConsoleAction, &QAction::trigger);
QAction* quit_action{nullptr};
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
// Note: On macOS, the Dock icon's menu already has Quit action. // Note: On macOS, the Dock icon's menu already has Quit action.
trayIconMenu->addSeparator(); trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction); quit_action = trayIconMenu->addAction(quitAction->text(), quitAction, &QAction::trigger);
trayIcon->setContextMenu(trayIconMenu.get()); trayIcon->setContextMenu(trayIconMenu.get());
connect(trayIcon, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) { connect(trayIcon, &QSystemTrayIcon::activated, [this](QSystemTrayIcon::ActivationReason reason) {
@ -814,7 +818,7 @@ void BitcoinGUI::createTrayIconMenu()
// Using QSystemTrayIcon::Context is not reliable. // Using QSystemTrayIcon::Context is not reliable.
// See https://bugreports.qt.io/browse/QTBUG-91697 // See https://bugreports.qt.io/browse/QTBUG-91697
trayIconMenu.get(), &QMenu::aboutToShow, trayIconMenu.get(), &QMenu::aboutToShow,
[this, show_hide_action, send_action, receive_action] { [this, show_hide_action, send_action, receive_action, sign_action, verify_action] {
if (show_hide_action) show_hide_action->setText( if (show_hide_action) show_hide_action->setText(
(!isHidden() && !isMinimized() && !GUIUtil::isObscured(this)) ? (!isHidden() && !isMinimized() && !GUIUtil::isObscured(this)) ?
tr("&Hide") : tr("&Hide") :
@ -822,6 +826,8 @@ void BitcoinGUI::createTrayIconMenu()
if (enableWallet) { if (enableWallet) {
send_action->setEnabled(sendCoinsAction->isEnabled()); send_action->setEnabled(sendCoinsAction->isEnabled());
receive_action->setEnabled(receiveCoinsAction->isEnabled()); receive_action->setEnabled(receiveCoinsAction->isEnabled());
sign_action->setEnabled(signMessageAction->isEnabled());
verify_action->setEnabled(verifyMessageAction->isEnabled());
} }
}); });
} }