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

QmlDesigner: Make "Generate resources" action translatable

Browse Source 
As a first step towards enabling the creation of .qmlrc packages in Qt
Creator, make it translatable (before Qt Creator 4.12 string freeze).

Task-number: QDS-1286
Change-Id: I3fd296c3a9c8ec7fc985b61893b1a7e7037328d2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Alessandro Portale
2020-01-23 16:58:10 +01:00
parent e1d04362ec
commit c6a7aed17e
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qmldesigner/generateresource.cpp
View File

@@ -63,7 +63,7 @@ void GenerateResource::generateMenuEntry()
const Core::Context projectContext(QmlProjectManager::Constants::QML_PROJECT_ID); const Core::Context projectContext(QmlProjectManager::Constants::QML_PROJECT_ID);
// ToDo: move this to QtCreator and add tr to the string then // ToDo: move this to QtCreator and add tr to the string then
auto action = new QAction(QT_TRANSLATE_NOOP("GenerateResource", "Generate Resource File")); auto action = new QAction(QCoreApplication::translate("QmlDesigner::GenerateResource", "Generate Resource File"));
action->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr); action->setEnabled(ProjectExplorer::SessionManager::startupProject() != nullptr);
// todo make it more intelligent when it gets enabled // todo make it more intelligent when it gets enabled
QObject::connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged, [action]() { QObject::connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged, [action]() {
@@ -83,15 +83,15 @@ void GenerateResource::generateMenuEntry()
currentProject->projectFilePath().parentDir().parentDir().toString())); currentProject->projectFilePath().parentDir().parentDir().toString()));
auto resourceFileName = Core:: DocumentManager::getSaveFileName( auto resourceFileName = Core:: DocumentManager::getSaveFileName(
QT_TRANSLATE_NOOP("GenerateResource", "Save Project As Resource"), QCoreApplication::translate("QmlDesigner::GenerateResource", "Save Project As Resource"),
lastUsedPathes.value(currentProject->displayName()) + "/" + currentProject->displayName() + ".qmlrc", lastUsedPathes.value(currentProject->displayName()) + "/" + currentProject->displayName() + ".qmlrc",
QT_TRANSLATE_NOOP("GenerateResource", "QML Resource File (*.qmlrc)")); QCoreApplication::translate("QmlDesigner::GenerateResource", "QML Resource File (*.qmlrc)"));
if (resourceFileName.isEmpty()) if (resourceFileName.isEmpty())
return; return;
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource",
QString("Generate a resource file out of project %1 to %2").arg( "Generate a resource file out of project %1 to %2").arg(
currentProject->displayName(), QDir::toNativeSeparators(resourceFileName)))); currentProject->displayName(), QDir::toNativeSeparators(resourceFileName)));
QTemporaryFile temp(projectPath + "/XXXXXXX.create.resource.qrc"); QTemporaryFile temp(projectPath + "/XXXXXXX.create.resource.qrc");
if (!temp.open()) if (!temp.open())
@@ -111,16 +111,16 @@ void GenerateResource::generateMenuEntry()
for (auto arguments : {arguments1, arguments2}) { for (auto arguments : {arguments1, arguments2}) {
rccProcess.start(rccBinary.toString(), arguments); rccProcess.start(rccBinary.toString(), arguments);
if (!rccProcess.waitForStarted()) { if (!rccProcess.waitForStarted()) {
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString( Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource",
"Unable to generate resource file: %1").arg(resourceFileName))); "Unable to generate resource file: %1").arg(resourceFileName));
return; return;
} }
QByteArray stdOut; QByteArray stdOut;
QByteArray stdErr; QByteArray stdErr;
if (!Utils::SynchronousProcess::readDataFromProcess(rccProcess, 30, &stdOut, &stdErr, true)) { if (!Utils::SynchronousProcess::readDataFromProcess(rccProcess, 30, &stdOut, &stdErr, true)) {
Utils::SynchronousProcess::stopProcess(rccProcess); Utils::SynchronousProcess::stopProcess(rccProcess);
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString( Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource",
"A timeout occurred running \"%1\"").arg(rccBinary.toString() + arguments.join(" ")))); "A timeout occurred running \"%1\"").arg(rccBinary.toString() + arguments.join(" ")));
return ; return ;
} }
@@ -131,14 +131,14 @@ void GenerateResource::generateMenuEntry()
Core::MessageManager::write(QString::fromLocal8Bit(stdErr)); Core::MessageManager::write(QString::fromLocal8Bit(stdErr));
if (rccProcess.exitStatus() != QProcess::NormalExit) { if (rccProcess.exitStatus() != QProcess::NormalExit) {
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString( Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource",
"\"%1\" crashed.").arg(rccBinary.toString() + arguments.join(" ")))); "\"%1\" crashed.").arg(rccBinary.toString() + arguments.join(" ")));
return; return;
} }
if (rccProcess.exitCode() != 0) { if (rccProcess.exitCode() != 0) {
Core::MessageManager::write(QT_TRANSLATE_NOOP("GenerateResource", QString( Core::MessageManager::write(QCoreApplication::translate("QmlDesigner::GenerateResource",
"\"%1\" failed (exit code %2).").arg(rccBinary.toString() + "\"%1\" failed (exit code %2).").arg(rccBinary.toString() +
" " + arguments.join(" ")).arg(rccProcess.exitCode()))); " " + arguments.join(" ")).arg(rccProcess.exitCode()));
return; return;
} }