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

QmlProjectManager: Qt Quick UI templates via json wizard

Browse Source 
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of Qt
Creator, the .qml.ui split is now optional.

Change-Id: Ic6d35e650cf0a7735cdfac9080f95015309a5879
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Alessandro Portale
2015-05-15 17:01:55 +02:00
parent 039a29d50d
commit 8c1b8239f4
43 changed files with 246 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/plugins/qmlprojectmanager/images/qml_wizard.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 586 B

438
src/plugins/qmlprojectmanager/qmlapp.cpp
View File

@@ -1,438 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "qmlapp.h"
#include <coreplugin/basefilewizardfactory.h>
#include <coreplugin/icore.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
#include <QDebug>
#include <QDir>
#include <QTextStream>
namespace QmlProjectManager {
namespace Internal {
static QStringList binaryFiles()
{
static QStringList result;
if (result.isEmpty())
result << QLatin1String("png") << QLatin1String("jpg") << QLatin1String("jpeg");
return result;
}
static QString templateRootDirectory()
{
return Core::ICore::resourcePath() + QLatin1String("/templates/qml/");
}
QmlApp::QmlApp(QObject *parent)
: QObject(parent)
{
}
QmlApp::~QmlApp()
{
}
QString QmlApp::mainQmlFileName() const
{
return projectName() + QLatin1String(".qml");
}
void QmlApp::setProjectNameAndBaseDirectory(const QString &projectName, const QString &projectBaseDirectory)
{
m_projectBaseDirectory = projectBaseDirectory;
m_projectName = projectName.trimmed();
}
QString QmlApp::projectDirectory() const
{
return QDir::cleanPath(m_projectBaseDirectory + QLatin1Char('/') + m_projectName);
}
QString QmlApp::projectName() const
{
return m_projectName;
}
void QmlApp::setTemplateInfo(const TemplateInfo &templateInfo)
{
m_templateInfo = templateInfo;
}
QString QmlApp::creatorFileName() const
{
return m_creatorFileName;
}
QString QmlApp::templateDirectory() const
{
const QDir dir(templateRootDirectory() + m_templateInfo.templateName);
return QDir::cleanPath(dir.absolutePath());
}
static QStringList templateNames()
{
QStringList templateNameList;
const QDir templateRoot(templateRootDirectory());
foreach (const QFileInfo &subDirectory,
templateRoot.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
templateNameList.append(subDirectory.fileName());
return templateNameList;
}
// Return locale language attribute "de_UTF8" -> "de", empty string for "C"
static QString languageSetting()
{
#ifdef QT_CREATOR
QString name = Core::ICore::userInterfaceLanguage();
const int underScorePos = name.indexOf(QLatin1Char('_'));
if (underScorePos != -1)
name.truncate(underScorePos);
if (name.compare(QLatin1String("C"), Qt::CaseInsensitive) == 0)
name.clear();
return name;
#else
return QLocale::system().name();
#endif
}
static inline bool assignLanguageElementText(QXmlStreamReader &reader,
const QString &desiredLanguage,
QString *target)
{
const QStringRef elementLanguage = reader.attributes().value(QLatin1String("xml:lang"));
if (elementLanguage.isEmpty()) {
// Try to find a translation for our Wizards
*target = QCoreApplication::translate("QmlProjectManager::QmlApplicationWizard",
reader.readElementText().toLatin1().constData());
return true;
}
if (elementLanguage == desiredLanguage) {
*target = reader.readElementText();
return true;
}
return false;
}
static bool parseTemplateXml(QXmlStreamReader &reader, TemplateInfo *info)
{
const QString locale = languageSetting();
static const QLatin1String tag_template("template");
static const QLatin1String tag_displayName("displayname");
static const QLatin1String tag_description("description");
static const QLatin1String attribute_featuresRequired("featuresRequired");
static const QLatin1String attribute_openEditor("openeditor");
static const QLatin1String attribute_priority("priority");
while (!reader.atEnd() && !reader.hasError()) {
reader.readNext();
if (reader.tokenType() != QXmlStreamReader::StartElement)
continue;
if (reader.name() == tag_template) {
info->openFile = reader.attributes().value(attribute_openEditor).toString();
if (reader.attributes().hasAttribute(attribute_priority))
info->priority = reader.attributes().value(attribute_priority).toString();
if (reader.attributes().hasAttribute(attribute_featuresRequired))
info->featuresRequired = reader.attributes().value(attribute_featuresRequired).toString();
} else if (reader.name() == tag_displayName) {
if (!assignLanguageElementText(reader, locale, &info->displayName))
continue;
} else if (reader.name() == tag_description) {
if (!assignLanguageElementText(reader, locale, &info->description))
continue;
}
}
if (reader.hasError()) {
qWarning() << reader.errorString();
return false;
}
return true;
}
class TemplateInfoList
{
public:
TemplateInfoList()
{
QMultiMap<QString, TemplateInfo> multiMap;
foreach (const QString &templateName, templateNames()) {
const QString templatePath = templateRootDirectory() + templateName;
QFile xmlFile(templatePath + QLatin1String("/template.xml"));
if (!xmlFile.open(QIODevice::ReadOnly)) {
qWarning().nospace() << QString::fromLatin1("Cannot open %1").arg(QDir::toNativeSeparators(QFileInfo(xmlFile.fileName()).absoluteFilePath()));
continue;
}
TemplateInfo info;
info.templateName = templateName;
info.templatePath = templatePath;
QXmlStreamReader reader(&xmlFile);
if (parseTemplateXml(reader, &info))
multiMap.insert(info.priority, info);
}
m_templateInfoList = multiMap.values();
}
QList<TemplateInfo> templateInfoList() const { return m_templateInfoList; }
private:
QList<TemplateInfo> m_templateInfoList;
};
Q_GLOBAL_STATIC(TemplateInfoList, templateInfoList)
QList<TemplateInfo> QmlApp::templateInfos()
{
return templateInfoList()->templateInfoList();
}
static QFileInfoList allFilesRecursive(const QString &path)
{
const QDir currentDirectory(path);
QFileInfoList allFiles = currentDirectory.entryInfoList(QDir::Files);
foreach (const QFileInfo &subDirectory, currentDirectory.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
allFiles.append(allFilesRecursive(subDirectory.absoluteFilePath()));
return allFiles;
}
QByteArray QmlApp::readFile(const QString &filePath, bool &ok) const
{
Utils::FileReader reader;
if (!reader.fetch(filePath)) {
ok = false;
return QByteArray();
}
ok = true;
return reader.data();
}
QString QmlApp::readAndAdaptTemplateFile(const QString &filePath, bool &ok) const
{
const QByteArray originalTemplate = readFile(filePath, ok);
if (!ok)
return QString();
QTextStream tsIn(originalTemplate);
QByteArray adaptedTemplate;
QTextStream tsOut(&adaptedTemplate, QIODevice::WriteOnly | QIODevice::Text);
int lineNr = 1;
QString line;
do {
static const QString markerQtcReplace = QLatin1String("QTC_REPLACE");
static const QString markerWith = QLatin1String("WITH");
line = tsIn.readLine();
const int markerQtcReplaceIndex = line.indexOf(markerQtcReplace);
if (markerQtcReplaceIndex >= 0) {
QString replaceXWithYString = line.mid(markerQtcReplaceIndex + markerQtcReplace.length()).trimmed();
if (filePath.endsWith(QLatin1String(".json")))
replaceXWithYString.replace(QRegExp(QLatin1String("\",$")), QString());
else if (filePath.endsWith(QLatin1String(".html")))
replaceXWithYString.replace(QRegExp(QLatin1String(" -->$")), QString());
const QStringList replaceXWithY = replaceXWithYString.split(markerWith);
if (replaceXWithY.count() != 2) {
qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Invalid %3 options.")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace);
ok = false;
return QString();
}
const QString replaceWhat = replaceXWithY.at(0).trimmed();
const QString replaceWith = replaceXWithY.at(1).trimmed();
if (!m_replacementVariables.contains(replaceWith)) {
qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Unknown %3 option \"%4\".")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(markerQtcReplace).arg(replaceWith);
ok = false;
return QString();
}
line = tsIn.readLine(); // Following line which is to be patched.
lineNr++;
if (line.indexOf(replaceWhat) < 0) {
qWarning().nospace() << QString::fromLatin1("Error in %1:%2. Replacement \"%3\" not found.")
.arg(QDir::toNativeSeparators(filePath)).arg(lineNr).arg(replaceWhat);
ok = false;
return QString();
}
line.replace(replaceWhat, m_replacementVariables.value(replaceWith));
}
if (!line.isNull())
tsOut << line << endl;
lineNr++;
} while (!line.isNull());
ok = true;
return QString::fromUtf8(adaptedTemplate);
}
bool QmlApp::addTemplate(const QString &sourceDirectory,
const QString &templateFileName,
const QString &tragetDirectory,
const QString &targetFileName,
Core::GeneratedFiles *files,
QString *errorMessage) const
{
bool fileIsReadable;
Core::GeneratedFile file(tragetDirectory + QLatin1Char('/') + targetFileName);
const QString &data = readAndAdaptTemplateFile(sourceDirectory + QLatin1Char('/') + templateFileName, fileIsReadable);
if (!fileIsReadable) {
if (errorMessage)
*errorMessage = QCoreApplication::translate("QmlApplicationWizard", "Failed to read %1 template.").arg(templateFileName);
return false;
}
file.setContents(data);
files->append(file);
return true;
}
bool QmlApp::addBinaryFile(const QString &sourceDirectory,
const QString &templateFileName,
const QString &tragetDirectory,
const QString &targetFileName,
Core::GeneratedFiles *files,
QString *errorMessage) const
{
bool fileIsReadable;
Core::GeneratedFile file(tragetDirectory + targetFileName);
file.setBinary(true);
const QByteArray &data = readFile(sourceDirectory + QLatin1Char('/') + templateFileName, fileIsReadable);
if (!fileIsReadable) {
if (errorMessage)
*errorMessage = QCoreApplication::translate("QmlApplicationWizard", "Failed to read file %1.").arg(templateFileName);
return false;
}
file.setBinaryContents(data);
files->append(file);
return true;
}
QString QmlApp::renameQmlFile(const QString &fileName) {
if (fileName == QLatin1String("main.qml"))
return mainQmlFileName();
return fileName;
}
Core::GeneratedFiles QmlApp::generateFiles(QString *errorMessage)
{
Core::GeneratedFiles files;
QTC_ASSERT(errorMessage, return files);
errorMessage->clear();
setReplacementVariables();
const QFileInfoList templateFiles = allFilesRecursive(templateDirectory());
foreach (const QFileInfo &templateFile, templateFiles) {
const QString targetSubDirectory = templateFile.path().mid(templateDirectory().length());
const QString targetDirectory = projectDirectory() + targetSubDirectory + QLatin1Char('/');
QString targetFileName = templateFile.fileName();
if (templateFile.fileName() == QLatin1String("main.pro")) {
targetFileName = projectName() + QLatin1String(".pro");
m_creatorFileName = Core::BaseFileWizardFactory::buildFileName(projectDirectory(),
projectName(),
QLatin1String("pro"));
} else if (templateFile.fileName() == QLatin1String("main.qmlproject")) {
targetFileName = projectName() + QLatin1String(".qmlproject");
m_creatorFileName = Core::BaseFileWizardFactory::buildFileName(projectDirectory(),
projectName(),
QLatin1String("qmlproject"));
} else if (templateFile.fileName() == QLatin1String("main.qbp")) {
targetFileName = projectName() + QLatin1String(".qbp");
} else if (targetFileName == QLatin1String("template.xml")
|| targetFileName == QLatin1String("template.png")) {
continue;
} else {
targetFileName = renameQmlFile(templateFile.fileName());
}
if (binaryFiles().contains(templateFile.suffix())) {
bool canAddBinaryFile = addBinaryFile(templateFile.absolutePath(),
templateFile.fileName(),
targetDirectory,
targetFileName,
&files,
errorMessage);
if (!canAddBinaryFile)
return Core::GeneratedFiles();
} else {
bool canAddTemplate = addTemplate(templateFile.absolutePath(),
templateFile.fileName(),
targetDirectory,
targetFileName,
&files,
errorMessage);
if (!canAddTemplate)
return Core::GeneratedFiles();
if (templateFile.fileName() == QLatin1String("main.pro"))
files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute);
else if (templateFile.fileName() == QLatin1String("main.qmlproject"))
files.last().setAttributes(Core::GeneratedFile::OpenProjectAttribute);
else if (templateFile.fileName() == m_templateInfo.openFile)
files.last().setAttributes(Core::GeneratedFile::OpenEditorAttribute);
}
}
return files;
}
void QmlApp::setReplacementVariables()
{
m_replacementVariables.clear();
m_replacementVariables.insert(QLatin1String("main"), mainQmlFileName());
m_replacementVariables.insert(QLatin1String("projectName"), projectName());
}
} // namespace Internal
} // namespace QmlProjectManager

