Valgrind: fix UI text capitalization and punctuation

Removed the asterisks from messages.

Change-Id: I1c8e95b6d6f77921f2908c4587af5ebfde5e86af
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Leena Miettinen
2013-10-09 17:25:21 +02:00
committed by hjk
parent 3bf7578beb
commit 2f7f1d904c
5 changed files with 12 additions and 12 deletions

View File

@@ -668,7 +668,7 @@ QWidget *CallgrindToolPrivate::createWidgets()
// load external XML log file // load external XML log file
action = new QAction(this); action = new QAction(this);
action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE))); action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE)));
action->setToolTip(tr("Load External XML Log File.")); action->setToolTip(tr("Load External XML Log File"));
connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalXmlLogFile())); connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalXmlLogFile()));
layout->addWidget(createToolButton(action)); layout->addWidget(createToolButton(action));
m_loadExternalLogFile = action; m_loadExternalLogFile = action;

View File

@@ -130,7 +130,7 @@ bool MemcheckRunner::start()
QVBoxLayout *layout = new QVBoxLayout; QVBoxLayout *layout = new QVBoxLayout;
QLabel *description = new QLabel; QLabel *description = new QLabel;
description->setWordWrap(true); description->setWordWrap(true);
description->setText(tr("More than one network interface was found on your machine. Please select which one you want to use for remote analysis.")); description->setText(tr("More than one network interface was found on your machine. Please select the one you want to use for remote analysis."));
layout->addWidget(description); layout->addWidget(description);
QListWidget *list = new QListWidget; QListWidget *list = new QListWidget;
foreach (const QHostAddress &address, possibleHostAddresses) foreach (const QHostAddress &address, possibleHostAddresses)
@@ -151,7 +151,7 @@ bool MemcheckRunner::start()
dlg.setLayout(layout); dlg.setLayout(layout);
if (dlg.exec() != QDialog::Accepted) { if (dlg.exec() != QDialog::Accepted) {
emit processErrorReceived(tr("No Network Interface was chosen for remote analysis"), QProcess::FailedToStart); emit processErrorReceived(tr("No network interface was chosen for remote analysis."), QProcess::FailedToStart);
return false; return false;
} }

View File

@@ -380,7 +380,7 @@ QWidget *MemcheckTool::createWidgets()
// Load external XML log file // Load external XML log file
action = new QAction(this); action = new QAction(this);
action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE))); action->setIcon(QIcon(QLatin1String(Core::Constants::ICON_OPENFILE)));
action->setToolTip(tr("Load External XML Log File.")); action->setToolTip(tr("Load External XML Log File"));
connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalXmlLogFile())); connect(action, SIGNAL(triggered(bool)), this, SLOT(loadExternalXmlLogFile()));
button = new QToolButton; button = new QToolButton;
button->setDefaultAction(action); button->setDefaultAction(action);
@@ -532,7 +532,7 @@ void MemcheckTool::parserError(const Valgrind::XmlProtocol::Error &error)
void MemcheckTool::internalParserError(const QString &errorString) void MemcheckTool::internalParserError(const QString &errorString)
{ {
QMessageBox::critical(m_errorView, tr("Internal Error"), QMessageBox::critical(m_errorView, tr("Internal Error"),
tr("Error occurred parsing valgrind output: %1").arg(errorString)); tr("Error occurred parsing Valgrind output: %1").arg(errorString));
} }
void MemcheckTool::clearErrorView() void MemcheckTool::clearErrorView()

View File

