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

QmlDesigner: use one node instance view

Browse Source 
Bauhaus now uses only one single instance view.

Done by Marco Bubke
This commit is contained in:
Thomas Hartmann
2010-09-23 15:26:58 +02:00
parent 22a162a797
commit bae48751f6
31 changed files with 581 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View File

@@ -50,6 +50,7 @@
#include <rewritingexception.h>
#include <nodelistproperty.h>
#include <toolbox.h>
#include <variantproperty.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
@@ -87,6 +88,7 @@ public:
QWeakPointer<AllPropertiesBox> allPropertiesBox;
QWeakPointer<StatesEditorWidget> statesEditorWidget;
QWeakPointer<QStackedWidget> stackedWidget;
QWeakPointer<NodeInstanceView> nodeInstanceView;
QWeakPointer<QmlDesigner::Model> model;
QWeakPointer<QmlDesigner::Model> subComponentModel;
@@ -212,6 +214,11 @@ void DesignDocumentController::setFormEditorView(FormEditorView *formEditorView)
m_d->formEditorView = formEditorView;
}
void DesignDocumentController::setNodeInstanceView(NodeInstanceView *nodeInstanceView)
{
m_d->nodeInstanceView = nodeInstanceView;
}
QString DesignDocumentController::displayName() const
{
if (fileName().isEmpty())
@@ -344,6 +351,7 @@ void DesignDocumentController::loadCurrentModel()
Q_ASSERT(m_d->model);
m_d->model->setMasterModel(m_d->masterModel.data());
m_d->model->attachView(m_d->nodeInstanceView.data());
m_d->model->attachView(m_d->navigator.data());
m_d->itemLibrary->setItemLibraryInfo(m_d->model->metaInfo().itemLibraryInfo());
m_d->itemLibrary->setResourcePath(QFileInfo(m_d->fileName).absolutePath());