QmlDesigner: refactoring PropertyEditor

* Renaming PropertyEditor to PropertyEditorView
* Adding PropertyEditorWidget
* Renaming DeclarativeWidgetView to QuickPropertyEditorView
* Renaming NodeType to PropertyEditorQmlBackend
* Moving PropertyEditorQmlBackend into separate file
* Cleaning up interface of PropertyEditorQmlBackend

Change-Id: I1291feb5880b01d1e2bac09f4eb1e0181ff04d5c
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

src/plugins/qmldesigner/components/propertyeditor/propertyeditor.pri

@@ -1,6 +1,6 @@
 VPATH += $$PWD
 
-SOURCES += propertyeditor.cpp \
+SOURCES += propertyeditorview.cpp \
     qmlanchorbindingproxy.cpp \
     resetwidget.cpp \
     qlayoutobject.cpp \
@@ -15,10 +15,12 @@ SOURCES += propertyeditor.cpp \
     siblingcombobox.cpp \
     propertyeditortransaction.cpp \
     propertyeditorcontextobject.cpp \
-    declarativewidgetview.cpp \
+    quickpropertyeditorview.cpp \
-    gradientlineqmladaptor.cpp
+    gradientlineqmladaptor.cpp \
+    propertyeditorqmlbackend.cpp \
+    propertyeditorwidget.cpp
 
-HEADERS += propertyeditor.h \
+HEADERS += propertyeditorview.h \
     qmlanchorbindingproxy.h \
     resetwidget.h \
     qlayoutobject.h \
@@ -34,8 +36,10 @@ HEADERS += propertyeditor.h \
     propertyeditortransaction.h \
     designerpropertymap.h \
     propertyeditorcontextobject.h \
-    declarativewidgetview.h \
+    quickpropertyeditorview.h \
-    gradientlineqmladaptor.h
+    gradientlineqmladaptor.h \
+    propertyeditorqmlbackend.h \
+    propertyeditorwidget.h
     
 QT += declarative
 

src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

