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

Merge QML inspector into debugger plugin

Browse Source 
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-18 14:20:54 +02:00
parent d201c681da
commit 7f09d0b756
80 changed files with 2669 additions and 5187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,116 +32,80 @@
#include "qmladapter.h"
#include "qscriptdebuggerclient.h"
#include "qmlv8debuggerclient.h"
#include "qmlengine.h"
#include "qmlv8debuggerclient.h"
#include "qscriptdebuggerclient.h"
#include <extensionsystem/pluginmanager.h>
#include <qmldebug/qdebugmessageclient.h>
#include <utils/qtcassert.h>
#include <qmldebug/baseenginedebugclient.h>
#include <qmldebug/qdebugmessageclient.h>
#include <QTimer>
#include <QDebug>
#include <QWeakPointer>
namespace Debugger {
namespace Internal {
class QmlAdapterPrivate
{
public:
explicit QmlAdapterPrivate(DebuggerEngine *engine)
: m_engine(engine)
, m_qmlClient(0)
, m_engineDebugClient(0)
, m_conn(0)
, m_currentSelectedDebugId(-1)
, m_msgClient(0)
{
m_connectionTimer.setInterval(4000);
m_connectionTimer.setSingleShot(true);
}
QWeakPointer<DebuggerEngine> m_engine;
BaseQmlDebuggerClient *m_qmlClient;
BaseEngineDebugClient *m_engineDebugClient;
QTimer m_connectionTimer;
QmlDebugConnection *m_conn;
QHash<QString, BaseQmlDebuggerClient*> debugClients;
int m_currentSelectedDebugId;
QString m_currentSelectedDebugName;
QDebugMessageClient *m_msgClient;
};
} // namespace Internal
QmlAdapter::QmlAdapter(DebuggerEngine *engine, QObject *parent)
: QObject(parent), d(new Internal::QmlAdapterPrivate(engine))
: QObject(parent)
, m_engine(engine)
, m_qmlClient(0)
, m_conn(0)
, m_msgClient(0)
{
connect(&d->m_connectionTimer, SIGNAL(timeout()), SLOT(checkConnectionState()));
d->m_conn = new QmlDebugConnection(this);
connect(d->m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
m_connectionTimer.setInterval(4000);
m_connectionTimer.setSingleShot(true);
connect(&m_connectionTimer, SIGNAL(timeout()), SLOT(checkConnectionState()));
m_conn = new QmlDebugConnection(this);
connect(m_conn, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
SLOT(connectionStateChanged()));
connect(d->m_conn, SIGNAL(error(QAbstractSocket::SocketError)),
connect(m_conn, SIGNAL(error(QAbstractSocket::SocketError)),
SLOT(connectionErrorOccurred(QAbstractSocket::SocketError)));
ExtensionSystem::PluginManager *pluginManager =
ExtensionSystem::PluginManager::instance();
pluginManager->addObject(this);
createDebuggerClients();
d->m_msgClient = new QDebugMessageClient(d->m_conn);
connect(d->m_msgClient, SIGNAL(newStatus(QmlDebugClient::Status)),
m_msgClient = new QDebugMessageClient(m_conn);
connect(m_msgClient, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
}
QmlAdapter::~QmlAdapter()
{
ExtensionSystem::PluginManager *pluginManager =
ExtensionSystem::PluginManager::instance();
if (pluginManager->allObjects().contains(this))
pluginManager->removeObject(this);
delete d;
}
void QmlAdapter::beginConnectionTcp(const QString &address, quint16 port)
{
if (d->m_engine.isNull()
|| (d->m_conn && d->m_conn->state() != QAbstractSocket::UnconnectedState))
if (m_engine.isNull()
|| (m_conn && m_conn->state() != QAbstractSocket::UnconnectedState))
return;
showConnectionStatusMessage(tr("Connecting to debug server %1:%2").arg(address).arg(
QString::number(port)));
d->m_conn->connectToHost(address, port);
m_conn->connectToHost(address, port);
//A timeout to check the connection state
d->m_connectionTimer.start();
m_connectionTimer.start();
}
void QmlAdapter::beginConnectionOst(const QString &channel)
{
if (d->m_engine.isNull()
|| (d->m_conn && d->m_conn->state() != QAbstractSocket::UnconnectedState))
if (m_engine.isNull()
|| (m_conn && m_conn->state() != QAbstractSocket::UnconnectedState))
return;
showConnectionStatusMessage(tr("Connecting to debug server on %1").arg(channel));
d->m_conn->connectToOst(channel);
m_conn->connectToOst(channel);
//A timeout to check the connection state
d->m_connectionTimer.start();
m_connectionTimer.start();
}
void QmlAdapter::closeConnection()
{
if (d->m_connectionTimer.isActive()) {
d->m_connectionTimer.stop();
if (m_connectionTimer.isActive()) {
m_connectionTimer.stop();
} else {
if (d->m_conn) {
d->m_conn->close();
if (m_conn) {
m_conn->close();
}
}
}
@@ -149,13 +113,13 @@ void QmlAdapter::closeConnection()
void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketError)
{
showConnectionStatusMessage(tr("Error: (%1) %2", "%1=error code, %2=error message")
.arg(socketError).arg(d->m_conn->errorString()));
.arg(socketError).arg(m_conn->errorString()));
// this is only an error if we are already connected and something goes wrong.
if (isConnected()) {
emit connectionError(socketError);
} else {
d->m_connectionTimer.stop();
m_connectionTimer.stop();
emit connectionStartupFailed();
}
}
@@ -179,13 +143,13 @@ void QmlAdapter::debugClientStatusChanged(QmlDebugClient::Status status)
QmlDebugClient *client = qobject_cast<QmlDebugClient*>(sender());
QTC_ASSERT(client, return);
d->m_qmlClient = qobject_cast<Internal::BaseQmlDebuggerClient *>(client);
d->m_qmlClient->startSession();
m_qmlClient = qobject_cast<Internal::BaseQmlDebuggerClient *>(client);
m_qmlClient->startSession();
}
void QmlAdapter::connectionStateChanged()
{
switch (d->m_conn->state()) {
switch (m_conn->state()) {
case QAbstractSocket::UnconnectedState:
{
showConnectionStatusMessage(tr("disconnected.\n\n"));
@@ -203,7 +167,7 @@ void QmlAdapter::connectionStateChanged()
{
showConnectionStatusMessage(tr("connected.\n"));
d->m_connectionTimer.stop();
m_connectionTimer.stop();
//reloadEngines();
emit connected();
@@ -228,125 +192,83 @@ void QmlAdapter::checkConnectionState()
void QmlAdapter::createDebuggerClients()
{
Internal::QScriptDebuggerClient *client1 = new Internal::QScriptDebuggerClient(d->m_conn);
connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
Internal::QScriptDebuggerClient *debugClient1 = new Internal::QScriptDebuggerClient(m_conn);
connect(debugClient1, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
connect(client1, SIGNAL(newStatus(QmlDebugClient::Status)),
connect(debugClient1, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(debugClientStatusChanged(QmlDebugClient::Status)));
Internal::QmlV8DebuggerClient *client2 = new Internal::QmlV8DebuggerClient(d->m_conn);
connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
Internal::QmlV8DebuggerClient *debugClient2 = new Internal::QmlV8DebuggerClient(m_conn);
connect(debugClient2, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
connect(client2, SIGNAL(newStatus(QmlDebugClient::Status)),
connect(debugClient2, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(debugClientStatusChanged(QmlDebugClient::Status)));
d->debugClients.insert(client1->name(),client1);
d->debugClients.insert(client2->name(),client2);
m_debugClients.insert(debugClient1->name(),debugClient1);
m_debugClients.insert(debugClient2->name(),debugClient2);
client1->setEngine((Internal::QmlEngine*)(d->m_engine.data()));
client2->setEngine((Internal::QmlEngine*)(d->m_engine.data()));
//engine->startSuccessful(); // FIXME: AAA: port to new debugger states
debugClient1->setEngine((Internal::QmlEngine*)(m_engine.data()));
debugClient2->setEngine((Internal::QmlEngine*)(m_engine.data()));
}
bool QmlAdapter::isConnected() const
{
return d->m_conn && d->m_qmlClient && d->m_conn->state() == QAbstractSocket::ConnectedState;
return m_conn && m_qmlClient && m_conn->state() == QAbstractSocket::ConnectedState;
}
QmlDebugConnection *QmlAdapter::connection() const
{
return d->m_conn;
return m_conn;
}
DebuggerEngine *QmlAdapter::debuggerEngine() const
{
return d->m_engine.data();
return m_engine.data();
}
void QmlAdapter::showConnectionStatusMessage(const QString &message)
{
if (!d->m_engine.isNull())
d->m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogStatus);
if (!m_engine.isNull())
m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogStatus);
}
void QmlAdapter::showConnectionErrorMessage(const QString &message)
{
if (!d->m_engine.isNull())
d->m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogError);
if (!m_engine.isNull())
m_engine.data()->showMessage(QLatin1String("QML Debugger: ") + message, LogError);
}
bool QmlAdapter::disableJsDebugging(bool block)
{
if (d->m_engine.isNull())
if (m_engine.isNull())
return block;
bool isBlocked = d->m_engine.data()->state() == InferiorRunOk;
bool isBlocked = m_engine.data()->state() == InferiorRunOk;
if (isBlocked == block)
return block;
if (block) {
d->m_engine.data()->continueInferior();
} else {
d->m_engine.data()->requestInterruptInferior();
}
if (block)
m_engine.data()->continueInferior();
else
m_engine.data()->requestInterruptInferior();
return isBlocked;
}
Internal::BaseQmlDebuggerClient *QmlAdapter::activeDebuggerClient()
{
return d->m_qmlClient;
return m_qmlClient;
}
QHash<QString, Internal::BaseQmlDebuggerClient*> QmlAdapter::debuggerClients()
{
return d->debugClients;
}
BaseEngineDebugClient *QmlAdapter::engineDebugClient() const
{
return d->m_engineDebugClient;
}
void QmlAdapter::setEngineDebugClient(BaseEngineDebugClient *client)
{
Internal::QmlEngine *engine =
qobject_cast<Internal::QmlEngine *>(d->m_engine.data());
if (engine && d->m_engineDebugClient)
disconnect(d->m_engineDebugClient, SIGNAL(result(quint32,QVariant,QByteArray)),
engine,
SLOT(expressionEvaluated(quint32,QVariant)));
d->m_engineDebugClient = client;
if (engine && d->m_engineDebugClient)
connect(d->m_engineDebugClient, SIGNAL(result(quint32,QVariant,QByteArray)),
engine,
SLOT(expressionEvaluated(quint32,QVariant)));
return m_debugClients;
}
QDebugMessageClient *QmlAdapter::messageClient() const
{
return d->m_msgClient;
}
int QmlAdapter::currentSelectedDebugId() const
{
return d->m_currentSelectedDebugId;
}
QString QmlAdapter::currentSelectedDisplayName() const
{
return d->m_currentSelectedDebugName;
}
void QmlAdapter::setCurrentSelectedDebugInfo(int currentDebugId, const QString &displayName)
{
d->m_currentSelectedDebugId = currentDebugId;
d->m_currentSelectedDebugName = displayName;
emit selectionChanged();
return m_msgClient;
}
void QmlAdapter::logServiceStatusChange(const QString &service, float version,
@@ -374,8 +296,9 @@ void QmlAdapter::logServiceStatusChange(const QString &service, float version,
void QmlAdapter::logServiceActivity(const QString &service, const QString &logMessage)
{
if (!d->m_engine.isNull())
d->m_engine.data()->showMessage(service + QLatin1Char(' ') + logMessage, LogDebug);
if (!m_engine.isNull())
m_engine.data()->showMessage(service + QLatin1Char(' ') + logMessage, LogDebug);
}
} // namespace Internal
} // namespace Debugger