Commit 157ff488 authored by ck's avatar ck
Browse files

Maemo: Make errors more obvious to users.

Reviewed-by: kh1
parent ddecf8b0
...@@ -49,6 +49,8 @@ ...@@ -49,6 +49,8 @@
#include <QtCore/QProcess> #include <QtCore/QProcess>
#include <QtCore/QStringBuilder> #include <QtCore/QStringBuilder>
#include <QtGui/QMessageBox>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
namespace Internal { namespace Internal {
...@@ -86,6 +88,7 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging) ...@@ -86,6 +88,7 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
deploy(); deploy();
} else { } else {
handleError(tr("No device configuration set for run configuration."));
handleDeploymentFinished(false); handleDeploymentFinished(false);
} }
} }
...@@ -146,7 +149,7 @@ void AbstractMaemoRunControl::deployProcessFinished() ...@@ -146,7 +149,7 @@ void AbstractMaemoRunControl::deployProcessFinished()
if (success) { if (success) {
emit addToOutputWindow(this, tr("Deployment finished.")); emit addToOutputWindow(this, tr("Deployment finished."));
} else { } else {
emit error(this, tr("Deployment failed: %1").arg(sshDeployer->error())); handleError(tr("Deployment failed: %1").arg(sshDeployer->error()));
m_progress.reportCanceled(); m_progress.reportCanceled();
} }
m_progress.reportFinished(); m_progress.reportFinished();
...@@ -206,6 +209,12 @@ const QString AbstractMaemoRunControl::targetCmdLinePrefix() const ...@@ -206,6 +209,12 @@ const QString AbstractMaemoRunControl::targetCmdLinePrefix() const
arg(executableOnTarget()); arg(executableOnTarget());
} }
void AbstractMaemoRunControl::handleError(const QString &errString)
{
QMessageBox::critical(0, tr("Remote Execution Failure"), errString);
emit error(this, errString);
}
MaemoRunControl::MaemoRunControl(RunConfiguration *runConfiguration) MaemoRunControl::MaemoRunControl(RunConfiguration *runConfiguration)
: AbstractMaemoRunControl(runConfiguration) : AbstractMaemoRunControl(runConfiguration)
...@@ -251,7 +260,8 @@ void MaemoRunControl::executionFinished() ...@@ -251,7 +260,8 @@ void MaemoRunControl::executionFinished()
if (stoppedByUser) { if (stoppedByUser) {
emit addToOutputWindow(this, tr("Remote process stopped by user.")); emit addToOutputWindow(this, tr("Remote process stopped by user."));
} else if (sshRunner->hasError()) { } else if (sshRunner->hasError()) {
emit addToOutputWindow(this, tr("Remote process exited with error: %1").arg(sshRunner->error())); emit addToOutputWindow(this, tr("Remote process exited with error: %1")
.arg(sshRunner->error()));
} else { } else {
emit addToOutputWindow(this, tr("Remote process finished successfully.")); emit addToOutputWindow(this, tr("Remote process finished successfully."));
} }
...@@ -351,7 +361,7 @@ void MaemoDebugRunControl::startGdbServer() ...@@ -351,7 +361,7 @@ void MaemoDebugRunControl::startGdbServer()
void MaemoDebugRunControl::gdbServerStartFailed(const QString &reason) void MaemoDebugRunControl::gdbServerStartFailed(const QString &reason)
{ {
emit addToOutputWindow(this, tr("Debugging failed: %1").arg(reason)); handleError(tr("Debugging failed: %1").arg(reason));
emit stopRequested(); emit stopRequested();
emit finished(); emit finished();
} }
......
...@@ -70,6 +70,7 @@ protected: ...@@ -70,6 +70,7 @@ protected:
void startDeployment(bool forDebugging); void startDeployment(bool forDebugging);
void deploy(); void deploy();
void stopDeployment(); void stopDeployment();
void handleError(const QString &errString);
bool isDeploying() const; bool isDeploying() const;
const QString executableOnHost() const; const QString executableOnHost() const;
const QString executableOnTarget() const; const QString executableOnTarget() const;
......
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