gui: Add close window shortcut

IPGlider · IPGlider · commit f5a3a5b9ab36 · 2020-02-05T07:13:01.000+01:00
CMD+W/CTRL+W is the standard shortcut to close a window without
exiting the program.
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -136,6 +136,8 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,
     connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);
 
     connect(ui->closeButton, &QPushButton::clicked, this, &QDialog::accept);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 AddressBookPage::~AddressBookPage()
diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp
@@ -10,6 +10,7 @@
 #include <qt/forms/ui_askpassphrasedialog.h>
 
 #include <qt/guiconstants.h>
+#include <qt/guiutil.h>
 #include <qt/walletmodel.h>
 
 #include <support/allocators/secure.h>
@@ -75,6 +76,8 @@ AskPassphraseDialog::AskPassphraseDialog(Mode _mode, QWidget *parent, SecureStri
     connect(ui->passEdit1, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
     connect(ui->passEdit2, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
     connect(ui->passEdit3, &QLineEdit::textChanged, this, &AskPassphraseDialog::textChanged);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 AskPassphraseDialog::~AskPassphraseDialog()
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -211,6 +211,8 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty
 #ifdef Q_OS_MAC
     m_app_nap_inhibitor = new CAppNapInhibitor;
 #endif
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 BitcoinGUI::~BitcoinGUI()
diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp
@@ -134,6 +134,8 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge
         ui->radioTreeMode->click();
     if (settings.contains("nCoinControlSortColumn") && settings.contains("nCoinControlSortOrder"))
         sortView(settings.value("nCoinControlSortColumn").toInt(), (static_cast<Qt::SortOrder>(settings.value("nCoinControlSortOrder").toInt())));
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 CoinControlDialog::~CoinControlDialog()
diff --git a/src/qt/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
@@ -43,6 +43,8 @@ EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :
     GUIUtil::ItemDelegate* delegate = new GUIUtil::ItemDelegate(mapper);
     connect(delegate, &GUIUtil::ItemDelegate::keyEscapePressed, this, &EditAddressDialog::reject);
     mapper->setItemDelegate(delegate);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 EditAddressDialog::~EditAddressDialog()
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -54,6 +54,7 @@
 #include <QSettings>
 #include <QSize>
 #include <QString>
+#include <QShortcut>
 #include <QTextDocument> // for Qt::mightBeRichText
 #include <QThread>
 #include <QUrlQuery>
@@ -378,6 +379,11 @@ void bringToFront(QWidget* w)
     }
 }
 
+void handleCloseWindowShortcut(QWidget* w)
+{
+    QObject::connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), w), &QShortcut::activated, w, &QWidget::close);
+}
+
 void openDebugLogfile()
 {
     fs::path pathDebug = GetDataDir() / "debug.log";
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -124,6 +124,9 @@ namespace GUIUtil
     // Activate, show and raise the widget
     void bringToFront(QWidget* w);
 
+    // Set shortcut to close window
+    void handleCloseWindowShortcut(QWidget* w);
+
     // Open debug.log
     void openDebugLogfile();
 
diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp
@@ -15,6 +15,8 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) :
     ui(new Ui::OpenURIDialog)
 {
     ui->setupUi(this);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 OpenURIDialog::~OpenURIDialog()
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -135,6 +135,8 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :
         ui->minimizeToTray->setChecked(false);
         ui->minimizeToTray->setEnabled(false);
     }
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 OptionsDialog::~OptionsDialog()
diff --git a/src/qt/receiverequestdialog.cpp b/src/qt/receiverequestdialog.cpp
@@ -30,6 +30,8 @@ ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :
 #endif
 
     connect(ui->btnSaveAs, &QPushButton::clicked, ui->lblQRCode, &QRImageWidget::saveImage);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 ReceiveRequestDialog::~ReceiveRequestDialog()
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -498,6 +498,8 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
 
     consoleFontSize = settings.value(fontSizeSettingsKey, QFontInfo(QFont()).pointSize()).toInt();
     clear();
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 RPCConsole::~RPCConsole()
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
@@ -47,6 +47,8 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(const PlatformStyle *_platformS
 
     ui->signatureOut_SM->setFont(GUIUtil::fixedPitchFont());
     ui->signatureIn_VM->setFont(GUIUtil::fixedPitchFont());
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 SignVerifyMessageDialog::~SignVerifyMessageDialog()
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -127,6 +127,8 @@ SplashScreen::SplashScreen(interfaces::Node& node, Qt::WindowFlags f, const Netw
 
     subscribeToCoreSignals();
     installEventFilter(this);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 SplashScreen::~SplashScreen()
diff --git a/src/qt/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
@@ -5,6 +5,7 @@
 #include <qt/transactiondescdialog.h>
 #include <qt/forms/ui_transactiondescdialog.h>
 
+#include <qt/guiutil.h>
 #include <qt/transactiontablemodel.h>
 
 #include <QModelIndex>
@@ -17,6 +18,8 @@ TransactionDescDialog::TransactionDescDialog(const QModelIndex &idx, QWidget *pa
     setWindowTitle(tr("Details for %1").arg(idx.data(TransactionTableModel::TxHashRole).toString()));
     QString desc = idx.data(TransactionTableModel::LongDescriptionRole).toString();
     ui->detailText->setHtml(desc);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 TransactionDescDialog::~TransactionDescDialog()
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
@@ -10,6 +10,8 @@
 
 #include <qt/forms/ui_helpmessagedialog.h>
 
+#include <qt/guiutil.h>
+
 #include <clientversion.h>
 #include <init.h>
 #include <util/system.h>
@@ -102,6 +104,8 @@ HelpMessageDialog::HelpMessageDialog(interfaces::Node& node, QWidget *parent, bo
         ui->scrollArea->setVisible(false);
         ui->aboutLogo->setVisible(false);
     }
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 HelpMessageDialog::~HelpMessageDialog()
@@ -141,6 +145,8 @@ ShutdownWindow::ShutdownWindow(QWidget *parent, Qt::WindowFlags f):
         tr("%1 is shutting down...").arg(PACKAGE_NAME) + "<br /><br />" +
         tr("Do not shut down the computer until this window disappears.")));
     setLayout(layout);
+
+    GUIUtil::handleCloseWindowShortcut(this);
 }
 
 QWidget* ShutdownWindow::showShutdownWindow(QMainWindow* window)

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,8 @@ AddressBookPage::AddressBookPage(const PlatformStyle *platformStyle, Mode _mode,`
`136`	`136`	`connect(ui->tableView, &QWidget::customContextMenuRequested, this, &AddressBookPage::contextualMenu);`
`137`	`137`
`138`	`138`	`connect(ui->closeButton, &QPushButton::clicked, this, &QDialog::accept);`
	`139`	`+`
	`140`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`AddressBookPage::~AddressBookPage()`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,8 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty`
`211`	`211`	`#ifdef Q_OS_MAC`
`212`	`212`	`m_app_nap_inhibitor = new CAppNapInhibitor;`
`213`	`213`	`#endif`
	`214`	`+`
	`215`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`214`	`216`	`}`
`215`	`217`
`216`	`218`	`BitcoinGUI::~BitcoinGUI()`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,8 @@ CoinControlDialog::CoinControlDialog(const PlatformStyle *_platformStyle, QWidge`
`134`	`134`	`ui->radioTreeMode->click();`
`135`	`135`	`if (settings.contains("nCoinControlSortColumn") && settings.contains("nCoinControlSortOrder"))`
`136`	`136`	`sortView(settings.value("nCoinControlSortColumn").toInt(), (static_cast<Qt::SortOrder>(settings.value("nCoinControlSortOrder").toInt())));`
	`137`	`+`
	`138`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`137`	`139`	`}`
`138`	`140`
`139`	`141`	`CoinControlDialog::~CoinControlDialog()`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ EditAddressDialog::EditAddressDialog(Mode _mode, QWidget *parent) :`
`43`	`43`	`GUIUtil::ItemDelegate* delegate = new GUIUtil::ItemDelegate(mapper);`
`44`	`44`	`connect(delegate, &GUIUtil::ItemDelegate::keyEscapePressed, this, &EditAddressDialog::reject);`
`45`	`45`	`mapper->setItemDelegate(delegate);`
	`46`	`+`
	`47`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`46`	`48`	`}`
`47`	`49`
`48`	`50`	`EditAddressDialog::~EditAddressDialog()`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@`
`54`	`54`	`#include <QSettings>`
`55`	`55`	`#include <QSize>`
`56`	`56`	`#include <QString>`
	`57`	`+#include <QShortcut>`
`57`	`58`	`#include <QTextDocument> // for Qt::mightBeRichText`
`58`	`59`	`#include <QThread>`
`59`	`60`	`#include <QUrlQuery>`
`@@ -378,6 +379,11 @@ void bringToFront(QWidget* w)`
`378`	`379`	`}`
`379`	`380`	`}`
`380`	`381`
	`382`	`+void handleCloseWindowShortcut(QWidget* w)`
	`383`	`+{`
	`384`	`+ QObject::connect(new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), w), &QShortcut::activated, w, &QWidget::close);`
	`385`	`+}`
	`386`	`+`
`381`	`387`	`void openDebugLogfile()`
`382`	`388`	`{`
`383`	`389`	`fs::path pathDebug = GetDataDir() / "debug.log";`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ OpenURIDialog::OpenURIDialog(QWidget *parent) :`
`15`	`15`	`ui(new Ui::OpenURIDialog)`
`16`	`16`	`{`
`17`	`17`	`ui->setupUi(this);`
	`18`	`+`
	`19`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`18`	`20`	`}`
`19`	`21`
`20`	`22`	`OpenURIDialog::~OpenURIDialog()`
Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,8 @@ OptionsDialog::OptionsDialog(QWidget *parent, bool enableWallet) :`
`135`	`135`	`ui->minimizeToTray->setChecked(false);`
`136`	`136`	`ui->minimizeToTray->setEnabled(false);`
`137`	`137`	`}`
	`138`	`+`
	`139`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`OptionsDialog::~OptionsDialog()`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ ReceiveRequestDialog::ReceiveRequestDialog(QWidget *parent) :`
`30`	`30`	`#endif`
`31`	`31`
`32`	`32`	`connect(ui->btnSaveAs, &QPushButton::clicked, ui->lblQRCode, &QRImageWidget::saveImage);`
	`33`	`+`
	`34`	`+ GUIUtil::handleCloseWindowShortcut(this);`
`33`	`35`	`}`
`34`	`36`
`35`	`37`	`ReceiveRequestDialog::~ReceiveRequestDialog()`