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

QmlDebugging: Log service version

Browse Source 
Log the service version along with the service name and state.

Change-Id: Ib2e7829d89651998dccffbaa0432908158b9dafd
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-04-10 16:54:08 +02:00
parent eb802c2b38
commit 5269ff1a0e
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,10 +163,13 @@ void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketErro
void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status) void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status)
{ {
QString serviceName; QString serviceName;
if (QDeclarativeDebugClient *client = qobject_cast<QDeclarativeDebugClient*>(sender())) float version = 0;
if (QDeclarativeDebugClient *client = qobject_cast<QDeclarativeDebugClient*>(sender())) {
serviceName = client->name(); serviceName = client->name();
version = client->serviceVersion();
}
logServiceStatusChange(serviceName, status); logServiceStatusChange(serviceName, version, status);
} }
void QmlAdapter::debugClientStatusChanged(QDeclarativeDebugClient::Status status) void QmlAdapter::debugClientStatusChanged(QDeclarativeDebugClient::Status status)
@@ -346,21 +349,24 @@ void QmlAdapter::setCurrentSelectedDebugInfo(int currentDebugId, const QString &
emit selectionChanged(); emit selectionChanged();
} }
void QmlAdapter::logServiceStatusChange(const QString &service, void QmlAdapter::logServiceStatusChange(const QString &service, float version,
QDeclarativeDebugClient::Status newStatus) QDeclarativeDebugClient::Status newStatus)
{ {
switch (newStatus) { switch (newStatus) {
case QDeclarativeDebugClient::Unavailable: { case QDeclarativeDebugClient::Unavailable: {
showConnectionStatusMessage(tr("Status of '%1' changed to 'unavailable'.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'unavailable'.").
arg(service).arg(QString::number(version)));
break; break;
} }
case QDeclarativeDebugClient::Enabled: { case QDeclarativeDebugClient::Enabled: {
showConnectionStatusMessage(tr("Status of '%1' changed to 'enabled'.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'enabled'.").
arg(service).arg(QString::number(version)));
break; break;
} }
case QDeclarativeDebugClient::NotConnected: { case QDeclarativeDebugClient::NotConnected: {
showConnectionStatusMessage(tr("Status of '%1' changed to 'not connected'.").arg(service)); showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'not connected'.").
arg(service).arg(QString::number(version)));
break; break;
} }
} }

2
src/plugins/debugger/qml/qmladapter.h
View File

@@ -86,7 +86,7 @@ public:
void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString()); void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString());
public slots: public slots:
void logServiceStatusChange(const QString &service, QDeclarativeDebugClient::Status newStatus); void logServiceStatusChange(const QString &service, float version, QDeclarativeDebugClient::Status newStatus);
void logServiceActivity(const QString &service, const QString &logMessage); void logServiceActivity(const QString &service, const QString &logMessage);
signals: signals:

8
src/plugins/qmljsinspector/qmljsclientproxy.cpp
View File

@@ -117,12 +117,14 @@ void ClientProxy::connectToServer()
void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status) void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status)
{ {
QString serviceName; QString serviceName;
if (sender()) { float version = 0;
serviceName = sender()->objectName(); if (QDeclarativeDebugClient *client = qobject_cast<QDeclarativeDebugClient*>(sender())) {
serviceName = client->name();
version = client->serviceVersion();
} }
if (m_adapter) if (m_adapter)
m_adapter.data()->logServiceStatusChange(serviceName, status); m_adapter.data()->logServiceStatusChange(serviceName, version, status);
updateConnected(); updateConnected();
} }