forked from qt-creator/qt-creator
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:
@@ -51,6 +51,15 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
|
|||||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||||
setOption(QWizard::NoCancelButton, false);
|
setOption(QWizard::NoCancelButton, false);
|
||||||
setOption(QWizard::NoDefaultButton, 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);
|
const int filePageId = addPage(m_filePage);
|
||||||
wizardProgress()->item(filePageId)->setTitle(tr("Location"));
|
wizardProgress()->item(filePageId)->setTitle(tr("Location"));
|
||||||
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
|
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
|
||||||
|
|||||||
@@ -539,6 +539,16 @@ void BaseFileWizard::setupWizard(QWizard *w)
|
|||||||
w->setOption(QWizard::NoDefaultButton, false);
|
w->setOption(QWizard::NoDefaultButton, false);
|
||||||
w->setOption(QWizard::NoBackButtonOnStartPage, true);
|
w->setOption(QWizard::NoBackButtonOnStartPage, true);
|
||||||
w->setWindowFlags(w->windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
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
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -55,8 +55,18 @@ ProjectLoadWizard::ProjectLoadWizard(Qt4Project *project, QWidget *parent, Qt::W
|
|||||||
|
|
||||||
setupTargetPage();
|
setupTargetPage();
|
||||||
|
|
||||||
setOption(QWizard::NoBackButtonOnLastPage, true);
|
|
||||||
setOption(QWizard::NoCancelButton, false);
|
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
|
// We don't want to actually show the dialog if we don't show the import page
|
||||||
|
|||||||
Reference in New Issue
Block a user