1 files changed, 39 insertions, 362 deletions

diff --git a/tools/qmldebugger/engine.cpp b/tools/qmldebugger/engine.cpp
index 321f5e0..fac10f3 100644
--- a/tools/qmldebugger/engine.cpp
+++ b/tools/qmldebugger/engine.cpp
@@ -1,144 +1,21 @@
-#include "engine.h"
-#include "propertyview.h"
-#include "watchtablemodel.h"
-#include <QtDeclarative/qmldebugclient.h>
-#include <QPushButton>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
-#include <QLineEdit>
-#include <QTreeWidget>
-#include <QTableWidget>
 #include <QSplitter>
 #include <QTabWidget>
-#include <QMouseEvent>
-#include <QAction>
-#include <QMenu>
-#include <QInputDialog>
 #include <QFile>
-#include <QHeaderView>
-#include <QPointer>
+
 #include <private/qmlenginedebug_p.h>
+#include <QtDeclarative/qmldebugclient.h>
 #include <QtDeclarative/qmlcomponent.h>
 #include <QtDeclarative/qfxitem.h>
 #include <QtDeclarative/qmldebugservice.h>
 
-QT_BEGIN_NAMESPACE
-
-
-class QmlObjectTree : public QTreeWidget
-{
-    Q_OBJECT
-public:
-    enum AdditionalRoles {
-        ContextIdRole = Qt::UserRole + 1
-    };
-
-    QmlObjectTree(QWidget *parent = 0);
-
-    QTreeWidgetItem *findItemByObjectId(int debugId) const;
-
-signals:
-    void addExpressionWatch(int debugId, const QString &);
-
-protected:
-    virtual void mousePressEvent(QMouseEvent *);
-
-private:
-    QTreeWidgetItem *findItem(QTreeWidgetItem *item, int debugId) const;
-};
-
-QmlObjectTree::QmlObjectTree(QWidget *parent)
-: QTreeWidget(parent)
-{
-}
-
-QTreeWidgetItem *QmlObjectTree::findItemByObjectId(int debugId) const
-{
-    for (int i=0; i<topLevelItemCount(); i++) {
-        QTreeWidgetItem *item = findItem(topLevelItem(i), debugId);
-        if (item)
-            return item;
-    }
-
-    return 0;
-}
-
-QTreeWidgetItem *QmlObjectTree::findItem(QTreeWidgetItem *item, int debugId) const
-{
-    if (item->data(0, Qt::UserRole).toInt() == debugId)
-        return item;
-
-    QTreeWidgetItem *child;
-    for (int i=0; i<item->childCount(); i++) {
-        child = findItem(item->child(i), debugId);
-        if (child)
-            return child;
-    }
-
-    return 0;
-}
-
-void QmlObjectTree::mousePressEvent(QMouseEvent *me)
-{
-    QTreeWidget::mousePressEvent(me);
-    if (!currentItem())
-        return;
-    if(me->button()  == Qt::RightButton && me->type() == QEvent::MouseButtonPress) {
-        QAction action(tr("Add watch..."), 0);
-        QList<QAction *> actions;
-        actions << &action;
-        int debugId = currentItem()->data(0, Qt::UserRole).toInt();
-        if (debugId >= 0 && QMenu::exec(actions, me->globalPos())) {
-            bool ok = false;
-            QString watch = QInputDialog::getText(this, tr("Watch expression"),
-                    tr("Expression:"), QLineEdit::Normal, QString(), &ok);
-            if (ok && !watch.isEmpty()) 
-                emit addExpressionWatch(debugId, watch);
-        }
-    } 
-}
-
-
-class WatchTableHeaderView : public QHeaderView
-{
-    Q_OBJECT
-public:
-    WatchTableHeaderView(QTableView *parent);
-
-signals:
-    void stopWatching(int column);
-
-protected:
-    void mousePressEvent(QMouseEvent *me);
-
-private:
-    QTableView *m_table;
-};
-
-WatchTableHeaderView::WatchTableHeaderView(QTableView *parent)
-    : QHeaderView(Qt::Horizontal, parent), m_table(parent)
-{
-    QObject::connect(this, SIGNAL(sectionClicked(int)),
-                     m_table, SLOT(selectColumn(int)));
-    setClickable(true);
-}
+#include "engine.h"
+#include "objectpropertiesview.h"
+#include "objecttree.h"
+#include "watchtable.h"
 
