mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 12:02:48 +01:00
Merge #16735: gui: Remove unused menu items for Windows and Linux
f091dc818085c3fa478374ea4378a0c1dd3d87f2 GUI: Remove unused menu items for Windows and Linux (GChuf) Pull request description: Removed "Main Window" and "Restore" menu option for Windows and linux Keep the options for macOS ACKs for top commit: MarcoFalke: unsigned ACK f091dc818085c3fa478374ea4378a0c1dd3d87f2 fanquake: ACK f091dc818085c3fa478374ea4378a0c1dd3d87f2 - tested on macOS, Windows and Linux. MarcoFalke: ACK f091dc818085c3fa478374ea4378a0c1dd3d87f2 kristapsk: ACK f091dc818085c3fa478374ea4378a0c1dd3d87f2 (tested on Linux with Xfce4) Tree-SHA512: a84a9a8bd3b09224f111cad4712076150524a24d6f09910147194c4149222443c453372db61eed8aa82c3450339b63fd216288196feb4ab637b6ea21b0109830
This commit is contained in:
parent
f1c784ffc3
commit
8fcc517f52
@ -540,24 +540,16 @@ void BitcoinGUI::createMenuBar()
|
||||
connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) {
|
||||
zoom_action->setEnabled(window != nullptr);
|
||||
});
|
||||
#else
|
||||
QAction* restore_action = window_menu->addAction(tr("Restore"));
|
||||
connect(restore_action, &QAction::triggered, [] {
|
||||
qApp->focusWindow()->showNormal();
|
||||
});
|
||||
|
||||
connect(qApp, &QApplication::focusWindowChanged, [restore_action] (QWindow* window) {
|
||||
restore_action->setEnabled(window != nullptr);
|
||||
});
|
||||
#endif
|
||||
|
||||
if (walletFrame) {
|
||||
#ifdef Q_OS_MAC
|
||||
window_menu->addSeparator();
|
||||
QAction* main_window_action = window_menu->addAction(tr("Main Window"));
|
||||
connect(main_window_action, &QAction::triggered, [this] {
|
||||
GUIUtil::bringToFront(this);
|
||||
});
|
||||
|
||||
#endif
|
||||
window_menu->addSeparator();
|
||||
window_menu->addAction(usedSendingAddressesAction);
|
||||
window_menu->addAction(usedReceivingAddressesAction);
|
||||
|
Loading…
Reference in New Issue
Block a user