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

Maemo: Make errors more obvious to users.

Browse Source 
Reviewed-by: kh1
This commit is contained in:
ck
2010-04-12 10:55:17 +02:00
parent ddecf8b05e
commit 157ff4889e
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

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