Commit 79529551 authored by Friedemann Kleint's avatar Friedemann Kleint

CODA: Fix some messages.

parent c736cc3c
......@@ -1277,7 +1277,6 @@ void TcfTrkGdbAdapter::handleRegisterChildren(const tcftrk::TcfTrkCommandResult
logMessage(msg);
m_trkDevice->setRegisterNames(registerNames);
if (m_registerRequestPending) { // Request already pending?
qDebug("RR") ;
logMessage(_("Resuming registers request after receiving register names..."));
sendRegistersGetMCommand();
}
......
......@@ -597,7 +597,7 @@ void S60DeployStep::checkForTimeout()
const QString title = tr("Waiting for CODA");
const QString text = tr("Qt Creator is waiting for the CODA application to connect. "
"Please make sure the application is running on "
"your mobile phone and the right ip address and port are "
"your mobile phone and the right IP address and port are "
"configured in the project settings.");
QMessageBox *mb = new QMessageBox(QMessageBox::Information, title, text,
QMessageBox::Cancel, Core::ICore::instance()->mainWindow());
......
......@@ -585,7 +585,7 @@ void S60DeviceRunControl::start()
emit started();
if (m_runSmartInstaller) { //Smart Installer does the running by itself
appendMessage(tr("Please finalise the installation on your device."), NormalMessageFormat);
appendMessage(tr("Please finalize the installation on your device."), NormalMessageFormat);
emit finished();
return;
}
......@@ -766,7 +766,7 @@ void S60DeviceRunControl::slotTcftrkEvent(const TcfTrkEvent &event)
switch (event.type()) {
case TcfTrkEvent::LocatorHello: { // Commands accepted now
m_state = StateConnected;
appendMessage(tr("Connected!"), NormalMessageFormat);
appendMessage(tr("Connected."), NormalMessageFormat);
if (m_launchProgress)
m_launchProgress->setProgressValue(PROGRESS_MAX*0.80);
initCommunication();
......@@ -885,7 +885,7 @@ void S60DeviceRunControl::handleCreateProcess(const TcfTrkCommandResult &result)
if (ok) {
if (m_launchProgress)
m_launchProgress->setProgressValue(PROGRESS_MAX);
appendMessage(tr("Launched!"), NormalMessageFormat);
appendMessage(tr("Launched."), NormalMessageFormat);
} else {
appendMessage(tr("Launch failed: %1").arg(result.toString()), ErrorMessageFormat);
finishRunControl();
......
......@@ -42,8 +42,6 @@
#include <QtCore/QScopedPointer>
#include <QtCore/QStringList>
#include <QTime> //TODO: remove
QT_BEGIN_NAMESPACE
class QMessageBox;
class QWidget;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment