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

QMLDebugger: Unify status messages

Browse Source 
Use "QML Debugger" as in qmlengine.cpp . Also don't print a warning
if the status is 'unavailable' as this is the default first state
in ',block' mode.

Change-Id: I21d8285eabdb6a2ced87ddc865eae1704e843cd0
Reviewed-on: http://codereview.qt-project.org/5228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2011-09-20 12:05:43 +02:00
parent d23a1adc3c
commit c412abf29f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/qml/qmladapter.cpp
View File

@@ -235,13 +235,13 @@ QDeclarativeDebugConnection *QmlAdapter::connection() const
void QmlAdapter::showConnectionStatusMessage(const QString &message) void QmlAdapter::showConnectionStatusMessage(const QString &message)
{ {
if (!d->m_engine.isNull()) if (!d->m_engine.isNull())
d->m_engine.data()->showMessage(QLatin1String("QmlDebugger: ") + message, LogStatus); d->m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogStatus);
} }
void QmlAdapter::showConnectionErrorMessage(const QString &message) void QmlAdapter::showConnectionErrorMessage(const QString &message)
{ {
if (!d->m_engine.isNull()) if (!d->m_engine.isNull())
d->m_engine.data()->showMessage(QLatin1String("QmlDebugger: ") + message, LogError); d->m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogError);
} }
bool QmlAdapter::disableJsDebugging(bool block) bool QmlAdapter::disableJsDebugging(bool block)
@@ -277,17 +277,16 @@ void QmlAdapter::logServiceStatusChange(const QString &service,
{ {
switch (newStatus) { switch (newStatus) {
case QDeclarativeDebugClient::Unavailable: { case QDeclarativeDebugClient::Unavailable: {
showConnectionStatusMessage(tr("Debug service '%1' became unavailable.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' changed to 'unavailable'.").arg(service));
emit serviceConnectionError(service);
break; break;
} }
case QDeclarativeDebugClient::Enabled: { case QDeclarativeDebugClient::Enabled: {
showConnectionStatusMessage(tr("Connected to debug service '%1'.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' changed to 'enabled'.").arg(service));
break; break;
} }
case QDeclarativeDebugClient::NotConnected: { case QDeclarativeDebugClient::NotConnected: {
showConnectionStatusMessage(tr("Not connected to debug service '%1'.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' changed to 'not connected'.").arg(service));
break; break;
} }
} }