diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-10-09 11:20:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-10-09 14:31:14 +0200 |
| commit | 56c3d8ffaba76a69a36c6083ee0abdf103355025 (patch) | |
| tree | e9ee2ffb9157a567797ac267d0789c40ed46547b /src/libs/utils/wizard.cpp | |
| parent | 1ba9c8ef148eddb96751246ed627bf5bddccf5fc (diff) | |
Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.
Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/libs/utils/wizard.cpp')
| -rw-r--r-- | src/libs/utils/wizard.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp index 743c628de9b..dfe849ae07a 100644 --- a/src/libs/utils/wizard.cpp +++ b/src/libs/utils/wizard.cpp @@ -28,6 +28,7 @@ ****************************************************************************/ #include "wizard.h" +#include "hostosinfo.h" #include <QMap> #include <QHash> @@ -318,6 +319,20 @@ Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) : connect(this, SIGNAL(pageAdded(int)), this, SLOT(_q_pageAdded(int))); connect(this, SIGNAL(pageRemoved(int)), this, SLOT(_q_pageRemoved(int))); setSideWidget(new LinearProgressWidget(d_ptr->m_wizardProgress, this)); + setOption(QWizard::NoCancelButton, false); + setOption(QWizard::NoDefaultButton, false); + setOption(QWizard::NoBackButtonOnStartPage, true); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + if (Utils::HostOsInfo::isMacHost()) { + setButtonLayout(QList<QWizard::WizardButton>() + << QWizard::CancelButton + << QWizard::Stretch + << QWizard::BackButton + << QWizard::NextButton + << QWizard::CommitButton + << QWizard::FinishButton); + } } Wizard::~Wizard() |