112
src/plugins/qmlprojectmanager/qmlapp.h
View File

@@ -1,112 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QMLAPP_H
#define QMLAPP_H
#include <QString>
#include <QHash>
#include <QObject>
#include <coreplugin/generatedfile.h>
namespace QmlProjectManager {
namespace Internal {
class TemplateInfo
{
public:
QString templateName;
QString templatePath;
QString displayName;
QString description;
QString openFile;
QString featuresRequired;
QString priority;
};
class QmlApp : public QObject
{
Q_OBJECT
public:
QmlApp(QObject *parent = 0);
~QmlApp();
QString mainQmlFileName() const;
QString projectDirectory() const;
QString projectName() const;
QString templateDirectory() const;
static QList<TemplateInfo> templateInfos();
Core::GeneratedFiles generateFiles(QString *errorMessage);
QString renameQmlFile(const QString &fileName);
void setTemplateInfo(const TemplateInfo &templateInfo);
QString creatorFileName() const;
public slots:
void setProjectNameAndBaseDirectory(const QString &projectName, const QString &projectBaseDirectory);
protected:
QString readAndAdaptTemplateFile(const QString &filePath, bool &ok) const;
bool addTemplate(const QString &sourceDirectory,
const QString &sourceFileName,
const QString &targetDirectory,
const QString &targetFileName,
Core::GeneratedFiles *files,
QString *errorMessage) const;
bool addBinaryFile(const QString &sourceDirectory,
const QString &sourceFileName,
const QString &targetDirectory,
const QString &targetFileName,
Core::GeneratedFiles *files,
QString *errorMessage) const;
QByteArray readFile(const QString &filePath, bool &ok) const;
private:
void setReplacementVariables();
QString m_runtime;
QString m_projectName;
QString m_projectBaseDirectory;
bool m_grantUserDataAccess;
QHash<QString, QString> m_replacementVariables;
TemplateInfo m_templateInfo;
QString m_creatorFileName;
};
} // namespace Internal
} // namespace QmlProjectManager
#endif // QMLAPP_H

