mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-09 10:43:19 -05:00
qt: Drop BitcoinGUI::toggleHideAction member
Also dropped useless tooltip.
This commit is contained in:
parent
78189daac8
commit
ee151d0327
2 changed files with 2 additions and 7 deletions
|
@ -315,8 +315,6 @@ void BitcoinGUI::createActions()
|
||||||
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME));
|
optionsAction->setStatusTip(tr("Modify configuration options for %1").arg(PACKAGE_NAME));
|
||||||
optionsAction->setMenuRole(QAction::PreferencesRole);
|
optionsAction->setMenuRole(QAction::PreferencesRole);
|
||||||
optionsAction->setEnabled(false);
|
optionsAction->setEnabled(false);
|
||||||
toggleHideAction = new QAction(tr("&Show / Hide"), this);
|
|
||||||
toggleHideAction->setStatusTip(tr("Show or hide the main Window"));
|
|
||||||
|
|
||||||
encryptWalletAction = new QAction(tr("&Encrypt Wallet…"), this);
|
encryptWalletAction = new QAction(tr("&Encrypt Wallet…"), this);
|
||||||
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
|
encryptWalletAction->setStatusTip(tr("Encrypt the private keys that belong to your wallet"));
|
||||||
|
@ -376,7 +374,6 @@ void BitcoinGUI::createActions()
|
||||||
connect(aboutAction, &QAction::triggered, this, &BitcoinGUI::aboutClicked);
|
connect(aboutAction, &QAction::triggered, this, &BitcoinGUI::aboutClicked);
|
||||||
connect(aboutQtAction, &QAction::triggered, qApp, QApplication::aboutQt);
|
connect(aboutQtAction, &QAction::triggered, qApp, QApplication::aboutQt);
|
||||||
connect(optionsAction, &QAction::triggered, this, &BitcoinGUI::optionsClicked);
|
connect(optionsAction, &QAction::triggered, this, &BitcoinGUI::optionsClicked);
|
||||||
connect(toggleHideAction, &QAction::triggered, this, &BitcoinGUI::toggleHidden);
|
|
||||||
connect(showHelpMessageAction, &QAction::triggered, this, &BitcoinGUI::showHelpMessageClicked);
|
connect(showHelpMessageAction, &QAction::triggered, this, &BitcoinGUI::showHelpMessageClicked);
|
||||||
connect(openRPCConsoleAction, &QAction::triggered, this, &BitcoinGUI::showDebugWindow);
|
connect(openRPCConsoleAction, &QAction::triggered, this, &BitcoinGUI::showDebugWindow);
|
||||||
// prevents an open debug window from becoming stuck/unusable on client shutdown
|
// prevents an open debug window from becoming stuck/unusable on client shutdown
|
||||||
|
@ -627,8 +624,6 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel, interfaces::BlockAndH
|
||||||
trayIcon->setVisible(optionsModel->getShowTrayIcon());
|
trayIcon->setVisible(optionsModel->getShowTrayIcon());
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Disable possibility to show main window via action
|
|
||||||
toggleHideAction->setEnabled(false);
|
|
||||||
if(trayIconMenu)
|
if(trayIconMenu)
|
||||||
{
|
{
|
||||||
// Disable context menu on tray icon
|
// Disable context menu on tray icon
|
||||||
|
@ -788,9 +783,10 @@ void BitcoinGUI::createTrayIconMenu()
|
||||||
#endif // Q_OS_MAC
|
#endif // Q_OS_MAC
|
||||||
|
|
||||||
// Configuration of the tray icon (or Dock icon) menu.
|
// Configuration of the tray icon (or Dock icon) menu.
|
||||||
|
QAction* show_hide_action{nullptr};
|
||||||
#ifndef Q_OS_MAC
|
#ifndef Q_OS_MAC
|
||||||
// Note: On macOS, the Dock icon's menu already has Show / Hide action.
|
// Note: On macOS, the Dock icon's menu already has Show / Hide action.
|
||||||
trayIconMenu->addAction(toggleHideAction);
|
show_hide_action = trayIconMenu->addAction(tr("Show / &Hide"), this, &BitcoinGUI::toggleHidden);
|
||||||
trayIconMenu->addSeparator();
|
trayIconMenu->addSeparator();
|
||||||
#endif // Q_OS_MAC
|
#endif // Q_OS_MAC
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,6 @@ private:
|
||||||
QAction* receiveCoinsAction = nullptr;
|
QAction* receiveCoinsAction = nullptr;
|
||||||
QAction* receiveCoinsMenuAction = nullptr;
|
QAction* receiveCoinsMenuAction = nullptr;
|
||||||
QAction* optionsAction = nullptr;
|
QAction* optionsAction = nullptr;
|
||||||
QAction* toggleHideAction = nullptr;
|
|
||||||
QAction* encryptWalletAction = nullptr;
|
QAction* encryptWalletAction = nullptr;
|
||||||
QAction* backupWalletAction = nullptr;
|
QAction* backupWalletAction = nullptr;
|
||||||
QAction* changePassphraseAction = nullptr;
|
QAction* changePassphraseAction = nullptr;
|
||||||
|
|
Loading…
Add table
Reference in a new issue