diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt index d62aacace2dfe49da62c05681bdd699e635366c0..73cf31858879de4fd8d978754bff24cf599a7d2e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt +++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60-todo.txt @@ -20,7 +20,7 @@ tool chain? * seems that the make for building for device doesn't return useful exit code, so a run is started even if the build has errors - * gcce error parser (gcc seems not to be enough sometimes, and the make tool does not return valid exit codes + * gcce error parser (gcc seems not to be enough sometimes, and the make tool does not return valid exit codes` * Run Configurations * handling of active run config getting disabled not optimal yet diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 9dc82b3163df326eff6491c9f6b966db1600a02f..43210c7a0899cd60817607bbdc9b1bf52fdead76 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -482,6 +482,7 @@ void S60DeviceRunControl::start() Qt4Project *project = qobject_cast<Qt4Project *>(rc->project()); m_serialPortName = rc->serialPortName(); + m_serialPortFriendlyName = S60Manager::instance()->serialDeviceLister()->friendlyNameForPort(m_serialPortName); m_targetName = rc->targetName(); m_baseFileName = rc->basePackageFilePath(); m_workingDirectory = QFileInfo(m_baseFileName).absolutePath(); @@ -589,6 +590,7 @@ void S60DeviceRunControl::signsisProcessFinished() m_adapter->setCopyFileName(copySrc, copyDst); m_adapter->setInstallFileName(copyDst); m_adapter->setFileName(runFileName); + emit addToOutputWindow(this, tr("Starting application on %1...").arg(m_serialPortFriendlyName)); if (!m_adapter->startServer()) { delete m_adapter; m_adapter = 0; @@ -600,7 +602,7 @@ void S60DeviceRunControl::signsisProcessFinished() void S60DeviceRunControl::printCopyingNotice() { - emit addToOutputWindow(this, tr("Copying install file to device...")); + emit addToOutputWindow(this, tr("Copying install file...")); } void S60DeviceRunControl::printInstallingNotice() @@ -610,7 +612,7 @@ void S60DeviceRunControl::printInstallingNotice() void S60DeviceRunControl::printStartingNotice() { - emit addToOutputWindow(this, tr("Starting...")); + emit addToOutputWindow(this, tr("Starting application...")); } void S60DeviceRunControl::printRunNotice(uint pid) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index 17ff66dbf21e8d5d3f96e78816621135451d407e..7ce79705f592f3491a5f10a51b15511ad8b8a09e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -166,6 +166,7 @@ private: void processFailed(const QString &program, QProcess::ProcessError errorCode); QString m_serialPortName; + QString m_serialPortFriendlyName; QString m_targetName; QString m_baseFileName; QString m_workingDirectory; diff --git a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp index 7b7b0263ef565f28c7da192a007c855bb1542b86..7cc3fe3777e5ed1634dff792ded06f7eebbbdaab 100644 --- a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp @@ -80,6 +80,15 @@ QList<SerialDeviceLister::SerialDevice> SerialDeviceLister::serialDevices() cons return m_devices; } +QString SerialDeviceLister::friendlyNameForPort(const QString &port) const +{ + foreach (const SerialDevice &device, m_devices) { + if (device.portName == port) + return device.friendlyName; + } + return QString(); +} + void SerialDeviceLister::update() { updateSilently(); diff --git a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h index 099023ed92881d354da33cd9a4c453eba01edac7..594aa3e1c3efe11e624760e079276bd62fe272af 100644 --- a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h +++ b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h @@ -56,6 +56,7 @@ public: SerialDeviceLister(QObject *parent = 0); ~SerialDeviceLister(); QList<SerialDevice> serialDevices() const; + QString friendlyNameForPort(const QString &port) const; public slots: void update();