diff options
author | Daniel Teske <daniel.teske@digia.com> | 2014-04-25 12:32:49 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@digia.com> | 2014-05-27 10:04:41 +0200 |
commit | 7e8a945e6ef4c3edcae53ccb081af1e239106eac (patch) | |
tree | c8b2e835f20a1ddcac217b3cf9921701d053162c /src | |
parent | e30e3e3ba1c1a4c321543b80bd1112e2d1c21d41 (diff) | |
download | qt-creator-7e8a945e6ef4c3edcae53ccb081af1e239106eac.tar.gz |
Html5Wizard: Remove it
This wizard is from a different era. Nowadays webkit is on the way
towards deprecation and the replacement isn't ready yet.
Change-Id: Ifac9a42463562fefaa4a33eb7be2a09e0d8af1aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
15 files changed, 2 insertions, 1017 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 85721f6da8..c2ea6caf7d 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -39,7 +39,6 @@ #include "findqmakeprofiles.h" #include "wizards/abstractmobileapp.h" #include "wizards/qtquickapp.h" -#include "wizards/html5app.h" #include <coreplugin/icontext.h> #include <coreplugin/icore.h> @@ -427,7 +426,6 @@ bool QmakeProject::fromMap(const QVariantMap &map) // // Update boiler plate code for subprojects. QtQuickApp qtQuickApp; - const Html5App html5App; foreach (QmakeProFileNode *node, applicationProFiles(QmakeProject::ExactAndCumulativeParse)) { const QString path = node->path(); @@ -436,7 +434,6 @@ bool QmakeProject::fromMap(const QVariantMap &map) qtQuickApp.setTemplateInfo(info); updateBoilerPlateCodeFiles(&qtQuickApp, path); } - updateBoilerPlateCodeFiles(&html5App, path); } return true; } diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp index b7146ee48f..11845289b2 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.cpp @@ -38,7 +38,6 @@ #include "qmakebuildconfiguration.h" #include "addlibrarywizard.h" #include "wizards/qtquickapp.h" -#include "wizards/html5app.h" #include <projectexplorer/projectexplorer.h> #include <projectexplorer/buildmanager.h> diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro index 2b55092588..c115379c67 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro @@ -38,9 +38,6 @@ HEADERS += \ wizards/qtquickapp.h \ wizards/qtquickappwizard.h \ wizards/qtquickappwizardpages.h \ - wizards/html5app.h \ - wizards/html5appwizard.h \ - wizards/html5appwizardpages.h \ wizards/abstractmobileapp.h \ wizards/abstractmobileappwizard.h \ wizards/subdirsprojectwizard.h \ @@ -93,9 +90,6 @@ SOURCES += \ wizards/qtquickapp.cpp \ wizards/qtquickappwizard.cpp \ wizards/qtquickappwizardpages.cpp \ - wizards/html5app.cpp \ - wizards/html5appwizard.cpp \ - wizards/html5appwizardpages.cpp \ wizards/abstractmobileapp.cpp \ wizards/abstractmobileappwizard.cpp \ wizards/subdirsprojectwizard.cpp \ @@ -117,8 +111,7 @@ FORMS += makestep.ui \ qmakestep.ui \ qmakeprojectconfigwidget.ui \ librarydetailswidget.ui \ - wizards/testwizardpage.ui \ - wizards/html5appwizardsourcespage.ui + wizards/testwizardpage.ui RESOURCES += qmakeprojectmanager.qrc \ wizards/wizards.qrc diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 4d7af8f967..a6d4d6ce57 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -100,10 +100,6 @@ QtcPlugin { "filespage.cpp", "filespage.h", "guiappwizard.cpp", "guiappwizard.h", "guiappwizarddialog.cpp", "guiappwizarddialog.h", - "html5app.cpp", "html5app.h", - "html5appwizard.cpp", "html5appwizard.h", - "html5appwizardpages.cpp", "html5appwizardpages.h", - "html5appwizardsourcespage.ui", "libraryparameters.cpp", "libraryparameters.h", "librarywizard.cpp", "librarywizard.h", "librarywizarddialog.cpp", "librarywizarddialog.h", @@ -129,7 +125,6 @@ QtcPlugin { files: [ "console.png", "gui.png", - "html5app.png", "lib.png", "qtquickapp.png", ] diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h index c0a66057db..a729868789 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerconstants.h @@ -70,7 +70,6 @@ const char QMAKEPROJECT_ID[] = "Qt4ProjectManager.Qt4Project"; // ICONS const char ICON_QTQUICK_APP[] = ":/wizards/images/qtquickapp.png"; -const char ICON_HTML5_APP[] = ":/wizards/images/html5app.png"; // Env variables const char QMAKEVAR_QMLJSDEBUGGER_PATH[] = "QMLJSDEBUGGER_PATH"; diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index c9ad7b8cae..5ff0dc815f 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -42,7 +42,6 @@ #include "wizards/emptyprojectwizard.h" #include "wizards/subdirsprojectwizard.h" #include "wizards/qtquickappwizard.h" -#include "wizards/html5appwizard.h" #include "customwidgetwizard/customwidgetwizard.h" #include "profileeditorfactory.h" #include "profilehoverhandler.h" @@ -122,7 +121,6 @@ bool QmakeProjectManagerPlugin::initialize(const QStringList &arguments, QString addAutoReleasedObject(new GuiAppWizard); addAutoReleasedObject(new ConsoleAppWizard); addAutoReleasedObject(new QtQuickAppWizard); - addAutoReleasedObject(new Html5AppWizard); addAutoReleasedObject(new LibraryWizard); addAutoReleasedObject(new TestWizard); addAutoReleasedObject(new CustomWidgetWizard); diff --git a/src/plugins/qmakeprojectmanager/wizards/html5app.cpp b/src/plugins/qmakeprojectmanager/wizards/html5app.cpp deleted file mode 100644 index f37cf68d6d..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5app.cpp +++ /dev/null @@ -1,317 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "html5app.h" - -#include <QDir> -#include <QFile> -#include <QTextStream> -#include <QCoreApplication> - -#ifndef CREATORLESSTEST -#include <coreplugin/icore.h> -#endif // CREATORLESSTEST - -namespace QmakeProjectManager { -namespace Internal { - -const QString appViewerBaseName(QLatin1String("html5applicationviewer")); -const QString appViewerPriFileName(appViewerBaseName + QLatin1String(".pri")); -const QString appViewerCppFileName(appViewerBaseName + QLatin1String(".cpp")); -const QString appViewerHFileName(appViewerBaseName + QLatin1String(".h")); -const QString appViewerOriginsSubDir(appViewerBaseName + QLatin1Char('/')); - -Html5App::Html5App() - : AbstractMobileApp() - , m_mainHtmlMode(ModeGenerate) - , m_touchOptimizedNavigationEnabled(false) -{ -} - -Html5App::~Html5App() -{ -} - -void Html5App::setMainHtml(Mode mode, const QString &data) -{ - Q_ASSERT(mode != ModeGenerate || data.isEmpty()); - m_mainHtmlMode = mode; - m_mainHtmlData = data; -} - -Html5App::Mode Html5App::mainHtmlMode() const -{ - return m_mainHtmlMode; -} - -void Html5App::setTouchOptimizedNavigationEnabled(bool enabled) -{ - m_touchOptimizedNavigationEnabled = enabled; -} - -bool Html5App::touchOptimizedNavigationEnabled() const -{ - return m_touchOptimizedNavigationEnabled; -} - -QString Html5App::pathExtended(int fileType) const -{ - const QString appViewerTargetSubDir = appViewerOriginsSubDir; - const QString indexHtml = QLatin1String("index.html"); - const QString pathBase = outputPathBase(); - const QDir appProFilePath(pathBase); - const bool generateHtml = m_mainHtmlMode == ModeGenerate; - const bool importHtml = m_mainHtmlMode == ModeImport; - const QFileInfo importedHtmlFile(m_mainHtmlData); - const QString htmlSubDir = importHtml ? importedHtmlFile.canonicalPath().split(QLatin1Char('/')).last() + QLatin1Char('/') - : QString::fromLatin1("html/"); - - switch (fileType) { - case MainHtml: return generateHtml ? pathBase + htmlSubDir + indexHtml - : importedHtmlFile.canonicalFilePath(); - case MainHtmlDeployed: return generateHtml ? QString(htmlSubDir + indexHtml) - : htmlSubDir + importedHtmlFile.fileName(); - case MainHtmlOrigin: return originsRoot() + QLatin1String("html/") + indexHtml; - case AppViewerPri: return pathBase + appViewerTargetSubDir + appViewerPriFileName; - case AppViewerPriOrigin: return originsRoot() + appViewerOriginsSubDir + appViewerPriFileName; - case AppViewerCpp: return pathBase + appViewerTargetSubDir + appViewerCppFileName; - case AppViewerCppOrigin: return originsRoot() + appViewerOriginsSubDir + appViewerCppFileName; - case AppViewerH: return pathBase + appViewerTargetSubDir + appViewerHFileName; - case AppViewerHOrigin: return originsRoot() + appViewerOriginsSubDir + appViewerHFileName; - case HtmlDir: return pathBase + htmlSubDir; - case HtmlDirProFileRelative: return generateHtml ? QString(htmlSubDir).remove(htmlSubDir.length() - 1, 1) - : appProFilePath.relativeFilePath(importedHtmlFile.canonicalPath()); - default: qFatal("Html5App::pathExtended() needs more work"); - } - return QString(); -} - -QString Html5App::originsRoot() const -{ - return templatesRoot() + QLatin1String("html5app/"); -} - -QString Html5App::mainWindowClassName() const -{ - return QLatin1String("Html5ApplicationViewer"); -} - -bool Html5App::adaptCurrentMainCppTemplateLine(QString &line) const -{ - const QLatin1Char quote('"'); - bool adaptLine = true; - if (line.contains(QLatin1String("// MAINHTMLFILE"))) { - if (m_mainHtmlMode != ModeUrl) - insertParameter(line, quote + path(MainHtmlDeployed) + quote); - else - adaptLine = false; - } else if (line.contains(QLatin1String("// MAINHTMLURL"))) { - if (m_mainHtmlMode == ModeUrl) - insertParameter(line, quote + m_mainHtmlData + quote); - else - adaptLine = false; - } - return adaptLine; -} - -void Html5App::handleCurrentProFileTemplateLine(const QString &line, - QTextStream &proFileTemplate, QTextStream &proFile, - bool &commentOutNextLine) const -{ - Q_UNUSED(proFileTemplate) - Q_UNUSED(proFile) - if (line.contains(QLatin1String("# TOUCH_OPTIMIZED_NAVIGATION"))) - commentOutNextLine = !m_touchOptimizedNavigationEnabled; -} - -#ifndef CREATORLESSTEST -Core::GeneratedFiles Html5App::generateFiles(QString *errorMessage) const -{ - Core::GeneratedFiles files = AbstractMobileApp::generateFiles(errorMessage); - if (m_mainHtmlMode == ModeGenerate) { - files.append(file(generateFile(Html5AppGeneratedFileInfo::MainHtmlFile, errorMessage), path(MainHtml))); - files.last().setAttributes(Core::GeneratedFile::OpenEditorAttribute); - } - - files.append(file(generateFile(Html5AppGeneratedFileInfo::AppViewerPriFile, errorMessage), path(AppViewerPri))); - files.append(file(generateFile(Html5AppGeneratedFileInfo::AppViewerCppFile, errorMessage), path(AppViewerCpp))); - files.append(file(generateFile(Html5AppGeneratedFileInfo::AppViewerHFile, errorMessage), path(AppViewerH))); - - return files; -} -#endif // CREATORLESSTEST - -QByteArray Html5App::appViewerCppFileCode(QString *errorMessage) const -{ - static const char* touchNavigavigationFiles[] = { - "webtouchphysicsinterface.h", - "webtouchphysics.h", - "webtouchevent.h", - "webtouchscroller.h", - "webtouchnavigation.h", - "webnavigation.h", - "navigationcontroller.h", - "webtouchphysicsinterface.cpp", - "webtouchphysics.cpp", - "webtouchevent.cpp", - "webtouchscroller.cpp", - "webtouchnavigation.cpp", - "webnavigation.cpp", - "navigationcontroller.cpp", - }; - static const QString touchNavigavigationDir = - originsRoot() + appViewerOriginsSubDir + QLatin1String("touchnavigation/"); - QByteArray touchNavigavigationCode; - for (size_t i = 0; i < sizeof(touchNavigavigationFiles) / sizeof(touchNavigavigationFiles[0]); ++i) { - QFile touchNavigavigationFile(touchNavigavigationDir + QLatin1String(touchNavigavigationFiles[i])); - if (!touchNavigavigationFile.open(QIODevice::ReadOnly)) { - if (errorMessage) - *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp", - "Could not open template file \"%1\".").arg(QLatin1String(touchNavigavigationFiles[i])); - return QByteArray(); - } - QTextStream touchNavigavigationFileIn(&touchNavigavigationFile); - QString line; - while (!(line = touchNavigavigationFileIn.readLine()).isNull()) { - if (line.startsWith(QLatin1String("#include")) || - ((line.startsWith(QLatin1String("#ifndef")) - || line.startsWith(QLatin1String("#define")) - || line.startsWith(QLatin1String("#endif"))) - && line.endsWith(QLatin1String("_H")))) - continue; - touchNavigavigationCode.append(line.toLatin1()); - touchNavigavigationCode.append('\n'); - } - } - - QFile appViewerCppFile(path(AppViewerCppOrigin)); - if (!appViewerCppFile.open(QIODevice::ReadOnly)) { - if (errorMessage) - *errorMessage = QCoreApplication::translate("QmakeProjectManager::AbstractMobileApp", - "Could not open template file \"%1\".").arg(path(AppViewerCppOrigin)); - return QByteArray(); - } - QTextStream in(&appViewerCppFile); - QByteArray appViewerCppCode; - bool touchNavigavigationCodeInserted = false; - QString line; - while (!(line = in.readLine()).isNull()) { - if (!touchNavigavigationCodeInserted && line == QLatin1String("#ifdef TOUCH_OPTIMIZED_NAVIGATION")) { - appViewerCppCode.append(line.toLatin1()); - appViewerCppCode.append('\n'); - while (!(line = in.readLine()).isNull() - && !line.contains(QLatin1String("#endif // TOUCH_OPTIMIZED_NAVIGATION"))) - { - if (!line.startsWith(QLatin1String("#include \""))) { - appViewerCppCode.append(line.toLatin1()); - appViewerCppCode.append('\n'); - } - } - appViewerCppCode.append(touchNavigavigationCode); - touchNavigavigationCodeInserted = true; - } - appViewerCppCode.append(line.toLatin1()); - appViewerCppCode.append('\n'); - } - return appViewerCppCode; -} - -QByteArray Html5App::generateFileExtended(int fileType, - bool *versionAndCheckSum, QString *comment, QString *errorMessage) const -{ - QByteArray data; - switch (fileType) { - case Html5AppGeneratedFileInfo::MainHtmlFile: - data = readBlob(path(MainHtmlOrigin), errorMessage); - break; - case Html5AppGeneratedFileInfo::AppViewerPriFile: - data = readBlob(path(AppViewerPriOrigin), errorMessage); - data.append(readBlob(path(DeploymentPriOrigin), errorMessage)); - *comment = ProFileComment; - *versionAndCheckSum = true; - break; - case Html5AppGeneratedFileInfo::AppViewerCppFile: - data = appViewerCppFileCode(errorMessage); - *versionAndCheckSum = true; - break; - case Html5AppGeneratedFileInfo::AppViewerHFile: - default: - data = readBlob(path(AppViewerHOrigin), errorMessage); - *versionAndCheckSum = true; - break; - } - return data; -} - -int Html5App::stubVersionMinor() const -{ - return StubVersion; -} - -QList<AbstractGeneratedFileInfo> Html5App::updateableFiles(const QString &mainProFile) const -{ - QList<AbstractGeneratedFileInfo> result; - static const struct { - int fileType; - QString fileName; - } files[] = { - {Html5AppGeneratedFileInfo::AppViewerPriFile, appViewerPriFileName}, - {Html5AppGeneratedFileInfo::AppViewerHFile, appViewerHFileName}, - {Html5AppGeneratedFileInfo::AppViewerCppFile, appViewerCppFileName} - }; - const QFileInfo mainProFileInfo(mainProFile); - const int size = sizeof(files) / sizeof(files[0]); - for (int i = 0; i < size; ++i) { - const QString fileName = mainProFileInfo.dir().absolutePath() - + QLatin1Char('/') + appViewerOriginsSubDir + files[i].fileName; - if (!QFile::exists(fileName)) - continue; - Html5AppGeneratedFileInfo file; - file.fileType = files[i].fileType; - file.fileInfo = QFileInfo(fileName); - file.currentVersion = AbstractMobileApp::makeStubVersion(Html5App::StubVersion); - result.append(file); - } - if (result.count() != size) - result.clear(); // All files must be found. No wrong/partial updates, please. - return result; -} - -QList<DeploymentFolder> Html5App::deploymentFolders() const -{ - QList<DeploymentFolder> result; - if (m_mainHtmlMode != ModeUrl) - result.append(DeploymentFolder(path(HtmlDirProFileRelative), QLatin1String("."))); - return result; -} - -const int Html5App::StubVersion = 12; - -} // namespace Internal -} // namespace QmakeProjectManager diff --git a/src/plugins/qmakeprojectmanager/wizards/html5app.h b/src/plugins/qmakeprojectmanager/wizards/html5app.h deleted file mode 100644 index bb05cce870..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5app.h +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef HTML5APP_H -#define HTML5APP_H - -#include "abstractmobileapp.h" - -namespace QmakeProjectManager { -namespace Internal { - -struct Html5AppGeneratedFileInfo : public AbstractGeneratedFileInfo -{ - enum ExtendedFileType { - MainHtmlFile = ExtendedFile, - AppViewerPriFile, - AppViewerCppFile, - AppViewerHFile - }; - - Html5AppGeneratedFileInfo() : AbstractGeneratedFileInfo() - { - } -}; - -class Html5App : public AbstractMobileApp -{ -public: - enum ExtendedFileType { - MainHtml = ExtendedFile, - MainHtmlDeployed, - MainHtmlOrigin, - AppViewerPri, - AppViewerPriOrigin, - AppViewerCpp, - AppViewerCppOrigin, - AppViewerH, - AppViewerHOrigin, - HtmlDir, - HtmlDirProFileRelative, - ModulesDir - }; - - enum Mode { - ModeGenerate, - ModeImport, - ModeUrl - }; - - Html5App(); - virtual ~Html5App(); - - void setMainHtml(Mode mode, const QString &data = QString()); - Mode mainHtmlMode() const; - - void setTouchOptimizedNavigationEnabled(bool enabled); - bool touchOptimizedNavigationEnabled() const; - -#ifndef CREATORLESSTEST - virtual Core::GeneratedFiles generateFiles(QString *errorMessage) const; -#else - bool generateFiles(QString *errorMessage) const; -#endif // CREATORLESSTEST - - static const int StubVersion; - -private: - virtual QByteArray generateFileExtended(int fileType, - bool *versionAndCheckSum, QString *comment, QString *errorMessage) const; - virtual QString pathExtended(int fileType) const; - virtual QString originsRoot() const; - virtual QString mainWindowClassName() const; - virtual int stubVersionMinor() const; - virtual bool adaptCurrentMainCppTemplateLine(QString &line) const; - virtual void handleCurrentProFileTemplateLine(const QString &line, - QTextStream &proFileTemplate, QTextStream &proFile, - bool &commentOutNextLine) const; - QList<AbstractGeneratedFileInfo> updateableFiles(const QString &mainProFile) const; - QList<DeploymentFolder> deploymentFolders() const; - QByteArray appViewerCppFileCode(QString *errorMessage) const; - - QFileInfo m_indexHtmlFile; - Mode m_mainHtmlMode; - QString m_mainHtmlData; - bool m_touchOptimizedNavigationEnabled; -}; - -} // namespace Internal -} // namespace QmakeProjectManager - -#endif // HTML5APP_H diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/html5appwizard.cpp deleted file mode 100644 index bfe11dc188..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.cpp +++ /dev/null @@ -1,152 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "html5appwizard.h" - -#include "html5app.h" -#include "html5appwizardpages.h" -#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h> - -#include <qtsupport/baseqtversion.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/targetsetuppage.h> -#include <qtsupport/qtsupportconstants.h> -#include <limits> - -#include <QIcon> - -namespace QmakeProjectManager { -namespace Internal { - -class Html5AppWizardDialog : public AbstractMobileAppWizardDialog -{ - Q_OBJECT - -public: - explicit Html5AppWizardDialog(QWidget *parent, const Core::WizardDialogParameters ¶meters); - -private: - class Html5AppWizardOptionsPage *m_htmlOptionsPage; - friend class Html5AppWizard; -}; - -Html5AppWizardDialog::Html5AppWizardDialog(QWidget *parent, - const Core::WizardDialogParameters ¶meters) - : AbstractMobileAppWizardDialog(parent, QtSupport::QtVersionNumber(), - QtSupport::QtVersionNumber(), parameters), - m_htmlOptionsPage(0) -{ - setWindowTitle(tr("New HTML5 Application")); - setIntroDescription(tr("This wizard generates a HTML5 Application project.")); - - m_htmlOptionsPage = new Html5AppWizardOptionsPage; - addPageWithTitle(m_htmlOptionsPage, tr("HTML Options")); - addKitsPage(); -} - - -class Html5AppWizardPrivate -{ - class Html5App *app; - class Html5AppWizardDialog *wizardDialog; - friend class Html5AppWizard; -}; - -Html5AppWizard::Html5AppWizard() - : d(new Html5AppWizardPrivate) -{ - setWizardKind(ProjectWizard); - setIcon(QIcon(QLatin1String(Constants::ICON_HTML5_APP))); - setDisplayName(tr("HTML5 Application")); - setId(QLatin1String("QA.HTML5A Application")); - setDescription(tr("Creates an HTML5 application project that can contain " - "both HTML5 and C++ code and includes a WebKit view.\n\n" - "You can build the application and deploy it on desktop and " - "mobile target platforms.")); - setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY)); - setDisplayCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY)); - setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_WEBKIT)); - - d->app = new Html5App; - d->wizardDialog = 0; -} - -Html5AppWizard::~Html5AppWizard() -{ - delete d->app; - delete d; -} - -AbstractMobileAppWizardDialog *Html5AppWizard::createWizardDialogInternal(QWidget *parent, - const Core::WizardDialogParameters ¶meters) const -{ - d->wizardDialog = new Html5AppWizardDialog(parent, parameters); - d->wizardDialog->m_htmlOptionsPage->setTouchOptimizationEndabled( - d->app->touchOptimizedNavigationEnabled()); - return d->wizardDialog; -} - -void Html5AppWizard::projectPathChanged(const QString &path) const -{ - if (d->wizardDialog->kitsPage()) - d->wizardDialog->kitsPage()->setProjectPath(path); -} - -void Html5AppWizard::prepareGenerateFiles(const QWizard *w, - QString *errorMessage) const -{ - Q_UNUSED(errorMessage) - const Html5AppWizardDialog *wizard = qobject_cast<const Html5AppWizardDialog*>(w); - d->app->setMainHtml(wizard->m_htmlOptionsPage->mainHtmlMode(), - wizard->m_htmlOptionsPage->mainHtmlData()); - d->app->setTouchOptimizedNavigationEnabled( - wizard->m_htmlOptionsPage->touchOptimizationEndabled()); -} - -QString Html5AppWizard::fileToOpenPostGeneration() const -{ - return d->app->mainHtmlMode() == Html5App::ModeUrl ? - d->app->path(AbstractMobileApp::MainCpp) - : d->app->path(Html5App::MainHtml); -} - -AbstractMobileApp *Html5AppWizard::app() const -{ - return d->app; -} - -AbstractMobileAppWizardDialog *Html5AppWizard::wizardDialog() const -{ - return d->wizardDialog; -} - -} // namespace Internal -} // namespace QmakeProjectManager - -#include "html5appwizard.moc" diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h b/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h deleted file mode 100644 index 22134c1a4f..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizard.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef HTML5APPWIZARD_H -#define HTML5APPWIZARD_H - -#include "abstractmobileappwizard.h" - -namespace QmakeProjectManager { -namespace Internal { - -class Html5AppWizard : public AbstractMobileAppWizard -{ - Q_OBJECT - -public: - Html5AppWizard(); - ~Html5AppWizard(); - -protected: - QString fileToOpenPostGeneration() const; - -private: - AbstractMobileApp *app() const; - AbstractMobileAppWizardDialog *wizardDialog() const; - AbstractMobileAppWizardDialog *createWizardDialogInternal(QWidget *parent, - const Core::WizardDialogParameters ¶meters) const; - void projectPathChanged(const QString &path) const; - void prepareGenerateFiles(const QWizard *wizard, QString *errorMessage) const; - - class Html5AppWizardPrivate *d; -}; - -} // namespace Internal -} // namespace QmakeProjectManager - -#endif // HTML5APPWIZARD_H diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.cpp b/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.cpp deleted file mode 100644 index 6fdaccd035..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#include "html5appwizardpages.h" -#include "ui_html5appwizardsourcespage.h" - -namespace QmakeProjectManager { -namespace Internal { - -class Html5AppWizardOptionsPagePrivate -{ - Ui::Html5AppWizardSourcesPage ui; - friend class Html5AppWizardOptionsPage; -}; - -Html5AppWizardOptionsPage::Html5AppWizardOptionsPage(QWidget *parent) - : QWizardPage(parent) - , d(new Html5AppWizardOptionsPagePrivate) -{ - d->ui.setupUi(this); - d->ui.importLineEdit->setExpectedKind(Utils::PathChooser::File); - d->ui.importLineEdit->setHistoryCompleter(QLatin1String("Qmake.Html.History")); - d->ui.importLineEdit->setPromptDialogFilter(QLatin1String("*.html")); - d->ui.importLineEdit->setPromptDialogTitle(tr("Select HTML File")); - connect(d->ui.importLineEdit, SIGNAL(changed(QString)), SIGNAL(completeChanged())); - connect(d->ui.importRadioButton, - SIGNAL(toggled(bool)), SIGNAL(completeChanged())); - connect(d->ui.generateRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - connect(d->ui.importRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - connect(d->ui.urlRadioButton, SIGNAL(toggled(bool)), SLOT(setLineEditsEnabled())); - d->ui.generateRadioButton->setChecked(true); -} - -Html5AppWizardOptionsPage::~Html5AppWizardOptionsPage() -{ - delete d; -} - -Html5App::Mode Html5AppWizardOptionsPage::mainHtmlMode() const -{ - Html5App::Mode result = Html5App::ModeGenerate; - if (d->ui.importRadioButton->isChecked()) - result = Html5App::ModeImport; - else if (d->ui.urlRadioButton->isChecked()) - result = Html5App::ModeUrl; - return result; -} - -QString Html5AppWizardOptionsPage::mainHtmlData() const -{ - switch (mainHtmlMode()) { - case Html5App::ModeImport: return d->ui.importLineEdit->path(); - case Html5App::ModeUrl: return d->ui.urlLineEdit->text(); - default: - case Html5App::ModeGenerate: return QString(); - } -} - -void Html5AppWizardOptionsPage::setTouchOptimizationEndabled(bool enabled) -{ - d->ui.touchOptimizationCheckBox->setChecked(enabled); -} - -bool Html5AppWizardOptionsPage::touchOptimizationEndabled() const -{ - return d->ui.touchOptimizationCheckBox->isChecked(); -} - -bool Html5AppWizardOptionsPage::isComplete() const -{ - return mainHtmlMode() != Html5App::ModeImport || d->ui.importLineEdit->isValid(); -} - -void Html5AppWizardOptionsPage::setLineEditsEnabled() -{ - d->ui.importLineEdit->setEnabled(d->ui.importRadioButton->isChecked()); - d->ui.urlLineEdit->setEnabled(d->ui.urlRadioButton->isChecked()); -} - -} // namespace Internal -} // namespace QmakeProjectManager diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.h b/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.h deleted file mode 100644 index 091f98ea78..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizardpages.h +++ /dev/null @@ -1,63 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/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 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef HTML5APPWIZARDPAGES_H -#define HTML5APPWIZARDPAGES_H - -#include <QWizardPage> -#include "html5app.h" - -namespace QmakeProjectManager { -namespace Internal { - -class Html5AppWizardOptionsPage : public QWizardPage -{ - Q_OBJECT - -public: - explicit Html5AppWizardOptionsPage(QWidget *parent = 0); - virtual ~Html5AppWizardOptionsPage(); - - Html5App::Mode mainHtmlMode() const; - QString mainHtmlData() const; - void setTouchOptimizationEndabled(bool enabled); - bool touchOptimizationEndabled() const; - virtual bool isComplete() const; - -private slots: - void setLineEditsEnabled(); - -private: - class Html5AppWizardOptionsPagePrivate *d; -}; - -} // namespace Internal -} // namespace QmakeProjectManager - -#endif // HTML5APPWIZARDPAGES_H diff --git a/src/plugins/qmakeprojectmanager/wizards/html5appwizardsourcespage.ui b/src/plugins/qmakeprojectmanager/wizards/html5appwizardsourcespage.ui deleted file mode 100644 index b2a10f3877..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/html5appwizardsourcespage.ui +++ /dev/null @@ -1,176 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>QmakeProjectManager::Internal::Html5AppWizardSourcesPage</class> - <widget class="QWizardPage" name="QmakeProjectManager::Internal::Html5AppWizardSourcesPage"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>605</width> - <height>386</height> - </rect> - </property> - <property name="windowTitle"> - <string>WizardPage</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout_2"> - <item> - <widget class="QGroupBox" name="mainQmlFileGroupBox"> - <property name="title"> - <string>Main HTML File</string> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="2"> - <widget class="QRadioButton" name="generateRadioButton"> - <property name="text"> - <string>Generate an index.html file</string> - </property> - </widget> - </item> - <item row="1" column="0" colspan="2"> - <widget class="QRadioButton" name="importRadioButton"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Import an existing .html file</string> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="Utils::PathChooser" name="importLineEdit" native="true"> - <property name="enabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="2" column="0"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>12</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QRadioButton" name="urlRadioButton"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>Load a URL</string> - </property> - </widget> - </item> - <item row="4" column="1"> - <widget class="QLineEdit" name="urlLineEdit"> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="text"> - <string>http://</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Maximum</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>12</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - </item> - <item> - <widget class="QLabel" name="deploymentNote"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>Note: Unless you chose to load a URL, all files and directories that reside in the same directory as the main HTML file are deployed. You can modify the contents of the directory any time before deploying.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QGroupBox" name="groupBox"> - <property name="title"> - <string>Touch optimized navigation</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QCheckBox" name="touchOptimizationCheckBox"> - <property name="text"> - <string>Enable touch optimized navigation</string> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Touch optimized navigation will make the HTML page flickable and enlarge the area of touch sensitive elements. If you use a JavaScript framework which optimizes the touch interaction, leave the checkbox unchecked.</string> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>Utils::PathChooser</class> - <extends>QWidget</extends> - <header location="global">utils/pathchooser.h</header> - <container>1</container> - <slots> - <signal>editingFinished()</signal> - <signal>browsingFinished()</signal> - </slots> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> diff --git a/src/plugins/qmakeprojectmanager/wizards/images/html5app.png b/src/plugins/qmakeprojectmanager/wizards/images/html5app.png Binary files differdeleted file mode 100644 index 199ec43511..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/images/html5app.png +++ /dev/null diff --git a/src/plugins/qmakeprojectmanager/wizards/wizards.qrc b/src/plugins/qmakeprojectmanager/wizards/wizards.qrc index 4294ca2028..f34fda830b 100644 --- a/src/plugins/qmakeprojectmanager/wizards/wizards.qrc +++ b/src/plugins/qmakeprojectmanager/wizards/wizards.qrc @@ -1,9 +1,8 @@ <RCC> - <qresource prefix="/wizards" > + <qresource prefix="/wizards"> <file>images/console.png</file> <file>images/gui.png</file> <file>images/lib.png</file> <file>images/qtquickapp.png</file> - <file>images/html5app.png</file> </qresource> </RCC> |