From 5630ca02393b962ff44b562d7c115d5de1d42622 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 8 Nov 2019 21:25:46 -0600 Subject: Qt UI: Wizard: Better text, fix cancel button behaviour --- ui/qt5/horizonwizard.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'ui/qt5/horizonwizard.cc') diff --git a/ui/qt5/horizonwizard.cc b/ui/qt5/horizonwizard.cc index 5a6527d..ae25238 100644 --- a/ui/qt5/horizonwizard.cc +++ b/ui/qt5/horizonwizard.cc @@ -89,8 +89,7 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) { /* REQ: UI.Global.Cancel.Confirm */ - QObject::disconnect(button(CancelButton), &QAbstractButton::clicked, - this, &QWizard::reject); + button(CancelButton)->disconnect(this); QObject::connect(button(CancelButton), &QAbstractButton::clicked, [=](bool) { QMessageBox cancel(QMessageBox::Question, @@ -109,10 +108,10 @@ HorizonWizard::HorizonWizard(QWidget *parent) : QWizard(parent) { }); /* REQ: Iface.UI.ButtonAccel */ - setButtonText(HelpButton, tr("Help (F1)")); - setButtonText(CancelButton, tr("Cancel (F3)")); - setButtonText(BackButton, tr("Back (F5)")); - setButtonText(NextButton, tr("Next (F8)")); + setButtonText(HelpButton, tr("&Help (F1)")); + setButtonText(CancelButton, tr("&Cancel (F3)")); + setButtonText(BackButton, tr("< &Back (F5)")); + setButtonText(NextButton, tr("&Next > (F8)")); f1 = new QShortcut(Qt::Key_F1, this); connect(f1, &QShortcut::activated, -- cgit v1.2.3-60-g2f50