Move wizards' cancel button to the left on Mac.

It is too far to the left now, but that can't be helped
(it's a Qt limitation).

Task-number: QTCREATORBUG-6156
Change-Id: I0201356234abb618dc3b573673d512c0a97c4839
Reviewed-on: http://codereview.qt-project.org/5406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Eike Ziller
2011-09-22 18:02:43 +02:00
parent 57c3ab2249
commit 3955df7855
3 changed files with 30 additions and 1 deletions

View File

@@ -51,6 +51,15 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setOption(QWizard::NoCancelButton, false);
setOption(QWizard::NoDefaultButton, false);
#ifdef Q_OS_MAC
setButtonLayout(QList<QWizard::WizardButton>()
<< QWizard::CancelButton
<< QWizard::Stretch
<< QWizard::BackButton
<< QWizard::NextButton
<< QWizard::CommitButton
<< QWizard::FinishButton);
#endif
const int filePageId = addPage(m_filePage);
wizardProgress()->item(filePageId)->setTitle(tr("Location"));
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));

View File

@@ -539,6 +539,16 @@ void BaseFileWizard::setupWizard(QWizard *w)
w->setOption(QWizard::NoDefaultButton, false);
w->setOption(QWizard::NoBackButtonOnStartPage, true);
w->setWindowFlags(w->windowFlags() & ~Qt::WindowContextHelpButtonHint);
#ifdef Q_OS_MAC
w->setButtonLayout(QList<QWizard::WizardButton>()
<< QWizard::CancelButton
<< QWizard::Stretch
<< QWizard::BackButton
<< QWizard::NextButton
<< QWizard::CommitButton
<< QWizard::FinishButton);
#endif
}
/*!

View File

@@ -55,8 +55,18 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
setupTargetPage();
setOption(QWizard::NoBackButtonOnLastPage, true);
setOption(QWizard::NoCancelButton, false);
setOption(QWizard::NoDefaultButton, false);
setOption(QWizard::NoBackButtonOnLastPage, true);
#ifdef Q_OS_MAC
setButtonLayout(QList<QWizard::WizardButton>()
<< QWizard::CancelButton
<< QWizard::Stretch
<< QWizard::BackButton
<< QWizard::NextButton
<< QWizard::CommitButton
<< QWizard::FinishButton);
#endif
}
// We don't want to actually show the dialog if we don't show the import page