Skip to content

Commit 410b745

Browse files
author
MarcoFalke
committed
Merge #16735: gui: Remove unused menu items for Windows and Linux
f091dc8 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 f091dc8 fanquake: ACK f091dc8 - tested on macOS, Windows and Linux. MarcoFalke: ACK f091dc8 kristapsk: ACK f091dc8 (tested on Linux with Xfce4) Tree-SHA512: a84a9a8bd3b09224f111cad4712076150524a24d6f09910147194c4149222443c453372db61eed8aa82c3450339b63fd216288196feb4ab637b6ea21b0109830
2 parents 189c19e + f091dc8 commit 410b745

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/qt/bitcoingui.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -471,24 +471,16 @@ void BitcoinGUI::createMenuBar()
471471
connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) {
472472
zoom_action->setEnabled(window != nullptr);
473473
});
474-
#else
475-
QAction* restore_action = window_menu->addAction(tr("Restore"));
476-
connect(restore_action, &QAction::triggered, [] {
477-
qApp->focusWindow()->showNormal();
478-
});
479-
480-
connect(qApp, &QApplication::focusWindowChanged, [restore_action] (QWindow* window) {
481-
restore_action->setEnabled(window != nullptr);
482-
});
483474
#endif
484475

485476
if (walletFrame) {
477+
#ifdef Q_OS_MAC
486478
window_menu->addSeparator();
487479
QAction* main_window_action = window_menu->addAction(tr("Main Window"));
488480
connect(main_window_action, &QAction::triggered, [this] {
489481
GUIUtil::bringToFront(this);
490482
});
491-
483+
#endif
492484
window_menu->addSeparator();
493485
window_menu->addAction(usedSendingAddressesAction);
494486
window_menu->addAction(usedReceivingAddressesAction);

0 commit comments

Comments
 (0)