summaryrefslogtreecommitdiff
path: root/ui/qt5
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-22 18:58:39 -0600
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-02-22 18:58:39 -0600
commit8c48e8c1f66ab379b1c7e9e114a21ca4d39df790 (patch)
treeaf6c55b91c83bd14374e77358c6bec925076fad2 /ui/qt5
parent7dc3aa5b3c7b626e7faffe4306f0b282d4c415a4 (diff)
downloadhorizon-8c48e8c1f66ab379b1c7e9e114a21ca4d39df790.tar.gz
horizon-8c48e8c1f66ab379b1c7e9e114a21ca4d39df790.tar.bz2
horizon-8c48e8c1f66ab379b1c7e9e114a21ca4d39df790.tar.xz
horizon-8c48e8c1f66ab379b1c7e9e114a21ca4d39df790.zip
Qt UI: Move Finish to F10 (see rationale:)
When F8 is bound to both, pressing F8 on the penultimate page (currently the Accounts page) will send a clicked event to both Next and Finish. This means that the Commit (or Writeout) page will never be shown if the user is using keyboard-only input.
Diffstat (limited to 'ui/qt5')
-rw-r--r--ui/qt5/horizonwizard.cc11
-rw-r--r--ui/qt5/horizonwizard.hh2
2 files changed, 8 insertions, 5 deletions
diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc
index 4b948be..6391937 100644
--- a/ui/qt5/horizonwizard.cc
+++ b/ui/qt5/horizonwizard.cc
@@ -266,9 +266,9 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) {
setButtonText(BackButton, tr("< &Back (F6)"));
setButtonText(NextButton, tr("Co&ntinue > (F8)"));
#ifdef HAS_INSTALL_ENV
- setButtonText(FinishButton, tr("&Install (F8)"));
+ setButtonText(FinishButton, tr("&Install (F10)"));
#else
- setButtonText(FinishButton, tr("&Save (F8)"));
+ setButtonText(FinishButton, tr("&Save (F10)"));
#endif /* HAS_INSTALL_ENV */
f1 = new QShortcut(Qt::Key_F1, this);
@@ -289,10 +289,13 @@ 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."));
+ f10 = new QShortcut(Qt::Key_F10, this);
+ connect(f10, &QShortcut::activated,
+ button(FinishButton), &QAbstractButton::click);
+ f10->setWhatsThis(tr("Finishes the wizard."));
+
#ifdef HAS_INSTALL_ENV
interfaces = probe_ifaces();
tain_now_set_stopwatch_g();
diff --git a/ui/qt5/horizonwizard.hh b/ui/qt5/horizonwizard.hh
index 2c253f1..33b980a 100644
--- a/ui/qt5/horizonwizard.hh
+++ b/ui/qt5/horizonwizard.hh
@@ -126,7 +126,7 @@ public:
void reject();
/*! Emit a HorizonScript file with the user's choices. */
QString toHScript();
- QShortcut *f1, *f3, *f6, *f8;
+ QShortcut *f1, *f3, *f6, *f8, *f10;
/*! The domain to use for downloading packages.
* @example distfiles.adelielinux.org