120
src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
View File

@@ -1,120 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "qmlapplicationwizard.h"
#include "qmlapp.h"
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/customwizard/customwizard.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
#include "qmlprojectmanager.h"
#include "qmlproject.h"
#include "qmlapplicationwizardpages.h"
#include <QIcon>
using namespace Core;
using namespace ExtensionSystem;
using namespace ProjectExplorer;
using namespace QmakeProjectManager;
namespace QmlProjectManager {
namespace Internal {
QmlApplicationWizardDialog::QmlApplicationWizardDialog(QWidget *parent, const WizardDialogParameters &parameters)
: BaseProjectWizardDialog(parent, parameters)
{
setWindowTitle(tr("New Qt Quick UI Project"));
setIntroDescription(tr("This wizard generates a Qt Quick UI project."));
m_componentSetPage = new QmlComponentSetPage;
addPage(m_componentSetPage);
}
TemplateInfo QmlApplicationWizardDialog::templateInfo() const
{
return m_componentSetPage->templateInfo();
}
QmlApplicationWizard::QmlApplicationWizard()
: m_qmlApp(new QmlApp(this))
{
setWizardKind(ProjectWizard);
setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
setId(QLatin1String("QA.QMLB Application"));
setIcon(QIcon(QLatin1String(QmakeProjectManager::Constants::ICON_QTQUICK_APP)));
setDisplayCategory(
QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
setDisplayName(tr("Qt Quick UI"));
setDescription(tr("Creates a Qt Quick UI project."));
setRequiredFeatures(Feature(QtSupport::Constants::FEATURE_QMLPROJECT)
| Feature(QtSupport::Constants::FEATURE_QT_QUICK));
}
BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const
{
QmlApplicationWizardDialog *wizardDialog = new QmlApplicationWizardDialog(parent, parameters);
connect(wizardDialog, &QmlApplicationWizardDialog::projectParametersChanged,
m_qmlApp, &QmlApp::setProjectNameAndBaseDirectory);
wizardDialog->setPath(parameters.defaultPath());
wizardDialog->setProjectName(QmlApplicationWizardDialog::uniqueProjectName(parameters.defaultPath()));
foreach (QWizardPage *page, parameters.extensionPages())
wizardDialog->addPage(page);
return wizardDialog;
}
GeneratedFiles QmlApplicationWizard::generateFiles(const QWizard *w,
QString *errorMessage) const
{
const QmlApplicationWizardDialog *wizard = qobject_cast<const QmlApplicationWizardDialog*>(w);
m_qmlApp->setTemplateInfo(wizard->templateInfo());
return m_qmlApp->generateFiles(errorMessage);
}
bool QmlApplicationWizard::postGenerateFiles(const QWizard * /*wizard*/, const GeneratedFiles &l,
QString *errorMessage)
{
return CustomProjectWizard::postGenerateOpen(l, errorMessage);
}
} // namespace Internal
} // namespace QmlProjectManager

82
src/plugins/qmlprojectmanager/qmlapplicationwizard.h
View File

@@ -1,82 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QMLAPPLICATIONWIZARD_H
#define QMLAPPLICATIONWIZARD_H
#include <coreplugin/basefilewizardfactory.h>
#include <projectexplorer/baseprojectwizarddialog.h>
namespace ExtensionSystem { class IPlugin; }
namespace QmlProjectManager {
namespace Internal {
class QmlApp;
class TemplateInfo;
class QmlComponentSetPage;
class QmlApplicationWizardDialog : public ProjectExplorer::BaseProjectWizardDialog
{
Q_OBJECT
public:
QmlApplicationWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &parameters);
TemplateInfo templateInfo() const;
private:
QmlComponentSetPage *m_componentSetPage;
};
class QmlApplicationWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT
public:
QmlApplicationWizard();
static void createInstances(ExtensionSystem::IPlugin *plugin);
private:
Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
void writeUserFile(const QString &fileName) const;
bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
private:
QmlApp *m_qmlApp;
};
} // namespace Internal
} // namespace QmlProjectManager
#endif // QMLAPPLICATIONWIZARD_H

