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

Project explorer: Fix UI text

Browse Source 
Fix punctuation.

Task-number: QTCREATORBUG-24873
Change-Id: I5cc5e80915b891efa2cd2268e3302feb39b7a576
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Leena Miettinen
2020-11-06 17:11:24 +01:00
parent 1988d89198
commit f2254419af
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/projectexplorer/project.cpp
View File

@@ -1032,7 +1032,7 @@ QStringList Project::availableQmlPreviewTranslations(QString *errorMessage)
const QDir languageDirectory(projectDirectory + "/i18n"); const QDir languageDirectory(projectDirectory + "/i18n");
const auto qmFiles = languageDirectory.entryList({"qml_*.qm"}); const auto qmFiles = languageDirectory.entryList({"qml_*.qm"});
if (qmFiles.isEmpty() && errorMessage) if (qmFiles.isEmpty() && errorMessage)
errorMessage->append(tr("Could not find any qml_*.qm file at '%1'").arg(languageDirectory.absolutePath())); errorMessage->append(tr("Could not find any qml_*.qm file at \"%1\"").arg(languageDirectory.absolutePath()));
return Utils::transform(qmFiles, [](const QString &qmFile) { return Utils::transform(qmFiles, [](const QString &qmFile) {
const int localeStartPosition = qmFile.lastIndexOf("_") + 1; const int localeStartPosition = qmFile.lastIndexOf("_") + 1;
const int localeEndPosition = qmFile.size() - QString(".qm").size(); const int localeEndPosition = qmFile.size() - QString(".qm").size();

8
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -1783,7 +1783,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
}); });
expander->registerPrefix(Constants::VAR_CURRENTBUILD_ENV, expander->registerPrefix(Constants::VAR_CURRENTBUILD_ENV,
BuildConfiguration::tr("Variables in the current build environment"), BuildConfiguration::tr("Variables in the current build environment."),
[](const QString &var) { [](const QString &var) {
if (BuildConfiguration *bc = currentBuildConfiguration()) if (BuildConfiguration *bc = currentBuildConfiguration())
return bc->environment().expandedValueForKey(var); return bc->environment().expandedValueForKey(var);
@@ -1791,7 +1791,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
}, false); }, false);
expander->registerPrefix("CurrentDocument:Project:BuildConfig:Env", expander->registerPrefix("CurrentDocument:Project:BuildConfig:Env",
BuildConfiguration::tr("Variables in the active build environment " BuildConfiguration::tr("Variables in the active build environment "
"of the project containing the currently open document"), "of the project containing the currently open document."),
[](const QString &var) { [](const QString &var) {
if (BuildConfiguration *bc = currentBuildConfiguration()) if (BuildConfiguration *bc = currentBuildConfiguration())
return bc->environment().expandedValueForKey(var); return bc->environment().expandedValueForKey(var);
@@ -1840,14 +1840,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
}); });
const char activeBuildEnvVar[] = "ActiveProject:BuildConfig:Env"; const char activeBuildEnvVar[] = "ActiveProject:BuildConfig:Env";
Utils::EnvironmentProvider::addProvider( Utils::EnvironmentProvider::addProvider(
{activeBuildEnvVar, tr("Active Build Environment of the active project"), [] { {activeBuildEnvVar, tr("Active build environment of the active project."), [] {
if (const BuildConfiguration * const bc = activeBuildConfiguration()) if (const BuildConfiguration * const bc = activeBuildConfiguration())
return bc->environment(); return bc->environment();
return Utils::Environment::systemEnvironment(); return Utils::Environment::systemEnvironment();
}}); }});
expander->registerPrefix("ActiveProject:BuildConfig:Env", expander->registerPrefix("ActiveProject:BuildConfig:Env",
BuildConfiguration::tr("Variables in the active build environment " BuildConfiguration::tr("Variables in the active build environment "
"of the active project"), "of the active project."),
[](const QString &var) { [](const QString &var) {
if (BuildConfiguration * const bc = activeBuildConfiguration()) if (BuildConfiguration * const bc = activeBuildConfiguration())
return bc->environment().expandedValueForKey(var); return bc->environment().expandedValueForKey(var);

4
src/plugins/projectexplorer/target.cpp
View File

@@ -182,7 +182,7 @@ Target::Target(Project *project, Kit *k, _constructor_tag) :
return rc->commandLine().executable().toString(); return rc->commandLine().executable().toString();
return QString(); return QString();
}); });
d->m_macroExpander.registerPrefix("CurrentRun:Env", tr("Variables in the current run environment"), d->m_macroExpander.registerPrefix("CurrentRun:Env", tr("Variables in the current run environment."),
[this](const QString &var) { [this](const QString &var) {
if (RunConfiguration * const rc = activeRunConfiguration()) { if (RunConfiguration * const rc = activeRunConfiguration()) {
if (const auto envAspect = rc->aspect<EnvironmentAspect>()) if (const auto envAspect = rc->aspect<EnvironmentAspect>())
@@ -191,7 +191,7 @@ Target::Target(Project *project, Kit *k, _constructor_tag) :
return QString(); return QString();
}); });
d->m_macroExpander.registerVariable("CurrentRun:WorkingDir", d->m_macroExpander.registerVariable("CurrentRun:WorkingDir",
tr("The currently active run configuration's working directory"), tr("The currently active run configuration's working directory."),
[this] { [this] {
if (RunConfiguration * const rc = activeRunConfiguration()) { if (RunConfiguration * const rc = activeRunConfiguration()) {
if (const auto wdAspect = rc->aspect<WorkingDirectoryAspect>()) if (const auto wdAspect = rc->aspect<WorkingDirectoryAspect>())