Add property view to the debugger

5 files changed, 205 insertions, 3 deletions

diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index b88b7b3..31a1d5b 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -1,5 +1,7 @@
 SOURCES += debugger/qmldebugger.cpp \
-           debugger/qmldebuggerstatus.cpp
+           debugger/qmldebuggerstatus.cpp \
+           debugger/qmlpropertyview.cpp
 
 HEADERS += debugger/qmldebugger.h \
-           debugger/qmldebuggerstatus.h
+           debugger/qmldebuggerstatus.h \
+           debugger/qmlpropertyview_p.h
diff --git a/src/declarative/debugger/qmldebugger.cpp b/src/declarative/debugger/qmldebugger.cpp
index f232f02..634385b 100644
--- a/src/declarative/debugger/qmldebugger.cpp
+++ b/src/declarative/debugger/qmldebugger.cpp
@@ -57,9 +57,11 @@
 #include <QtGui/qpushbutton.h>
 #include <QtGui/qtablewidget.h>
 #include <QtGui/qevent.h>
+#include <private/qmlpropertyview_p.h>
 
 QmlDebugger::QmlDebugger(QWidget *parent)
-: QWidget(parent), m_tree(0), m_warnings(0), m_watchers(0), m_text(0)
+: QWidget(parent), m_tree(0), m_warnings(0), m_watchers(0), m_properties(0),
+  m_text(0)
 {
     QHBoxLayout *layout = new QHBoxLayout;
     setLayout(layout);
@@ -97,6 +99,9 @@ QmlDebugger::QmlDebugger(QWidget *parent)
     m_watchers->setSelectionMode(QTableWidget::NoSelection);
     tabs->addTab(m_watchers, "Watchers");
 
+    m_properties = new QmlPropertyView(this);
+    tabs->addTab(m_properties, "Properties");
+
     splitter->addWidget(tabs);
     splitter->setStretchFactor(1, 2);
 
@@ -162,6 +167,8 @@ void QmlDebugger::itemClicked(QTreeWidgetItem *i)
             debug->setSelectedState(true);
             m_selectedItem = item->object;
         }
+
+        m_properties->setObject(item->object);
     } 
 
     if(item->url.scheme() == QLatin1String("file")) {
diff --git a/src/declarative/debugger/qmldebugger.h b/src/declarative/debugger/qmldebugger.h
index 8d2593d..35ff92c 100644
--- a/src/declarative/debugger/qmldebugger.h
+++ b/src/declarative/debugger/qmldebugger.h
@@ -57,6 +57,7 @@ class QTreeWidgetItem;
 class QPlainTextEdit;
 class QmlDebuggerItem;
 class QTableWidget;
+class QmlPropertyView;
 class QmlDebugger : public QWidget
 {
 Q_OBJECT
@@ -78,6 +79,7 @@ private:
     QTreeWidget *m_tree;
     QTreeWidget *m_warnings;
     QTableWidget *m_watchers;
+    QmlPropertyView *m_properties;
     QPlainTextEdit *m_text;
     QPointer<QObject> m_object;
     QList<QPair<quint32, QPair<int, QString> > > m_expressions;
diff --git a/src/declarative/debugger/qmlpropertyview.cpp b/src/declarative/debugger/qmlpropertyview.cpp
new file mode 100644
index 0000000..2434c58
--- /dev/null
+++ b/src/declarative/debugger/qmlpropertyview.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmlpropertyview_p.h"
+#include <QtGui/qboxlayout.h>
+#include <QtGui/qtreewidget.h>
+#include <QtCore/qmetaobject.h>
+
+QmlPropertyView::QmlPropertyView(QWidget *parent)
+: QWidget(parent), m_tree(0)
+{
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+    setLayout(layout);
+
+    m_tree = new QTreeWidget(this);
+    m_tree->setHeaderLabels(QStringList() << "Property" << "Value");
+
+    m_tree->setColumnCount(2);
+
+    layout->addWidget(m_tree);
+}
+
+class QmlPropertyViewItem : public QObject, public QTreeWidgetItem
+{
+Q_OBJECT
+public:
+    QmlPropertyViewItem(QTreeWidget *widget);
+
+    QObject *object;
+    QMetaProperty property;
+
+public slots:
+    void refresh();
+};
+
+QmlPropertyViewItem::QmlPropertyViewItem(QTreeWidget *widget)
+: QTreeWidgetItem(widget)
+{
+}
+
+void QmlPropertyViewItem::refresh()
+{
+    setText(1, property.read(object).toString());
+}
+
+void QmlPropertyView::setObject(QObject *object)
+{
+    m_object = object;
+
+    m_tree->clear();
+    if(!m_object)
+        return;
+
+    const QMetaObject *mo = object->metaObject();
+    for(int ii = 0; ii < mo->propertyCount(); ++ii) {
+        QmlPropertyViewItem *item = new QmlPropertyViewItem(m_tree);
+
+        QMetaProperty p = mo->property(ii);
+        item->object = object;
+        item->property = p;
+
+        item->setText(0, QLatin1String(p.name()));
+
+        static int refreshIdx = -1;
+        if(refreshIdx == -1) 
+            refreshIdx = QmlPropertyViewItem::staticMetaObject.indexOfMethod("refresh()");
+
+        if(p.hasNotifySignal()) 
+            QMetaObject::connect(object, p.notifySignalIndex(), 
+                                 item, refreshIdx);
+
+        item->refresh();
+    }
+}
+
+void QmlPropertyView::refresh()
+{
+    setObject(m_object);
+}
+
+#include "qmlpropertyview.moc"
diff --git a/src/declarative/debugger/qmlpropertyview_p.h b/src/declarative/debugger/qmlpropertyview_p.h
new file mode 100644
index 0000000..fce9941
--- /dev/null
+++ b/src/declarative/debugger/qmlpropertyview_p.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLPROPERTYVIEW_P_H
+#define QMLPROPERTYVIEW_P_H
+
+#include <QtGui/qwidget.h>
+#include <QtCore/qpointer.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTreeWidget;
+class QmlPropertyView : public QWidget
+{
+    Q_OBJECT
+public:
+    QmlPropertyView(QWidget *parent = 0);
+
+    void setObject(QObject *);
+
+public slots:
+    void refresh();
+
+private:
+    QPointer<QObject> m_object;
+    QTreeWidget *m_tree;
+};
+
+QT_END_NAMESPACE
+
+#endif // QMLPROPERTYVIEW_P_H
+