diff options
author | Christian Kamm <christian.d.kamm@nokia.com> | 2010-04-08 11:50:12 +0200 |
---|---|---|
committer | Christian Kamm <christian.d.kamm@nokia.com> | 2010-04-08 11:51:01 +0200 |
commit | bbb73a3912296d6f535a301c54cdc384715a145c (patch) | |
tree | f89b6c082c8829a185dd35c015254cb0be797bb2 | |
parent | 1e610223999917a123dabc3bd1b8407ab9bf3e48 (diff) |
Show script errors in a message box instead of qWarning.
* Makes them more visible.
* Avoids crashes on Windows. (qWarning from coroutine)
-rw-r--r-- | library/scriptadapter.cpp | 5 | ||||
-rw-r--r-- | library/scriptadapter.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/library/scriptadapter.cpp b/library/scriptadapter.cpp index 8f0eb33..87d3e61 100644 --- a/library/scriptadapter.cpp +++ b/library/scriptadapter.cpp @@ -140,12 +140,13 @@ void ScriptAdapter::yield(int ms) } } -void ScriptAdapter::messageBox(const QString &text) +void ScriptAdapter::messageBox(const QString &text, const QString &title) { if (!mCurrentScript) return; mMessageBox->setText(text); + mMessageBox->setWindowTitle(title); // message boxes should block mCurrentScript->beginBlocking(); @@ -220,7 +221,7 @@ void Script::run() mStopTimer.start(); QScriptValue value = mEngine.evaluate(mScriptCode); if (value.isError()) { - qWarning() << "Script execution resulted in an error:" << value.toString(); + mAdapter->messageBox(value.toString(), tr("Script errors")); } mStopTimer.stop(); } diff --git a/library/scriptadapter.h b/library/scriptadapter.h index 2589e17..c430d30 100644 --- a/library/scriptadapter.h +++ b/library/scriptadapter.h @@ -49,7 +49,7 @@ public: virtual ~ScriptAdapter(); Q_INVOKABLE void yield(int ms); - Q_INVOKABLE void messageBox(const QString &text); + Q_INVOKABLE void messageBox(const QString &text, const QString &title = QString()); void runAutostartScripts(); Script *script(int index); |