102
src/plugins/qmlprojectmanager/qmlapplicationwizardpages.cpp
View File

@@ -1,102 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "qmlapplicationwizardpages.h"
#include "qmlapp.h"
#include <utils/wizard.h>
#include <QComboBox>
#include <QLabel>
#include <QVBoxLayout>
namespace QmlProjectManager {
namespace Internal {
class QmlComponentSetPagePrivate
{
public:
QComboBox *m_versionComboBox;
QLabel *m_detailedDescriptionLabel;
};
QmlComponentSetPage::QmlComponentSetPage(QWidget *parent)
: QWizardPage(parent)
, d(new QmlComponentSetPagePrivate)
{
setTitle(tr("Select Qt Quick Component Set"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
QHBoxLayout *l = new QHBoxLayout();
QLabel *label = new QLabel(tr("Qt Quick component set:"), this);
d->m_versionComboBox = new QComboBox(this);
foreach (const TemplateInfo &templateInfo, QmlApp::templateInfos())
d->m_versionComboBox->addItem(templateInfo.displayName);
l->addWidget(label);
l->addWidget(d->m_versionComboBox);
d->m_detailedDescriptionLabel = new QLabel(this);
d->m_detailedDescriptionLabel->setWordWrap(true);
d->m_detailedDescriptionLabel->setTextFormat(Qt::RichText);
connect(d->m_versionComboBox, SIGNAL(currentIndexChanged(int)), this,
SLOT(updateDescription(int)));
updateDescription(d->m_versionComboBox->currentIndex());
mainLayout->addLayout(l);
mainLayout->addWidget(d->m_detailedDescriptionLabel);
setProperty(Utils::SHORT_TITLE_PROPERTY, tr("Component Set"));
}
QmlComponentSetPage::~QmlComponentSetPage()
{
delete d;
}
TemplateInfo QmlComponentSetPage::templateInfo() const
{
if (QmlApp::templateInfos().isEmpty())
return TemplateInfo();
return QmlApp::templateInfos().at(d->m_versionComboBox->currentIndex());
}
void QmlComponentSetPage::updateDescription(int index)
{
if (QmlApp::templateInfos().isEmpty())
return;
const TemplateInfo templateInfo = QmlApp::templateInfos().at(index);
d->m_detailedDescriptionLabel->setText(templateInfo.description);
}
} // namespace Internal
} // namespace QmlProjectManager

61
src/plugins/qmlprojectmanager/qmlapplicationwizardpages.h
View File

@@ -1,61 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms and
** conditions see http://www.qt.io/terms-conditions. For further information
** use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QMLAPPLICATIONWIZARDPAGES_H
#define QMLAPPLICATIONWIZARDPAGES_H
#include <QWizardPage>
namespace QmlProjectManager {
namespace Internal {
class TemplateInfo;
class QmlComponentSetPage : public QWizardPage
{
Q_OBJECT
public:
explicit QmlComponentSetPage(QWidget *parent = 0);
~QmlComponentSetPage();
TemplateInfo templateInfo() const;
private slots:
void updateDescription(int index);
private:
class QmlComponentSetPagePrivate *d;
};
} // namespace Internal
} // namespace QmlProjectManager
#endif // QMLAPPLICATIONWIZARDPAGES_H

1
src/plugins/qmlprojectmanager/qmlproject.qrc
View File

@@ -3,6 +3,5 @@
<file>QmlProjectManager.mimetypes.xml</file>
<file>images/qmlfolder.png</file>
<file>images/qmlproject.png</file>
<file>images/qml_wizard.png</file>
</qresource>
</RCC>

10
src/plugins/qmlprojectmanager/qmlprojectmanager.pro
View File

@@ -15,10 +15,7 @@ HEADERS += qmlproject.h \
qmlprojectrunconfigurationfactory.h \
qmlprojectmanager_global.h \
qmlprojectmanagerconstants.h \
qmlprojectrunconfigurationwidget.h \
qmlapp.h \
qmlapplicationwizard.h \
qmlapplicationwizardpages.h
qmlprojectrunconfigurationwidget.h
SOURCES += qmlproject.cpp \
qmlprojectenvironmentaspect.cpp \
@@ -28,9 +25,6 @@ SOURCES += qmlproject.cpp \
qmlprojectfile.cpp \
qmlprojectrunconfiguration.cpp \
qmlprojectrunconfigurationfactory.cpp \
qmlprojectrunconfigurationwidget.cpp \
qmlapp.cpp \
qmlapplicationwizard.cpp \
qmlapplicationwizardpages.cpp
qmlprojectrunconfigurationwidget.cpp
RESOURCES += qmlproject.qrc

3
src/plugins/qmlprojectmanager/qmlprojectmanager.qbs
View File

@@ -14,9 +14,6 @@ QtcPlugin {
Group {
name: "General"
files: [
"qmlapp.cpp", "qmlapp.h",
"qmlapplicationwizard.cpp", "qmlapplicationwizard.h",
"qmlapplicationwizardpages.cpp", "qmlapplicationwizardpages.h",
"qmlproject.cpp", "qmlproject.h",
"qmlproject.qrc",
"qmlprojectconstants.h",

2
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -32,7 +32,6 @@
#include "qmlprojectmanager.h"
#include "qmlproject.h"
#include "qmlprojectrunconfigurationfactory.h"
#include "qmlapplicationwizard.h"
#include "fileformat/qmlprojectfileformat.h"
#include <coreplugin/fileiconprovider.h>
@@ -64,7 +63,6 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
addAutoReleasedObject(new Internal::Manager);
addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
addAutoReleasedObject(new Internal::QmlApplicationWizard);
Core::FileIconProvider::registerIconOverlayForSuffix(":/qmlproject/images/qmlproject.png", "qmlproject");
return true;