summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui2
-rw-r--r--src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp10
-rw-r--r--src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp4
-rw-r--r--src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp4
4 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
index 0f51525b6b..fa80758867 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>Export QML</string>
+ <string>Export Components</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp
index d782425232..9b74b3471f 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporter.cpp
@@ -158,7 +158,7 @@ void AssetExporter::beginExport()
void AssetExporter::cancel()
{
if (!m_cancelled) {
- ExportNotification::addInfo(tr("Cancelling export."));
+ ExportNotification::addInfo(tr("Canceling export."));
m_assetDumper.reset();
m_cancelled = true;
}
@@ -227,13 +227,13 @@ void AssetExporter::notifyLoadError(AssetExporterView::LoadState state)
errorStr = tr("Loading file is taking too long.");
break;
case AssetExporterView::LoadState::QmlErrorState:
- errorStr = tr("Cannot parse. QML file has errors.");
+ errorStr = tr("Cannot parse. The file contains coding errors.");
break;
default:
return;
}
qCDebug(loggerError) << "QML load error:" << errorStr;
- ExportNotification::addError(tr("Loading QML failed. %1").arg(errorStr));
+ ExportNotification::addError(tr("Loading components failed. %1").arg(errorStr));
}
void AssetExporter::notifyProgress(double value) const
@@ -250,13 +250,13 @@ void AssetExporter::onQmlFileLoaded()
->documentManager()
.currentDesignDocument();
if (designDocument->hasQmlParseErrors()) {
- ExportNotification::addError(tr("Cannot export QML. Document \"%1\" have parsing errors.")
+ ExportNotification::addError(tr("Cannot export component. Document \"%1\" has parsing errors.")
.arg(designDocument->displayName()));
} else {
exportComponent(m_view->rootModelNode());
QString error;
if (!m_view->saveQmlFile(&error)) {
- ExportNotification::addError(tr("Error saving QML file. %1")
+ ExportNotification::addError(tr("Error saving component file. %1")
.arg(error.isEmpty()? tr("Unknown") : error));
}
}
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp
index cf7caef6b0..1c6e6d65df 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterplugin.cpp
@@ -106,8 +106,8 @@ void AssetExporterPlugin::onExport()
void AssetExporterPlugin::addActions()
{
- auto exportAction = new QAction(tr("Export QML"));
- exportAction->setToolTip(tr("Export QML code of the current project."));
+ auto exportAction = new QAction(tr("Export Components"));
+ exportAction->setToolTip(tr("Export components in the current project."));
connect(exportAction, &QAction::triggered, this, &AssetExporterPlugin::onExport);
Core::Command *cmd = Core::ActionManager::registerAction(exportAction, Constants::EXPORT_QML);
diff --git a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp
index 718a11f7d9..959ce18d60 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp
+++ b/src/plugins/qmldesigner/assetexporterplugin/filepathmodel.cpp
@@ -70,10 +70,10 @@ FilePathModel::~FilePathModel()
{
if (m_preprocessWatcher && !m_preprocessWatcher->isCanceled() &&
!m_preprocessWatcher->isFinished()) {
- ExportNotification::addInfo(tr("Canceling QML files preparation."));
+ ExportNotification::addInfo(tr("Canceling file preparation."));
m_preprocessWatcher->cancel();
m_preprocessWatcher->waitForFinished();
- qCDebug(loggerInfo) << "Canceling QML files preparation done.";
+ qCDebug(loggerInfo) << "Canceled file preparation.";
}
}