@@ -97,7 +97,7 @@ bool ValgrindRunControl::startEngine()
#if VALGRIND_DEBUG_OUTPUT #if VALGRIND_DEBUG_OUTPUT
emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1Char(' '))), DebugFormat); emit outputReceived(tr("Valgrind options: %1").arg(toolArguments().join(QLatin1Char(' '))), DebugFormat);
emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat); emit outputReceived(tr("Working directory: %1").arg(sp.workingDirectory), DebugFormat);
emit outputReceived(tr("Commandline arguments: %1").arg(sp.debuggeeArgs), DebugFormat); emit outputReceived(tr("Command line arguments: %1").arg(sp.debuggeeArgs), DebugFormat);
#endif #endif
ValgrindRunner *run = runner(); ValgrindRunner *run = runner();
@@ -173,7 +173,7 @@ void ValgrindRunControl::handleProgressFinished()
void ValgrindRunControl::runnerFinished() void ValgrindRunControl::runnerFinished()
{ {
appendMessage(tr("** Analyzing finished **\n"), NormalMessageFormat); appendMessage(tr("Analyzing finished.\n"), NormalMessageFormat);
emit finished(); emit finished();
m_progress->reportFinished(); m_progress->reportFinished();
@@ -200,11 +200,11 @@ void ValgrindRunControl::receiveProcessError(const QString &message, QProcess::P
if (error == QProcess::FailedToStart) { if (error == QProcess::FailedToStart) {
const QString valgrind = m_settings->valgrindExecutable(); const QString valgrind = m_settings->valgrindExecutable();
if (!valgrind.isEmpty()) if (!valgrind.isEmpty())
appendMessage(tr("** Error: \"%1\" could not be started: %2 **\n").arg(valgrind).arg(message), ErrorMessageFormat); appendMessage(tr("Error: \"%1\" could not be started: %2\n").arg(valgrind).arg(message), ErrorMessageFormat);
else else
appendMessage(tr("** Error: no valgrind executable set **\n"), ErrorMessageFormat); appendMessage(tr("Error: no Valgrind executable set.\n"), ErrorMessageFormat);
} else if (m_isStopping && error == QProcess::Crashed) { // process gets killed on stop } else if (m_isStopping && error == QProcess::Crashed) { // process gets killed on stop
appendMessage(tr("** Process Terminated **\n"), ErrorMessageFormat); appendMessage(tr("Process terminated.\n"), ErrorMessageFormat);
} else { } else {
appendMessage(QString::fromLatin1("** %1 **\n").arg(message), ErrorMessageFormat); appendMessage(QString::fromLatin1("** %1 **\n").arg(message), ErrorMessageFormat);
} }

View File

@@ -111,7 +111,7 @@ bool ValgrindPlugin::initialize(const QStringList &, QString *)
"\"callgrind\" tool to record function calls when a program runs."); "\"callgrind\" tool to record function calls when a program runs.");
QString memcheckToolTip = tr("Valgrind Analyze Memory uses the " QString memcheckToolTip = tr("Valgrind Analyze Memory uses the "
"\"memcheck\" tool to find memory leaks"); "\"memcheck\" tool to find memory leaks.");
if (!Utils::HostOsInfo::isWindowsHost()) { if (!Utils::HostOsInfo::isWindowsHost()) {
action = new ValgrindAction; action = new ValgrindAction;
@@ -173,7 +173,7 @@ void ValgrindPlugin::extensionsInitialized()
Context analyzerContext = Context(Analyzer::Constants::C_ANALYZEMODE); Context analyzerContext = Context(Analyzer::Constants::C_ANALYZEMODE);
editorContextMenu->addSeparator(analyzerContext); editorContextMenu->addSeparator(analyzerContext);
QAction *action = new QAction(tr("Profile Costs of this Function and its Callees"), this); QAction *action = new QAction(tr("Profile Costs of This Function and Its Callees"), this);
action->setIcon(QIcon(QLatin1String(Analyzer::Constants::ANALYZER_CONTROL_START_ICON))); action->setIcon(QIcon(QLatin1String(Analyzer::Constants::ANALYZER_CONTROL_START_ICON)));
connect(action, SIGNAL(triggered()), m_callgrindTool, SLOT(handleShowCostsOfFunction())); connect(action, SIGNAL(triggered()), m_callgrindTool, SLOT(handleShowCostsOfFunction()));
Command *cmd = ActionManager::registerAction(action, "Analyzer.Callgrind.ShowCostsOfFunction", Command *cmd = ActionManager::registerAction(action, "Analyzer.Callgrind.ShowCostsOfFunction",