diff options
| author | kh1 <karsten.heimrich@digia.com> | 2014-04-03 15:01:15 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-04-24 15:34:09 +0200 |
| commit | e99fe7f986f29123230831ef586446654f479aa9 (patch) | |
| tree | c9c63026c34a9087da298e0903b0b21067955a46 /src | |
| parent | f91f630fa2294d70f27c4c88dfa331a9f81f5387 (diff) | |
Fix wrong default button selection.
Task-number: QTIFW-433
Change-Id: I2b2a161e863d23ce427fbd70a53f0578ce631acb
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index fdce935bd..7ea3e8da0 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1403,6 +1403,10 @@ bool TargetDirectoryPage::validatePage() void TargetDirectoryPage::entering() { + if (QPushButton *const b = qobject_cast<QPushButton *>(gui()->button(QWizard::NextButton))) { + b->setDefault(true); + b->setFocus(); + } } void TargetDirectoryPage::leaving() @@ -1536,6 +1540,7 @@ ReadyForInstallationPage::ReadyForInstallationPage(PackageManagerCore *core) baseLayout->addLayout(topLayout); m_taskDetailsButton = new QPushButton(tr("&Show Details"), this); + m_taskDetailsButton->setFocusPolicy(Qt::NoFocus); m_taskDetailsButton->setObjectName(QLatin1String("TaskDetailsButton")); m_taskDetailsButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed); connect(m_taskDetailsButton, SIGNAL(clicked()), this, SLOT(toggleDetails())); @@ -1927,8 +1932,13 @@ void FinishedPage::entering() setButtonText(QWizard::CommitButton, tr("Restart")); setButtonText(QWizard::CancelButton, gui()->defaultButtonText(QWizard::FinishButton)); } else { - if (packageManagerCore()->isInstaller()) + if (packageManagerCore()->isInstaller()) { m_commitButton = wizard()->button(QWizard::FinishButton); + if (QPushButton *const b = qobject_cast<QPushButton *>(m_commitButton)) { + b->setDefault(true); + b->setFocus(); + } + } gui()->setOption(QWizard::NoCancelButton, true); if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton)) |