@@ -0,0 +1,313 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "propertyeditorqmlbackend.h"
+
+#include "propertyeditorvalue.h"
+#include "propertyeditortransaction.h"
+
+#include <qmlobjectnode.h>
+#include <nodemetainfo.h>
+#include <variantproperty.h>
+#include <bindingproperty.h>
+
+#include <QApplication>
+#include <QFileInfo>
+
+#ifdef Q_OS_WIN
+#include <utils/winutils.h>
+#endif
+
+enum {
+    debug = false
+};
+
+static QObject *variantToQObject(const QVariant &value)
+{
+    if (value.userType() == QMetaType::QObjectStar || value.userType() > QMetaType::User)
+        return *(QObject **)value.constData();
+
+    return 0;
+}
+
+static QString applicationDirPath()
+{
+#ifdef Q_OS_WIN
+    // normalize paths so QML doesn't freak out if it's wrongly capitalized on Windows
+    return Utils::normalizePathName(QCoreApplication::applicationDirPath());
+#else
+    return QCoreApplication::applicationDirPath();
+#endif
+}
+
+#ifdef Q_OS_MAC
+#  define SHARE_PATH "/../Resources/qmldesigner"
+#else
+#  define SHARE_PATH "/../share/qtcreator/qmldesigner"
+#endif
+
+static inline QString sharedDirPath()
+{
+    QString appPath = applicationDirPath();
+
+    return QFileInfo(appPath + SHARE_PATH).absoluteFilePath();
+}
+
+namespace QmlDesigner {
+
+PropertyEditorQmlBackend::PropertyEditorQmlBackend(PropertyEditorView *propertyEditor) :
+        m_view(new QuickPropertyEditorView), m_propertyEditorTransaction(new PropertyEditorTransaction(propertyEditor)), m_dummyPropertyEditorValue(new PropertyEditorValue()),
+        m_contextObject(new PropertyEditorContextObject())
+{
+    Q_ASSERT(QFileInfo(":/images/button_normal.png").exists());
+
+    QDeclarativeContext *ctxt = m_view->rootContext();
+    m_view->engine()->setOutputWarningsToStandardError(debug);
+    m_view->engine()->addImportPath(propertyEditorResourcesPath());
+    m_dummyPropertyEditorValue->setValue("#000000");
+    ctxt->setContextProperty("dummyBackendValue", m_dummyPropertyEditorValue.data());
+    m_contextObject->setBackendValues(&m_backendValuesPropertyMap);
+    ctxt->setContextObject(m_contextObject.data());
+
+    QObject::connect(&m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)), propertyEditor, SLOT(changeValue(QString)));
+}
+
+PropertyEditorQmlBackend::~PropertyEditorQmlBackend()
+{
+}
+
+void PropertyEditorQmlBackend::setupPropertyEditorValue(const PropertyName &name, PropertyEditorView *propertyEditor, const QString &type)
+{
+    QmlDesigner::PropertyName propertyName(name);
+    propertyName.replace('.', '_');
+    PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(propertyName)));
+    if (!valueObject) {
+        valueObject = new PropertyEditorValue(&backendValuesPropertyMap());
+        QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &backendValuesPropertyMap(), SIGNAL(valueChanged(QString,QVariant)));
+        QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString)));
+        backendValuesPropertyMap().insert(QString::fromUtf8(propertyName), QVariant::fromValue(valueObject));
+    }
+    valueObject->setName(propertyName);
+    if (type == "QColor")
+        valueObject->setValue(QVariant("#000000"));
+    else
+        valueObject->setValue(QVariant(1));
+
+}
+
+void PropertyEditorQmlBackend::createPropertyEditorValue(const QmlObjectNode &qmlObjectNode,
+                                             const PropertyName &name,
+                                             const QVariant &value,
+                                             PropertyEditorView *propertyEditor)
+{
+    PropertyName propertyName(name);
+    propertyName.replace('.', '_');
+    PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(propertyName)));
+    if (!valueObject) {
+        valueObject = new PropertyEditorValue(&backendValuesPropertyMap());
+        QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &backendValuesPropertyMap(), SIGNAL(valueChanged(QString,QVariant)));
+        QObject::connect(valueObject, SIGNAL(expressionChanged(QString)), propertyEditor, SLOT(changeExpression(QString)));
+        backendValuesPropertyMap().insert(QString::fromUtf8(propertyName), QVariant::fromValue(valueObject));
+    }
+    valueObject->setName(name);
+    valueObject->setModelNode(qmlObjectNode);
+
+    if (qmlObjectNode.propertyAffectedByCurrentState(name) && !(qmlObjectNode.modelNode().property(name).isBindingProperty()))
+        valueObject->setValue(qmlObjectNode.modelValue(name));
+
+    else
+        valueObject->setValue(value);
+
+    if (propertyName != "id" &&
+        qmlObjectNode.currentState().isBaseState() &&
+        qmlObjectNode.modelNode().property(propertyName).isBindingProperty()) {
+        valueObject->setExpression(qmlObjectNode.modelNode().bindingProperty(propertyName).expression());
+    } else {
+        valueObject->setExpression(qmlObjectNode.instanceValue(name).toString());
+    }
+}
+
+void PropertyEditorQmlBackend::setValue(const QmlObjectNode & qmlObjectNode, const PropertyName &name, const QVariant &value)
+{
+    PropertyName propertyName = name;
+    propertyName.replace('.', '_');
+    PropertyEditorValue *propertyValue = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value(propertyName)));
+    if (propertyValue) {
+        propertyValue->setValue(value);
+        if (!qmlObjectNode.hasBindingProperty(name))
+            propertyValue->setExpression(value.toString());
+        else
+            propertyValue->setExpression(qmlObjectNode.expression(name));
+    }
+}
+
+
+QDeclarativeContext *PropertyEditorQmlBackend::context() {
+    return m_view->rootContext();
+}
+
+PropertyEditorContextObject* PropertyEditorQmlBackend::contextObject() {
+    return m_contextObject.data();
+}
+
+QWidget *PropertyEditorQmlBackend::widget() {
+    return m_view;
+}
+
+void PropertyEditorQmlBackend::setSource(const QUrl& url) {
+    m_view->setSource(url);
+}
+
+Internal::QmlAnchorBindingProxy &PropertyEditorQmlBackend::backendAnchorBinding() {
+    return m_backendAnchorBinding;
+}
+
+DesignerPropertyMap<PropertyEditorValue> &PropertyEditorQmlBackend::backendValuesPropertyMap() {
+    return m_backendValuesPropertyMap;
+}
+
+PropertyEditorTransaction *PropertyEditorQmlBackend::propertyEditorTransaction() {
+    return m_propertyEditorTransaction.data();
+}
+
+PropertyEditorValue *PropertyEditorQmlBackend::propertyValueForName(const QString &propertyName)
+{
+     return qobject_cast<PropertyEditorValue*>(variantToQObject(backendValuesPropertyMap().value(propertyName)));
+}
+
+void PropertyEditorQmlBackend::setup(const QmlObjectNode &qmlObjectNode, const QString &stateName, const QUrl &qmlSpecificsFile, PropertyEditorView *propertyEditor)
+{
+    if (!qmlObjectNode.isValid())
+        return;
+
+    QDeclarativeContext *ctxt = m_view->rootContext();
+
+    if (qmlObjectNode.isValid()) {
+        foreach (const PropertyName &propertyName, qmlObjectNode.modelNode().metaInfo().propertyNames())
+            createPropertyEditorValue(qmlObjectNode, propertyName, qmlObjectNode.instanceValue(propertyName), propertyEditor);
+
+        // className
+        PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value("className")));
+        if (!valueObject)
+            valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
+        valueObject->setName("className");
+        valueObject->setModelNode(qmlObjectNode.modelNode());
+        valueObject->setValue(qmlObjectNode.modelNode().simplifiedTypeName());
+        QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)));
+        m_backendValuesPropertyMap.insert("className", QVariant::fromValue(valueObject));
+
+        // id
+        valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value("id")));
+        if (!valueObject)
+            valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
+        valueObject->setName("id");
+        valueObject->setValue(qmlObjectNode.id());
+        QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)));
+        m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject));
+
+        // anchors
+        m_backendAnchorBinding.setup(QmlItemNode(qmlObjectNode.modelNode()));
+
+        ctxt->setContextProperty("anchorBackend", &m_backendAnchorBinding);
+
+        ctxt->setContextProperty("transaction", m_propertyEditorTransaction.data());
+
+        contextObject()->setSpecificsUrl(qmlSpecificsFile);
+
+        contextObject()->setStateName(stateName);
+        if (!qmlObjectNode.isValid())
+            return;
+        ctxt->setContextProperty("propertyCount", QVariant(qmlObjectNode.modelNode().properties().count()));
+
+        contextObject()->setIsBaseState(qmlObjectNode.isInBaseState());
+        contextObject()->setSelectionChanged(false);
+
+        contextObject()->setSelectionChanged(false);
+
+        NodeMetaInfo metaInfo = qmlObjectNode.modelNode().metaInfo();
+
+        if (metaInfo.isValid()) {
+            contextObject()->setMajorVersion(metaInfo.majorVersion());
+            contextObject()->setMinorVersion(metaInfo.minorVersion());
+        } else {
+            contextObject()->setMajorVersion(-1);
+            contextObject()->setMinorVersion(-1);
+        }
+
+    } else {
+        qWarning() << "PropertyEditor: invalid node for setup";
+    }
+}
+
+void PropertyEditorQmlBackend::initialSetup(const TypeName &typeName, const QUrl &qmlSpecificsFile, PropertyEditorView *propertyEditor)
+{
+    QDeclarativeContext *ctxt = m_view->rootContext();
+
+    NodeMetaInfo metaInfo = propertyEditor->model()->metaInfo(typeName, 4, 7);
+
+    foreach (const PropertyName &propertyName, metaInfo.propertyNames())
+        setupPropertyEditorValue(propertyName, propertyEditor, metaInfo.propertyTypeName(propertyName));
+
+    PropertyEditorValue *valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value("className")));
+    if (!valueObject)
+        valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
+    valueObject->setName("className");
+
+    valueObject->setValue(typeName);
+    QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)));
+    m_backendValuesPropertyMap.insert("className", QVariant::fromValue(valueObject));
+
+    // id
+    valueObject = qobject_cast<PropertyEditorValue*>(variantToQObject(m_backendValuesPropertyMap.value("id")));
+    if (!valueObject)
+        valueObject = new PropertyEditorValue(&m_backendValuesPropertyMap);
+    valueObject->setName("id");
+    valueObject->setValue("id");
+    QObject::connect(valueObject, SIGNAL(valueChanged(QString,QVariant)), &m_backendValuesPropertyMap, SIGNAL(valueChanged(QString,QVariant)));
+    m_backendValuesPropertyMap.insert("id", QVariant::fromValue(valueObject));
+
+    ctxt->setContextProperty("anchorBackend", &m_backendAnchorBinding);
+    ctxt->setContextProperty("transaction", m_propertyEditorTransaction.data());
+
+    contextObject()->setSpecificsUrl(qmlSpecificsFile);
+
+    contextObject()->setStateName(QLatin1String("basestate"));
+
+    contextObject()->setIsBaseState(true);
+
+    contextObject()->setSpecificQmlData(QLatin1String(""));
+
+    contextObject()->setGlobalBaseUrl(QUrl());
+}
+
+QString PropertyEditorQmlBackend::propertyEditorResourcesPath() {
+    return sharedDirPath() + QLatin1String("/propertyeditor");
+}
+
+} //QmlDesigner

