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

CMake: fix UI text

Browse Source 
Change-Id: I6803aa799e495007358dbc5f5ee6b8e1d2c6e874
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Leena Miettinen
2015-10-22 17:09:14 +02:00
parent c7717c204a
commit 2af989376b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
View File

@@ -489,19 +489,19 @@ QByteArray CMakeRunPage::cachedGeneratorFromFile(const QString &cache)
void CMakeRunPage::initializePage() void CMakeRunPage::initializePage()
{ {
if (m_mode == CMakeRunPage::NeedToUpdate) { if (m_mode == CMakeRunPage::NeedToUpdate) {
m_descriptionLabel->setText(tr("The build directory \"%1\" for the buildconfiguration \"%2\" " m_descriptionLabel->setText(tr("The build directory \"%1\" for build configuration \"%2\" "
"for target \"%3\" contains an outdated .cbp file. Qt " "for target \"%3\" contains an outdated .cbp file. Qt "
"Creator needs to update this file by running CMake. " "Creator needs to update this file by running CMake. "
"If you want to add additional command line arguments, " "You can add command line arguments below. Note that "
"add them below. Note that CMake remembers command " "CMake remembers command line arguments from the "
"line arguments from the previous runs.") "previous runs.")
.arg(m_buildDirectory) .arg(m_buildDirectory)
.arg(m_buildConfigurationName) .arg(m_buildConfigurationName)
.arg(m_kitName)); .arg(m_kitName));
} else if (m_mode == CMakeRunPage::Recreate) { } else if (m_mode == CMakeRunPage::Recreate) {
m_descriptionLabel->setText(tr("The directory \"%1\" specified in the build-configuration \"%2\", " m_descriptionLabel->setText(tr("The directory \"%1\" specified in build configuration \"%2\", "
"for target \"%3\" does not contain a cbp file. " "for target \"%3\" does not contain a .cbp file. "
"Qt Creator needs to recreate this file, by running CMake. " "Qt Creator needs to recreate this file by running CMake. "
"Some projects require command line arguments to " "Some projects require command line arguments to "
"the initial CMake call. Note that CMake remembers command " "the initial CMake call. Note that CMake remembers command "
"line arguments from the previous runs.") "line arguments from the previous runs.")
@@ -514,7 +514,7 @@ void CMakeRunPage::initializePage()
"Some projects require command line arguments to the " "Some projects require command line arguments to the "
"initial CMake call.")); "initial CMake call."));
} else if (m_mode == CMakeRunPage::WantToUpdate) { } else if (m_mode == CMakeRunPage::WantToUpdate) {
m_descriptionLabel->setText(tr("Refreshing cbp file in \"%1\" for buildconfiguration \"%2\" " m_descriptionLabel->setText(tr("Refreshing the .cbp file in \"%1\" for build configuration \"%2\" "
"for target \"%3\".") "for target \"%3\".")
.arg(m_buildDirectory) .arg(m_buildDirectory)
.arg(m_buildConfigurationName) .arg(m_buildConfigurationName)
@@ -597,7 +597,7 @@ void CMakeRunPage::runCMake()
m_runCMake->setEnabled(true); m_runCMake->setEnabled(true);
m_argumentsLineEdit->setEnabled(true); m_argumentsLineEdit->setEnabled(true);
m_generatorComboBox->setEnabled(true); m_generatorComboBox->setEnabled(true);
m_output->appendPlainText(tr("Selected Kit has no valid CMake executable specified.")); m_output->appendPlainText(tr("Selected kit has no valid CMake executable specified."));
} }
} }

2
src/plugins/cmakeprojectmanager/cmakesettingspage.cpp
View File

@@ -392,7 +392,7 @@ public:
m_makeDefButton = new QPushButton(tr("Make Default"), this); m_makeDefButton = new QPushButton(tr("Make Default"), this);
m_makeDefButton->setEnabled(false); m_makeDefButton->setEnabled(false);
m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new Kit, or no value is set.")); m_makeDefButton->setToolTip(tr("Set as the default CMake Tool to use when creating a new kit or when no value is set."));
m_preferNinjaCheckBox = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)")); m_preferNinjaCheckBox = new QCheckBox(tr("Prefer Ninja generator (CMake 2.8.9 or higher required)"));
m_preferNinjaCheckBox->setChecked(CMakeToolManager::preferNinja()); m_preferNinjaCheckBox->setChecked(CMakeToolManager::preferNinja());