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

UI text: fix capitalization of CMake

Browse Source 
Change-Id: I2d45f123936bb53a2659b6e96afc9073ab2b140c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Leena Miettinen
2013-02-12 15:35:09 +01:00
parent 8dc507b30e
commit 1bfe9488f0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,31 +395,31 @@ ChooseCMakePage::ChooseCMakePage(CMakeOpenProjectWizard *cmakeWizard)
// Show a field for the user to enter // Show a field for the user to enter
m_cmakeExecutable = new Utils::PathChooser(this); m_cmakeExecutable = new Utils::PathChooser(this);
m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand); m_cmakeExecutable->setExpectedKind(Utils::PathChooser::ExistingCommand);
fl->addRow(tr("cmake Executable:"), m_cmakeExecutable); fl->addRow(tr("CMake Executable:"), m_cmakeExecutable);
connect(m_cmakeExecutable, SIGNAL(editingFinished()), connect(m_cmakeExecutable, SIGNAL(editingFinished()),
this, SLOT(cmakeExecutableChanged())); this, SLOT(cmakeExecutableChanged()));
connect(m_cmakeExecutable, SIGNAL(browsingFinished()), connect(m_cmakeExecutable, SIGNAL(browsingFinished()),
this, SLOT(cmakeExecutableChanged())); this, SLOT(cmakeExecutableChanged()));
setTitle(tr("Choose Cmake Executable")); setTitle(tr("Choose CMake Executable"));
} }
void ChooseCMakePage::updateErrorText() void ChooseCMakePage::updateErrorText()
{ {
QString cmakeExecutable = m_cmakeWizard->cmakeManager()->cmakeExecutable(); QString cmakeExecutable = m_cmakeWizard->cmakeManager()->cmakeExecutable();
if (m_cmakeWizard->cmakeManager()->isCMakeExecutableValid()) { if (m_cmakeWizard->cmakeManager()->isCMakeExecutableValid()) {
m_cmakeLabel->setText(tr("The cmake executable is valid.")); m_cmakeLabel->setText(tr("The CMake executable is valid."));
} else { } else {
QString text = tr("Please specify the path to the cmake executable. No cmake executable was found in the path."); QString text = tr("Specify the path to the CMake executable. No CMake executable was found in the path.");
if (!cmakeExecutable.isEmpty()) { if (!cmakeExecutable.isEmpty()) {
QFileInfo fi(cmakeExecutable); QFileInfo fi(cmakeExecutable);
if (!fi.exists()) if (!fi.exists())
text += tr(" The cmake executable (%1) does not exist.").arg(cmakeExecutable); text += tr(" The CMake executable (%1) does not exist.").arg(cmakeExecutable);
else if (!fi.isExecutable()) else if (!fi.isExecutable())
text += tr(" The path %1 is not an executable.").arg(cmakeExecutable); text += tr(" The path %1 is not an executable.").arg(cmakeExecutable);
else else
text += tr(" The path %1 is not a valid cmake.").arg(cmakeExecutable); text += tr(" The path %1 is not a valid CMake executable.").arg(cmakeExecutable);
} }
m_cmakeLabel->setText(text); m_cmakeLabel->setText(text);
} }
@@ -659,7 +659,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("No valid cmake executable specified.")); m_output->appendPlainText(tr("No valid CMake executable specified."));
} }
} }