src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.h

@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef PROPERTYEDITORQMLBACKEND_H
+#define PROPERTYEDITORQMLBACKEND_H
+
+#include "qmlanchorbindingproxy.h"
+#include "designerpropertymap.h"
+#include "propertyeditorvalue.h"
+#include "propertyeditorcontextobject.h"
+#include "quickpropertyeditorview.h"
+
+class PropertyEditorValue;
+
+namespace QmlDesigner {
+
+class PropertyEditorTransaction;
+class PropertyEditorView;
+
+class PropertyEditorQmlBackend {
+public:
+    PropertyEditorQmlBackend(PropertyEditorView *propertyEditor);
+    ~PropertyEditorQmlBackend();
+
+    void setup(const QmlObjectNode &fxObjectNode, const QString &stateName, const QUrl &qmlSpecificsFile, PropertyEditorView *propertyEditor);
+    void initialSetup(const TypeName &typeName, const QUrl &qmlSpecificsFile, PropertyEditorView *propertyEditor);
+    void setValue(const QmlObjectNode &fxObjectNode, const PropertyName &name, const QVariant &value);
+
+    QDeclarativeContext *context();
+    PropertyEditorContextObject* contextObject();
+    QWidget *widget();
+    void setSource(const QUrl& url);
+    Internal::QmlAnchorBindingProxy &backendAnchorBinding();
+    DesignerPropertyMap<PropertyEditorValue> &backendValuesPropertyMap();
+    PropertyEditorTransaction *propertyEditorTransaction();
+
+    PropertyEditorValue *propertyValueForName(const QString &propertyName);
+
+    static QString propertyEditorResourcesPath();
+
+private:
+    void createPropertyEditorValue(const QmlObjectNode &qmlObjectNode,
+                                   const PropertyName &name, const QVariant &value,
+                                   PropertyEditorView *propertyEditor);
+    void setupPropertyEditorValue(const PropertyName &name, PropertyEditorView *propertyEditor, const QString &type);
+
+private:
+    QuickPropertyEditorView *m_view;
+    Internal::QmlAnchorBindingProxy m_backendAnchorBinding;
+    DesignerPropertyMap<PropertyEditorValue> m_backendValuesPropertyMap;
+    QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
+    QScopedPointer<PropertyEditorValue> m_dummyPropertyEditorValue;
+    QScopedPointer<PropertyEditorContextObject> m_contextObject;
+};
+
+} //QmlDesigner
+
+#endif //PROPERTYEDITORQMLBACKEND_H

