forked from qt-creator/qt-creator
QmlDesigner: add a generate resource menu entry
The result can be used with the Webassembly qmlprojector. Change-Id: I69ed21561c05fcbb9552bf74217e3546c489d4a6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -16,6 +16,7 @@ add_qtc_plugin(QmlDesigner
|
|||||||
designmodewidget.cpp designmodewidget.h
|
designmodewidget.cpp designmodewidget.h
|
||||||
documentmanager.cpp documentmanager.h
|
documentmanager.cpp documentmanager.h
|
||||||
documentwarningwidget.cpp documentwarningwidget.h
|
documentwarningwidget.cpp documentwarningwidget.h
|
||||||
|
generateresource.cpp generateresource.h
|
||||||
openuiqmlfiledialog.cpp openuiqmlfiledialog.h openuiqmlfiledialog.ui
|
openuiqmlfiledialog.cpp openuiqmlfiledialog.h openuiqmlfiledialog.ui
|
||||||
qmldesignerconstants.h
|
qmldesignerconstants.h
|
||||||
qmldesignericons.h
|
qmldesignericons.h
|
||||||
|
156
src/plugins/qmldesigner/generateresource.cpp
Normal file
156
src/plugins/qmldesigner/generateresource.cpp
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2019 The Qt Company Ltd.
|
||||||
|
** Contact: https://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the Qt Design Tooling
|
||||||
|
**
|
||||||
|
** 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 https://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
** General Public License version 3 as published by the Free Software
|
||||||
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||||
|
** included in the packaging of this file. Please review the following
|
||||||
|
** information to ensure the GNU General Public License requirements will
|
||||||
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#include <generateresource.h>
|
||||||
|
|
||||||
|
#include <coreplugin/actionmanager/actionmanager.h>
|
||||||
|
#include <coreplugin/actionmanager/actioncontainer.h>
|
||||||
|
#include <coreplugin/actionmanager/command.h>
|
||||||
|
#include <coreplugin/documentmanager.h>
|
||||||
|
#include <coreplugin/messagemanager.h>
|
||||||
|
|
||||||
|
#include <projectexplorer/project.h>
|
||||||
|
#include <projectexplorer/session.h>
|
||||||
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
|
#include <projectexplorer/target.h>
|
||||||
|
|
||||||
|
#include <qmlprojectmanager/qmlprojectmanagerconstants.h>
|
||||||
|
|
||||||
|
#include <qtsupport/baseqtversion.h>
|
||||||
|
#include <qtsupport/qtkitinformation.h>
|
||||||
|
|
||||||
|
#include <utils/fileutils.h>
|
||||||
|
#include <utils/qtcassert.h>
|
||||||
|
#include <utils/utilsicons.h>
|
||||||
|
#include <utils/synchronousprocess.h>
|
||||||
|
|
||||||
|
#include <QAction>
|
||||||
|
#include <QTemporaryFile>
|
||||||
|
#include <QMap>
|
||||||
|
#include <QProcess>
|
||||||
|
#include <QByteArray>
|
||||||
|
#include <QObject>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
namespace QmlDesigner {
|
||||||
|
void GenerateResource::generateMenuEntry()
|
||||||
|
{
|
||||||
|
Core::ActionContainer *buildMenu =
|
||||||
|
Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT);
|
||||||
|
|
||||||
|
|
||||||
|
const Core::Context projectContext(QmlProjectManager::Constants::QML_PROJECT_ID);
|
||||||
|
// ToDo: move this to QtCreator and add tr to the string then
|
||||||
|
auto action = new QAction(QT_TRANSLATE_NOOP("GenerateResource", "Generate Resource File"));
|
||||||
|
action->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr);
|
||||||
|
// todo make it more intelligent when it gets enabled
|
||||||
|
QObject::connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged, [action]() {
|
||||||
|
action->setEnabled(ProjectExplorer::SessionManager::startupProject());
|
||||||
|
});
|
||||||
|
|
||||||
|
Core::Command *cmd = Core::ActionManager::registerAction(action, "QmlProject.CreateResource");
|
||||||
|
QObject::connect(action, &QAction::triggered, [] () {
|
||||||
|
auto currentProject = ProjectExplorer::SessionManager::startupProject();
|
||||||
|
auto projectPath = currentProject->projectFilePath().parentDir().toString();
|
||||||
|
|
||||||
|
static QMap<QString, QString> lastUsedPathes;
|
||||||
|
auto saveLastUsedPath = [currentProject] (const QString &lastUsedPath) {
|
||||||
|
lastUsedPathes.insert(currentProject->displayName(), lastUsedPath);
|
||||||
|
};
|
||||||
|
saveLastUsedPath(lastUsedPathes.value(currentProject->displayName(),
|
||||||
|
currentProject->projectFilePath().parentDir().toString()));
|
||||||
|
|
||||||
|
auto resourceFileName = Core:: DocumentManager::getSaveFileName(
|
||||||
|
QT_TRANSLATE_NOOP("GenerateResource", "Save Project As Resource"),
|
||||||
|
lastUsedPathes.value(currentProject->displayName()) + currentProject->displayName() + ".qmlrc",
|
||||||
|
QT_TRANSLATE_NOOP("GenerateResource", "QML Resource File (*.qmlrc"));
|
||||||
|
if (resourceFileName.isEmpty())
|
||||||
|
return;
|
||||||
|
|
||||||
|
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource",
|
||||||
|
QString("Generate a resource file out of project %1 to %2").arg(
|
||||||
|
currentProject->displayName(), QDir::toNativeSeparators(resourceFileName))));
|
||||||
|
|
||||||
|
QTemporaryFile temp(projectPath + "/XXXXXXX.create.resource.qrc");
|
||||||
|
if (!temp.open())
|
||||||
|
return;
|
||||||
|
temp.close();
|
||||||
|
|
||||||
|
auto rccBinary = QtSupport::QtKitAspect::qtVersion(currentProject->activeTarget()->kit())->binPath();
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
rccBinary = rccBinary.pathAppended("rcc.exe");
|
||||||
|
#else
|
||||||
|
rccBinary = rccBinary.pathAppended("rcc");
|
||||||
|
#endif
|
||||||
|
QProcess rccProcess;
|
||||||
|
rccProcess.setProgram(rccBinary.toString());
|
||||||
|
rccProcess.setWorkingDirectory(projectPath);
|
||||||
|
|
||||||
|
const QStringList arguments1 = {"--project", "--output", temp.fileName()};
|
||||||
|
const QStringList arguments2 = {"--binary", "--output", resourceFileName, temp.fileName()};
|
||||||
|
|
||||||
|
for (auto arguments : {arguments1, arguments2}) {
|
||||||
|
rccProcess.start(rccBinary.toString(), arguments);
|
||||||
|
if (!rccProcess.waitForStarted()) {
|
||||||
|
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString(
|
||||||
|
"Unable to generate resource file: %1").arg(resourceFileName)));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
QByteArray stdOut;
|
||||||
|
QByteArray stdErr;
|
||||||
|
if (!Utils::SynchronousProcess::readDataFromProcess(rccProcess, 30, &stdOut, &stdErr, true)) {
|
||||||
|
Utils::SynchronousProcess::stopProcess(rccProcess);
|
||||||
|
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString(
|
||||||
|
"A timeout occurred running \"%1\"").arg(rccBinary.toString() + arguments.join(" "))));
|
||||||
|
return ;
|
||||||
|
|
||||||
|
}
|
||||||
|
if (!stdOut.trimmed().isEmpty()) {
|
||||||
|
Core::MessageManager::write(QString::fromLocal8Bit(stdOut));
|
||||||
|
}
|
||||||
|
if (!stdErr.trimmed().isEmpty())
|
||||||
|
Core::MessageManager::write(QString::fromLocal8Bit(stdErr));
|
||||||
|
|
||||||
|
if (rccProcess.exitStatus() != QProcess::NormalExit) {
|
||||||
|
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString(
|
||||||
|
"\"%1\" crashed.").arg(rccBinary.toString() + arguments.join(" "))));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (rccProcess.exitCode() != 0) {
|
||||||
|
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString(
|
||||||
|
"\"%1\" failed (exit code %2).").arg(rccBinary.toString() +
|
||||||
|
" " + arguments.join(" ")).arg(rccProcess.exitCode())));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
saveLastUsedPath(Utils::FilePath::fromString(resourceFileName).parentDir().toString());
|
||||||
|
});
|
||||||
|
buildMenu->addAction(cmd, ProjectExplorer::Constants::G_BUILD_RUN);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace QmlDesigner
|
||||||
|
|
33
src/plugins/qmldesigner/generateresource.h
Normal file
33
src/plugins/qmldesigner/generateresource.h
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
/****************************************************************************
|
||||||
|
**
|
||||||
|
** Copyright (C) 2019 The Qt Company Ltd.
|
||||||
|
** Contact: https://www.qt.io/licensing/
|
||||||
|
**
|
||||||
|
** This file is part of the Qt Design Tooling
|
||||||
|
**
|
||||||
|
** 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 https://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** GNU General Public License Usage
|
||||||
|
** Alternatively, this file may be used under the terms of the GNU
|
||||||
|
** General Public License version 3 as published by the Free Software
|
||||||
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
||||||
|
** included in the packaging of this file. Please review the following
|
||||||
|
** information to ensure the GNU General Public License requirements will
|
||||||
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
||||||
|
**
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
|
||||||
|
namespace QmlDesigner {
|
||||||
|
namespace GenerateResource {
|
||||||
|
void generateMenuEntry();
|
||||||
|
}
|
||||||
|
} // namespace QmlDesigner
|
@@ -30,6 +30,7 @@
|
|||||||
#include "settingspage.h"
|
#include "settingspage.h"
|
||||||
#include "designmodecontext.h"
|
#include "designmodecontext.h"
|
||||||
#include "openuiqmlfiledialog.h"
|
#include "openuiqmlfiledialog.h"
|
||||||
|
#include "generateresource.h"
|
||||||
|
|
||||||
#include <metainfo.h>
|
#include <metainfo.h>
|
||||||
#include <connectionview.h>
|
#include <connectionview.h>
|
||||||
@@ -202,11 +203,14 @@ QmlDesignerPlugin::~QmlDesignerPlugin()
|
|||||||
// INHERITED FROM ExtensionSystem::Plugin
|
// INHERITED FROM ExtensionSystem::Plugin
|
||||||
//
|
//
|
||||||
////////////////////////////////////////////////////
|
////////////////////////////////////////////////////
|
||||||
bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/) // =0;
|
bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *errorMessage/* = 0*/)
|
||||||
{
|
{
|
||||||
if (!Utils::HostOsInfo::canCreateOpenGLContext(errorMessage))
|
if (!Utils::HostOsInfo::canCreateOpenGLContext(errorMessage))
|
||||||
return false;
|
return false;
|
||||||
d = new QmlDesignerPluginPrivate;
|
d = new QmlDesignerPluginPrivate;
|
||||||
|
if (DesignerSettings::getValue(DesignerSettingsKey::STANDALONE_MODE).toBool())
|
||||||
|
GenerateResource::generateMenuEntry();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,6 +4,7 @@ HEADERS += $$PWD/qmldesignerconstants.h \
|
|||||||
$$PWD/designmodewidget.h \
|
$$PWD/designmodewidget.h \
|
||||||
$$PWD/switchsplittabwidget.h \
|
$$PWD/switchsplittabwidget.h \
|
||||||
$$PWD/designersettings.h \
|
$$PWD/designersettings.h \
|
||||||
|
$$PWD/generateresource.h \
|
||||||
$$PWD/settingspage.h \
|
$$PWD/settingspage.h \
|
||||||
$$PWD/designmodecontext.h \
|
$$PWD/designmodecontext.h \
|
||||||
$$PWD/documentmanager.h \
|
$$PWD/documentmanager.h \
|
||||||
@@ -16,6 +17,7 @@ SOURCES += $$PWD/qmldesignerplugin.cpp \
|
|||||||
$$PWD/designmodewidget.cpp \
|
$$PWD/designmodewidget.cpp \
|
||||||
$$PWD/switchsplittabwidget.cpp \
|
$$PWD/switchsplittabwidget.cpp \
|
||||||
$$PWD/designersettings.cpp \
|
$$PWD/designersettings.cpp \
|
||||||
|
$$PWD/generateresource.cpp \
|
||||||
$$PWD/settingspage.cpp \
|
$$PWD/settingspage.cpp \
|
||||||
$$PWD/designmodecontext.cpp \
|
$$PWD/designmodecontext.cpp \
|
||||||
$$PWD/documentmanager.cpp \
|
$$PWD/documentmanager.cpp \
|
||||||
|
@@ -770,6 +770,8 @@ Project {
|
|||||||
}
|
}
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
|
"generateresource.cpp",
|
||||||
|
"generateresource.h",
|
||||||
"designersettings.cpp",
|
"designersettings.cpp",
|
||||||
"designersettings.h",
|
"designersettings.h",
|
||||||
"designmodecontext.cpp",
|
"designmodecontext.cpp",
|
||||||
|
Reference in New Issue
Block a user