feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove FileWizard class altogether

Browse Source 
This fixes the regression where two Location pages were added
before.

Change-Id: Ic3241d707ad8dcf6fc3063bb4613dce49001e196
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2014-06-02 14:01:46 +02:00
parent b229231239
commit 9ba8040254
11 changed files with 66 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/qmljseditor/jsfilewizard.cpp
View File

@@ -33,6 +33,7 @@
#include <coreplugin/basefilewizard.h>
#include <utils/filewizardpage.h>
#include <utils/qtcassert.h>
#include <QFileInfo>
@@ -77,13 +78,11 @@ class JsFileWizardDialog : public Core::BaseFileWizard
Q_OBJECT
public:
JsFileWizardDialog(QWidget *parent = 0) :
Core::BaseFileWizard(parent),
m_optionsPage(new JsFileOptionsPage)
Core::BaseFileWizard(parent)
{
addPage(m_optionsPage);
addPage(new Utils::FileWizardPage);
addPage(new JsFileOptionsPage);
}
JsFileOptionsPage *m_optionsPage;
};
} // anonymous namespace
@@ -96,15 +95,21 @@ JsFileWizard::JsFileWizard()
Core::GeneratedFiles JsFileWizard::generateFiles(const QWizard *w,
QString * /*errorMessage*/) const
{
const JsFileWizardDialog *wizardDialog = qobject_cast<const JsFileWizardDialog *>(w);
const QString path = wizardDialog->path();
const QString name = wizardDialog->fileName();
const Core::BaseFileWizard *wizard = qobject_cast<const Core::BaseFileWizard *>(w);
Utils::FileWizardPage *filePage = wizard->find<Utils::FileWizardPage>();
QTC_ASSERT(filePage, Core::GeneratedFiles());
JsFileOptionsPage *optionPage = wizard->find<JsFileOptionsPage>();
QTC_ASSERT(optionPage, Core::GeneratedFiles());
const QString path = filePage->path();
const QString name = filePage->fileName();
const QString mimeType = QLatin1String(QmlJSTools::Constants::JS_MIMETYPE);
const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, name, preferredSuffix(mimeType));
Core::GeneratedFile file(fileName);
file.setContents(fileContents(fileName, wizardDialog->m_optionsPage->statelessLibrary()));
file.setContents(fileContents(fileName, optionPage->statelessLibrary()));
file.setAttributes(Core::GeneratedFile::OpenEditorAttribute);
return Core::GeneratedFiles() << file;
}
@@ -125,12 +130,15 @@ QString JsFileWizard::fileContents(const QString &, bool statelessLibrary) const
Core::BaseFileWizard *JsFileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
{
JsFileWizardDialog *wizardDialog = new JsFileWizardDialog(parent);
wizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
wizardDialog->setPath(parameters.defaultPath());
JsFileWizardDialog *wizard = new JsFileWizardDialog(parent);
wizard->setWindowTitle(tr("New %1").arg(displayName()));
Utils::FileWizardPage *page = wizard->find<Utils::FileWizardPage>();
page->setPath(parameters.defaultPath());
foreach (QWizardPage *p, parameters.extensionPages())
wizardDialog->addPage(p);
return wizardDialog;
wizard->addPage(p);
return wizard;
}
#include "jsfilewizard.moc"