forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -30,8 +30,6 @@
|
||||
#include "filewizarddialog.h"
|
||||
#include "filewizardpage.h"
|
||||
|
||||
#include "hostosinfo.h"
|
||||
|
||||
#include <QAbstractButton>
|
||||
|
||||
/*!
|
||||
@@ -49,18 +47,6 @@ FileWizardDialog::FileWizardDialog(QWidget *parent) :
|
||||
Wizard(parent),
|
||||
m_filePage(new FileWizardPage)
|
||||
{
|
||||
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
|
||||
setOption(QWizard::NoCancelButton, false);
|
||||
setOption(QWizard::NoDefaultButton, false);
|
||||
if (HostOsInfo::isMacHost()) {
|
||||
setButtonLayout(QList<QWizard::WizardButton>()
|
||||
<< QWizard::CancelButton
|
||||
<< QWizard::Stretch
|
||||
<< QWizard::BackButton
|
||||
<< QWizard::NextButton
|
||||
<< QWizard::CommitButton
|
||||
<< QWizard::FinishButton);
|
||||
}
|
||||
const int filePageId = addPage(m_filePage);
|
||||
wizardProgress()->item(filePageId)->setTitle(tr("Location"));
|
||||
connect(m_filePage, SIGNAL(activated()), button(QWizard::FinishButton), SLOT(animateClick()));
|
||||
|
||||
Reference in New Issue
Block a user