src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp

@@ -34,7 +34,7 @@
 
 namespace QmlDesigner {
 
-PropertyEditorTransaction::PropertyEditorTransaction(QmlDesigner::PropertyEditor *propertyEditor) : QObject(propertyEditor), m_propertyEditor(propertyEditor), m_timerId(-1)
+PropertyEditorTransaction::PropertyEditorTransaction(QmlDesigner::PropertyEditorView *propertyEditor) : QObject(propertyEditor), m_propertyEditor(propertyEditor), m_timerId(-1)
 {
 }
 

src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.h

@@ -30,7 +30,7 @@
 #ifndef PROPERTYEDITORTRANSACTION_H
 #define PROPERTYEDITORTRANSACTION_H
 
-#include "propertyeditor.h"
+#include "propertyeditorview.h"
 
 namespace QmlDesigner {
 
@@ -38,7 +38,7 @@ class PropertyEditorTransaction : public QObject
 {
     Q_OBJECT
 public:
-    PropertyEditorTransaction(QmlDesigner::PropertyEditor *propertyEditor);
+    PropertyEditorTransaction(QmlDesigner::PropertyEditorView *propertyEditor);
 
 public slots:
     void start();
@@ -47,7 +47,7 @@ protected:
      void timerEvent(QTimerEvent *event);
 
 private:
-    QmlDesigner::PropertyEditor *m_propertyEditor;
+    QmlDesigner::PropertyEditorView *m_propertyEditor;
     QmlDesigner::RewriterTransaction m_rewriterTransaction;
     int m_timerId;
 };

src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.h

@@ -27,19 +27,15 @@
 **
 ****************************************************************************/
 
-#ifndef PROPERTYEDITOR_H
+#ifndef PROPERTYEDITORVIEW_H
-#define PROPERTYEDITOR_H
+#define PROPERTYEDITORVIEW_H
 
 #include <abstractview.h>
-#include <declarativewidgetview.h>
 #include <QHash>
-#include <QStackedWidget>
 #include <QTimer>
 
-#include "qmlanchorbindingproxy.h"
+#include "propertyeditorqmlbackend.h"
-#include "designerpropertymap.h"
+#include "propertyeditorwidget.h"
-#include "propertyeditorvalue.h"
-#include "propertyeditorcontextobject.h"
 
 QT_BEGIN_NAMESPACE
 class QShortcut;
@@ -47,38 +43,20 @@ class QStackedWidget;
 class QTimer;
 QT_END_NAMESPACE
 
-class PropertyEditorValue;
-
 namespace QmlDesigner {
 
 class PropertyEditorTransaction;
 class CollapseButton;
-class StackedWidget;
+class PropertyEditorWidget;
+class PropertyEditorView;
 
-class PropertyEditor: public AbstractView
+class PropertyEditorView: public AbstractView
 {
     Q_OBJECT
 
-    class NodeType {
-    public:
-        NodeType(PropertyEditor *propertyEditor);
-        ~NodeType();
-
-        void setup(const QmlObjectNode &fxObjectNode, const QString &stateName, const QUrl &qmlSpecificsFile, PropertyEditor *propertyEditor);
-        void initialSetup(const TypeName &typeName, const QUrl &qmlSpecificsFile, PropertyEditor *propertyEditor);
-        void setValue(const QmlObjectNode &fxObjectNode, const PropertyName &name, const QVariant &value);
-
-        DeclarativeWidgetView *m_view;
-        Internal::QmlAnchorBindingProxy m_backendAnchorBinding;
-        DesignerPropertyMap<PropertyEditorValue> m_backendValuesPropertyMap;
-        QScopedPointer<PropertyEditorTransaction> m_propertyEditorTransaction;
-        QScopedPointer<PropertyEditorValue> m_dummyPropertyEditorValue;
-        QScopedPointer<PropertyEditorContextObject> m_contextObject;
-    };
-
 public:
-    PropertyEditor(QWidget *parent = 0);
+    PropertyEditorView(QWidget *parent = 0);
-    ~PropertyEditor();
+    ~PropertyEditorView();
 
     void setQmlDir(const QString &qmlDirPath);
 
@@ -149,38 +127,20 @@ private: //functions
 
     void delayedResetView();
 
-
 private: //variables
     ModelNode m_selectedNode;
     QWidget *m_parent;
     QShortcut *m_updateShortcut;
     int m_timerId;
-    StackedWidget* m_stackedWidget;
+    PropertyEditorWidget* m_stackedWidget;
     QString m_qmlDir;
-    QHash<QString, NodeType *> m_typeHash;
+    QHash<QString, PropertyEditorQmlBackend *> m_typeHash;
-    NodeType *m_currentType;
+    PropertyEditorQmlBackend *m_currentType;
     bool m_locked;
     bool m_setupCompleted;
     QTimer *m_singleShotTimer;
 };
 
+} //QmlDesigner
 
-class StackedWidget : public QStackedWidget
+#endif // PROPERTYEDITORVIEW_H
-{
-Q_OBJECT
-
-public:
-    StackedWidget(QWidget *parent = 0) : QStackedWidget(parent) {}
-
-signals:
-    void resized();
-protected:
-    void resizeEvent(QResizeEvent * event)
-    {
-        QStackedWidget::resizeEvent(event);
-        emit resized();
-    }
-};
-}
-
-#endif // PROPERTYEDITOR_H

src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.cpp

@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "propertyeditorwidget.h"
+
+
+namespace QmlDesigner {
+
+PropertyEditorWidget::PropertyEditorWidget(QWidget *parent) : QStackedWidget(parent)
+{
+}
+
+void PropertyEditorWidget::resizeEvent(QResizeEvent * event)
+{
+    QStackedWidget::resizeEvent(event);
+    emit resized();
+}
+
+}

src/plugins/qmldesigner/components/propertyeditor/propertyeditorwidget.h

@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef PROPERTYEDITORWIDGET_H
+#define PROPERTYEDITORWIDGET_H
+
+#include <QStackedWidget>
+
+namespace QmlDesigner {
+
+class PropertyEditorWidget : public QStackedWidget
+{
+
+Q_OBJECT
+
+public:
+    PropertyEditorWidget(QWidget *parent = 0);
+
+signals:
+    void resized();
+
+protected:
+    void resizeEvent(QResizeEvent * event);
+};
+
+} //QmlDesigner
+
+#endif //PROPERTYEDITORWIDGET_H

src/plugins/qmldesigner/components/propertyeditor/quickpropertyeditorview.cpp

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "declarativewidgetview.h"
+#include "quickpropertyeditorview.h"
 
 #include <QDeclarativeItem>
 #include <QDeclarativeEngine>
@@ -35,7 +35,7 @@
 
 namespace QmlDesigner {
 
-void DeclarativeWidgetView::execute()
+void QuickPropertyEditorView::execute()
 {
     if (m_root)
         delete m_root.data();
@@ -52,47 +52,47 @@ void DeclarativeWidgetView::execute()
     }
 }
 
-DeclarativeWidgetView::DeclarativeWidgetView(QWidget *parent) :
+QuickPropertyEditorView::QuickPropertyEditorView(QWidget *parent) :
     QWidget(parent)
 {
 }
 
-QUrl DeclarativeWidgetView::source() const
+QUrl QuickPropertyEditorView::source() const
 {
     return m_source;
 }
 
-void DeclarativeWidgetView::setSource(const QUrl& url)
+void QuickPropertyEditorView::setSource(const QUrl& url)
 {
     m_source = url;
     execute();
 }
 
-QDeclarativeEngine* DeclarativeWidgetView::engine()
+QDeclarativeEngine* QuickPropertyEditorView::engine()
 {
    return &m_engine;
 }
 
-QWidget *DeclarativeWidgetView::rootWidget() const
+QWidget *QuickPropertyEditorView::rootWidget() const
 {
     return m_root.data();
 }
 
-QDeclarativeContext* DeclarativeWidgetView::rootContext()
+QDeclarativeContext* QuickPropertyEditorView::rootContext()
 {
    return m_engine.rootContext();
 }
 
-DeclarativeWidgetView::Status DeclarativeWidgetView::status() const
+QuickPropertyEditorView::Status QuickPropertyEditorView::status() const
 {
     if (!m_component)
-        return DeclarativeWidgetView::Null;
+        return QuickPropertyEditorView::Null;
 
-    return DeclarativeWidgetView::Status(m_component->status());
+    return QuickPropertyEditorView::Status(m_component->status());
 }
 
 
-void DeclarativeWidgetView::continueExecute()
+void QuickPropertyEditorView::continueExecute()
 {
 
     disconnect(m_component.data(), SIGNAL(statusChanged(QDeclarativeComponent::Status)), this, SLOT(continueExecute()));
@@ -121,7 +121,7 @@ void DeclarativeWidgetView::continueExecute()
     emit statusChanged(status());
 }
 
-void DeclarativeWidgetView::setRootWidget(QWidget *widget)
+void QuickPropertyEditorView::setRootWidget(QWidget *widget)
 {
     if (m_root.data() == widget)
         return;

src/plugins/qmldesigner/components/propertyeditor/quickpropertyeditorview.h

@@ -27,12 +27,13 @@
 **
 ****************************************************************************/
 
-#ifndef DECLARATIVEWIDGETVIEW_H
+#ifndef QUICKPROERTYEDITORVIEW_H
-#define DECLARATIVEWIDGETVIEW_H
+#define QUICKPROERTYEDITORVIEW_H
 
 #include <QWidget>
 #include <QUrl>
 #include <QDeclarativeEngine>
+#include <QDeclarativeContext>
 
 QT_BEGIN_NAMESPACE
 class QDeclarativeContext;
@@ -42,13 +43,13 @@ QT_END_NAMESPACE
 
 namespace QmlDesigner {
 
-class DeclarativeWidgetView : public QWidget
+class QuickPropertyEditorView : public QWidget
 {
     Q_OBJECT
 
     Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
 public:
-    explicit DeclarativeWidgetView(QWidget *parent = 0);
+    explicit QuickPropertyEditorView(QWidget *parent = 0);
 
     QUrl source() const;
     void setSource(const QUrl&);
@@ -62,7 +63,7 @@ public:
     Status status() const;
 
 signals:
-    void statusChanged(DeclarativeWidgetView::Status);
+    void statusChanged(QuickPropertyEditorView::Status);
 
 protected:
     void setRootWidget(QWidget *);
@@ -81,4 +82,4 @@ private:
 
 } //QmlDesigner
 
-#endif // DECLARATIVEWIDGETVIEW_H
+#endif // QUICKPROERTYEDITORVIEW_H

src/plugins/qmldesigner/designercore/include/viewmanager.h

@@ -38,7 +38,7 @@
 #include <navigatorview.h>
 #include <stateseditorview.h>
 #include <formeditorview.h>
-#include <propertyeditor.h>
+#include <propertyeditorview.h>
 #include <componentview.h>
 #include <debugview.h>
 #include <QWidgetAction>
@@ -111,7 +111,7 @@ private: // variables
     FormEditorView m_formEditorView;
     ItemLibraryView m_itemLibraryView;
     NavigatorView m_navigatorView;
-    PropertyEditor m_propertyEditorView;
+    PropertyEditorView m_propertyEditorView;
     StatesEditorView m_statesEditorView;
     NodeInstanceView m_nodeInstanceView;