-void WatchTableHeaderView::mousePressEvent(QMouseEvent *me)
-{
-    QHeaderView::mousePressEvent(me);
-
-    if (me->button() == Qt::RightButton && me->type() == QEvent::MouseButtonPress) {
-        int col = logicalIndexAt(me->pos());
-        if (col >= 0) {
-            m_table->selectColumn(col);
-            QAction action(tr("Stop watching"), 0);
-            QList<QAction *> actions;
-            actions << &action;
-            if (QMenu::exec(actions, me->globalPos()))
-                emit stopWatching(col);
-        }
-    } 
-}
+QT_BEGIN_NAMESPACE
 
 
 class DebuggerEngineItem : public QObject
@@ -159,14 +36,12 @@ private:
     int m_engineId;
 };
 
-EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent)
-: QWidget(parent), m_client(client), m_engines(0), m_context(0), m_object(0), m_watchedObject(0), m_watchTableModel(0)
+EnginePane::EnginePane(QmlDebugConnection *conn, QWidget *parent)
+: QWidget(parent), m_client(new QmlEngineDebug(conn, this)), m_engines(0), m_context(0), m_watchTableModel(0)
 {
-    QVBoxLayout *layout = new QVBoxLayout;
+    QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setContentsMargins(0, 0, 0, 0);
 
-    setLayout(layout);
-
     QFile enginesFile(":/engines.qml");
     enginesFile.open(QFile::ReadOnly);
     Q_ASSERT(enginesFile.isOpen());
@@ -187,30 +62,34 @@ EnginePane::EnginePane(QmlDebugConnection *client, QWidget *parent)
 
     QSplitter *splitter = new QSplitter;
 
-    m_objTree = new QmlObjectTree(this);
-    m_objTree->setHeaderHidden(true);
-    connect(m_objTree, SIGNAL(itemClicked(QTreeWidgetItem *, int)), this, SLOT(itemClicked(QTreeWidgetItem *)));
-    connect(m_objTree, SIGNAL(addExpressionWatch(int,QString)), this, SLOT(addExpressionWatch(int,QString)));
-    splitter->addWidget(m_objTree);
+    m_objTree = new ObjectTree(m_client, this);
+    m_propertiesView = new ObjectPropertiesView(m_client);
+    m_watchTableModel = new WatchTableModel(m_client, this);
+
+    m_watchTableView = new WatchTableView(m_watchTableModel);
+    m_watchTableView->setModel(m_watchTableModel);
+    WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTableModel);
+    m_watchTableView->setHorizontalHeader(header);
+
+    connect(m_objTree, SIGNAL(objectSelected(QmlDebugObjectReference)),
+            m_propertiesView, SLOT(reload(QmlDebugObjectReference)));
+    connect(m_objTree, SIGNAL(expressionWatchRequested(QmlDebugObjectReference,QString)),
+            m_watchTableModel, SLOT(expressionWatchRequested(QmlDebugObjectReference,QString)));
+
+    connect(m_propertiesView, SIGNAL(activated(QmlDebugObjectReference,QmlDebugPropertyReference)),
+            m_watchTableModel, SLOT(togglePropertyWatch(QmlDebugObjectReference,QmlDebugPropertyReference)));
 
-    m_propView = new PropertyView(this);
-    connect(m_propView, SIGNAL(propertyActivated(QmlDebugPropertyReference)),
-            this, SLOT(propertyActivated(QmlDebugPropertyReference)));
+    connect(m_watchTableModel, SIGNAL(watchCreated(QmlDebugWatch*)),
+            m_propertiesView, SLOT(watchCreated(QmlDebugWatch*)));
 
-    m_watchTableModel = new WatchTableModel(this);
-    m_watchTable = new QTableView(this);
-    m_watchTable->setModel(m_watchTableModel);
-    QObject::connect(m_watchTable, SIGNAL(activated(QModelIndex)),
-                     this, SLOT(watchedItemActivated(QModelIndex)));
-    WatchTableHeaderView *header = new WatchTableHeaderView(m_watchTable);
-    m_watchTable->setHorizontalHeader(header);
-    QObject::connect(header, SIGNAL(stopWatching(int)),
-                     this, SLOT(stopWatching(int)));
+    connect(m_watchTableView, SIGNAL(objectActivated(int)),
+            m_objTree, SLOT(selectObject(int)));
 
     m_tabs = new QTabWidget(this);
-    m_tabs->addTab(m_propView, tr("Properties"));
-    m_tabs->addTab(m_watchTable, tr("Watched"));
+    m_tabs->addTab(m_propertiesView, tr("Properties"));
+    m_tabs->addTab(m_watchTableView, tr("Watched"));
 
+    splitter->addWidget(m_objTree);
     splitter->addWidget(m_tabs);
     splitter->setStretchFactor(1, 2);
     layout->addWidget(splitter);
