mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #16735: gui: Remove unused menu items for Windows and Linux

Browse Source 
f091dc8180 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 f091dc8180
  fanquake:
    ACK f091dc8180 - tested on macOS, Windows and Linux.
  MarcoFalke:
    ACK f091dc8180
  kristapsk:
    ACK f091dc8180 (tested on Linux with Xfce4)

Tree-SHA512: a84a9a8bd3b09224f111cad4712076150524a24d6f09910147194c4149222443c453372db61eed8aa82c3450339b63fd216288196feb4ab637b6ea21b0109830
This commit is contained in:
MarcoFalke committed 2019-09-08 13:53:07 +02:00
2 parents 189c19e012 f091dc8180
commit 410b745fe0
1 file changed
+2 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/qt/bitcoingui.cpp
+2 -10
View File
@@ -471,24 +471,16 @@ void BitcoinGUI::createMenuBar()
connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) { connect(qApp, &QApplication::focusWindowChanged, [zoom_action] (QWindow* window) {
zoom_action->setEnabled(window != nullptr); 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 #endif
if (walletFrame) { if (walletFrame) {
#ifdef Q_OS_MAC
window_menu->addSeparator(); window_menu->addSeparator();
QAction* main_window_action = window_menu->addAction(tr("Main Window")); QAction* main_window_action = window_menu->addAction(tr("Main Window"));
connect(main_window_action, &QAction::triggered, [this] { connect(main_window_action, &QAction::triggered, [this] {
GUIUtil::bringToFront(this); GUIUtil::bringToFront(this);
}); });
#endif
window_menu->addSeparator(); window_menu->addSeparator();
window_menu->addAction(usedSendingAddressesAction); window_menu->addAction(usedSendingAddressesAction);
window_menu->addAction(usedReceivingAddressesAction); window_menu->addAction(usedReceivingAddressesAction);