From 10eea3578306be8af2271a63204447c5bd70ebaf Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Sun, 1 Dec 2019 17:28:27 -0600 Subject: Qt UI: Handle escape key, change label of Finish button --- ui/qt5/horizonwizard.cc | 10 ++++++++++ ui/qt5/horizonwizard.hh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'ui/qt5') diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index cf2d5c9..19b4083 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -245,12 +245,20 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) { setButtonText(CancelButton, tr("E&xit (F3)")); setButtonText(BackButton, tr("< &Back (F6)")); setButtonText(NextButton, tr("Co&ntinue > (F8)")); +#ifdef HAS_INSTALL_ENV + setButtonText(FinishButton, tr("&Install (F8)")); +#else + setButtonText(FinishButton, tr("&Save (F8)")); +#endif /* HAS_INSTALL_ENV */ f1 = new QShortcut(Qt::Key_F1, this); connect(f1, &QShortcut::activated, button(HelpButton), &QAbstractButton::click); f1->setWhatsThis(tr("Activates the Help screen.")); + esc = new QShortcut(Qt::Key_Escape, this); + connect(esc, &QShortcut::activated, + button(CancelButton), &QAbstractButton::click); f3 = new QShortcut(Qt::Key_F3, this); connect(f3, &QShortcut::activated, button(CancelButton), &QAbstractButton::click); @@ -264,6 +272,8 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) { f8 = new QShortcut(Qt::Key_F8, this); connect(f8, &QShortcut::activated, button(NextButton), &QAbstractButton::click); + connect(f8, &QShortcut::activated, + button(FinishButton), &QAbstractButton::click); f8->setWhatsThis(tr("Goes forward to the next page.")); #ifdef HAS_INSTALL_ENV diff --git a/ui/qt5/horizonwizard.hh b/ui/qt5/horizonwizard.hh index 2d1b26b..6fe71f2 100644 --- a/ui/qt5/horizonwizard.hh +++ b/ui/qt5/horizonwizard.hh @@ -86,7 +86,7 @@ public: }; HorizonWizard(QWidget *parent = nullptr); - QShortcut *f1, *f3, *f6, *f8; + QShortcut *esc, *f1, *f3, *f6, *f8; std::string mirror_domain; std::string version; -- cgit v1.2.3-60-g2f50