@@ -222,128 +101,6 @@ void EnginePane::engineSelected(int id)
     queryContext(id);
 }
 
-void EnginePane::itemClicked(QTreeWidgetItem *item)
-{
-    m_propView->clear();
-
-    if (m_object) {
-        delete m_object;
-        m_object = 0;
-    }
-
-    m_object = m_client.queryObjectRecursive(QmlDebugObjectReference(item->data(0, Qt::UserRole).toInt()), this);
-    if (!m_object->isWaiting())
-        showProperties();
-    else
-        QObject::connect(m_object, SIGNAL(stateChanged(State)),
-                         this, SLOT(showProperties()));
-}
-
-void EnginePane::showProperties()
-{
-    QmlDebugObjectReference obj = m_object->object();
-    m_propView->setObject(obj);
-
-    if (m_watchedObject) {
-        m_client.removeWatch(m_watchedObject);
-        delete m_watchedObject;
-        m_watchedObject = 0;
-    }
-
-    QmlDebugWatch *watch = m_client.addWatch(obj, this);
-    if (watch->state() != QmlDebugWatch::Dead) {
-        m_watchedObject = watch;
-        QObject::connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
-                        this, SLOT(valueChanged(QByteArray,QVariant)));
-    }
-
-    delete m_object; m_object = 0;
-}
-
-void EnginePane::addExpressionWatch(int debugId, const QString &expr)
-{
-    QmlDebugWatch *watch = m_client.addWatch(QmlDebugObjectReference(debugId), expr, this);
-
-    if (watch->state() != QmlDebugWatch::Dead) {
-        QObject::connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
-                        this, SLOT(valueChanged(QByteArray,QVariant)));
-        m_watchTableModel->addWatch(watch, expr);
-        m_watchTable->resizeColumnsToContents();
-    }
-}
-
-void EnginePane::valueChanged(const QByteArray &propertyName, const QVariant &value)
-{
-    QmlDebugWatch *watch = qobject_cast<QmlDebugWatch*>(sender());
-
-    m_watchTableModel->updateWatch(watch, value);
-
-    if (!propertyName.isEmpty()) {
-        if (watch->objectDebugId() == m_propView->object().debugId())
-            m_propView->updateProperty(propertyName, value);
-    }
-}
-
-void EnginePane::propertyActivated(const QmlDebugPropertyReference &property)
-{
-    PropertyView *view = qobject_cast<PropertyView*>(sender());
-    if (!view)
-        return;
-
-    QmlDebugObjectReference object = view->object();
-    QmlDebugWatch *watch = m_watchTableModel->findWatch(object.debugId(), property.name());
-    if (watch) {
-        m_client.removeWatch(watch);
-        delete watch;
-        watch = 0;
-    } else {
-        QmlDebugWatch *watch = m_client.addWatch(property, this);
-        if (watch->state() != QmlDebugWatch::Dead) {
-            QObject::connect(watch, SIGNAL(stateChanged(State)),
-                            this, SLOT(propertyWatchStateChanged()));
-            QObject::connect(watch, SIGNAL(valueChanged(QByteArray,QVariant)),
-                            this, SLOT(valueChanged(QByteArray,QVariant)));
-            QString desc = property.name()
-                    + QLatin1String(" on\n")
-                    + object.className()
-                    + QLatin1String(": ")
-                    + (object.name().isEmpty() ? QLatin1String("<unnamed>") : object.name());
-            m_watchTableModel->addWatch(watch, desc);
-            m_watchTable->resizeColumnsToContents();
-        }
-    }
-}
-
-void EnginePane::propertyWatchStateChanged()
-{
-    QmlDebugPropertyWatch *watch = qobject_cast<QmlDebugPropertyWatch*>(sender());
-    if (watch && watch->objectDebugId() == m_propView->object().debugId())
-        m_propView->setPropertyIsWatched(watch->name(), watch->state() == QmlDebugWatch::Active);
-}
-
-void EnginePane::stopWatching(int column)
-{
-    QmlDebugWatch *watch = m_watchTableModel->findWatch(column);
-    if (watch) {
-        m_client.removeWatch(watch);
-        delete watch;
-        watch = 0;
-    }
-}
-
-void EnginePane::watchedItemActivated(const QModelIndex &index)
-{
-    QmlDebugWatch *watch = m_watchTableModel->findWatch(index.column());
-    if (!watch)
-        return;
-    QTreeWidgetItem *item = m_objTree->findItemByObjectId(watch->objectDebugId());
-    if (item) {
-        m_objTree->setCurrentItem(item);
-        m_objTree->scrollToItem(item);
-        item->setExpanded(true);
-    }
-}
-
 void EnginePane::queryContext(int id)
 {
     if (m_context) {
@@ -351,88 +108,30 @@ void EnginePane::queryContext(int id)
         m_context = 0;
     }
 
-    m_context = m_client.queryRootContexts(QmlDebugEngineReference(id), this);
+    m_context = m_client->queryRootContexts(QmlDebugEngineReference(id), this);
     if (!m_context->isWaiting())
         contextChanged();
     else
-        QObject::connect(m_context, SIGNAL(stateChanged(State)), 
+        QObject::connect(m_context, SIGNAL(stateChanged(State)),
                          this, SLOT(contextChanged()));
 }
 
 void EnginePane::contextChanged()
 {
-    dump(m_context->rootContext(), 0);
+    //dump(m_context->rootContext(), 0);
+
     foreach (const QmlDebugObjectReference &object, m_context->rootContext().objects())
-        fetchObject(object.debugId());
+        m_objTree->reload(object.debugId());
 
     delete m_context; m_context = 0;
 }
 
-void EnginePane::dump(const QmlDebugContextReference &ctxt, int ind)
-{
-    QByteArray indent(ind * 4, ' ');
-    qWarning().nospace() << indent.constData() << ctxt.debugId() << " " 
-                         << qPrintable(ctxt.name());
-
-    for (int ii = 0; ii < ctxt.contexts().count(); ++ii)
-        dump(ctxt.contexts().at(ii), ind + 1);
-
-    for (int ii = 0; ii < ctxt.objects().count(); ++ii)
-        dump(ctxt.objects().at(ii), ind);
-}
-
-void EnginePane::dump(const QmlDebugObjectReference &obj, int ind)
-{
-    QByteArray indent(ind * 4, ' ');
-    qWarning().nospace() << indent.constData() << qPrintable(obj.className())
-                         << " " << qPrintable(obj.name()) << " " 
-                         << obj.debugId();
-
-    for (int ii = 0; ii < obj.children().count(); ++ii)
-        dump(obj.children().at(ii), ind + 1);
-}
-
-
-void EnginePane::buildTree(const QmlDebugObjectReference &obj, QTreeWidgetItem *parent)
-{
-    if (!parent)
-        m_objTree->clear();
-
-    QTreeWidgetItem *item = parent ? new QTreeWidgetItem(parent) : new QTreeWidgetItem(m_objTree);
-    item->setText(0, obj.className());
-    item->setData(0, Qt::UserRole, obj.debugId());
-    item->setData(0, QmlObjectTree::ContextIdRole, obj.contextDebugId());
-
-    if (parent && obj.contextDebugId() >= 0
-            && obj.contextDebugId() != parent->data(0, QmlObjectTree::ContextIdRole).toInt()) {
-        QmlDebugFileReference source = obj.source();
-        if (!source.url().isEmpty()) {
-            QString toolTipString = QLatin1String("URL: ") + source.url().toString();
-            item->setToolTip(0, toolTipString);
-        }
-        item->setForeground(0, QColor("orange"));
-    } else {
-        item->setExpanded(true);
-    }
-
-    if (obj.contextDebugId() < 0)
-        item->setForeground(0, Qt::lightGray);
-
-    for (int ii = 0; ii < obj.children().count(); ++ii)
-        buildTree(obj.children().at(ii), item);
-}
-
 void EnginePane::refreshEngines()
 {
     if (m_engines)
         return;
 
-    QList<QmlDebugWatch *> watches = m_watchTableModel->watches();
-    for (int i=0; i<watches.count(); i++)
-        m_client.removeWatch(watches[i]);
-    qDeleteAll(watches);
-
-    m_engines = m_client.queryAvailableEngines(this);
+    m_engines = m_client->queryAvailableEngines(this);
     if (!m_engines->isWaiting())
         enginesChanged();
     else
@@ -462,28 +161,6 @@ void EnginePane::enginesChanged()
         engineSelected(qobject_cast<DebuggerEngineItem*>(m_engineItems.at(0))->engineId());
 }
 
-void EnginePane::fetchObject(int id)
-{
-    if (m_object) {
-        delete m_object;
-        m_object = 0;
-    }
-
-    m_object = m_client.queryObjectRecursive(QmlDebugObjectReference(id), this);
-    if (!m_object->isWaiting())
-        objectFetched();
-    else
-        QObject::connect(m_object, SIGNAL(stateChanged(State)), 
-                         this, SLOT(objectFetched()));
-}
-
-void EnginePane::objectFetched()
-{
-    dump(m_object->object(), 0);
-    buildTree(m_object->object(), 0);
-    delete m_object; m_object = 0;
-}
-
 
 #include "engine.moc"