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

QmlDesigner.DocumentManager: Support component property of Tab

Browse Source 
Change-Id: Iaf2d1160904023db3c66c6e536c5cf812a71e3fb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2014-06-12 17:14:14 +02:00
parent fa91e7b8ff
commit d97ef903a1
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/plugins/qmldesigner/documentmanager.cpp
View File

@@ -118,10 +118,33 @@ static inline void openFileForComponent(const ModelNode &node)
//rootModelNode.setAuxiliaryData("height", height); //rootModelNode.setAuxiliaryData("height", height);
} }
static inline void openInlineComponent(const ModelNode &node)
static void handleComponent(const ModelNode &modelNode)
{
if (modelNode.nodeSourceType() == ModelNode::NodeWithComponentSource)
currentDesignDocument()->changeToSubComponent(modelNode);
}
static void handleDelegate(const ModelNode &modelNode)
{
if (modelNode.metaInfo().isView()
&& modelNode.hasNodeProperty("delegate")
&& modelNode.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource)
currentDesignDocument()->changeToSubComponent(modelNode.nodeProperty("delegate").modelNode());
}
static void handleTabComponent(const ModelNode &modelNode)
{
if (modelNode.hasNodeProperty("component")
&& modelNode.nodeProperty("component").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource) {
currentDesignDocument()->changeToSubComponent(modelNode.nodeProperty("component").modelNode());
}
}
static inline void openInlineComponent(const ModelNode &modelNode)
{ {
if (!node.isValid() || !node.metaInfo().isValid()) if (!modelNode.isValid() || !modelNode.metaInfo().isValid())
return; return;
if (!currentDesignDocument()) if (!currentDesignDocument())
@@ -129,22 +152,14 @@ static inline void openInlineComponent(const ModelNode &node)
QHash<PropertyName, QVariant> propertyHash; QHash<PropertyName, QVariant> propertyHash;
if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) { getProperties(modelNode, propertyHash);
//getWidthHeight(node, width, height);
getProperties(node, propertyHash); handleComponent(modelNode);
currentDesignDocument()->changeToSubComponent(node); handleDelegate(modelNode);
} else if (node.metaInfo().isView() handleTabComponent(modelNode);
&& node.hasNodeProperty("delegate")
&& node.nodeProperty("delegate").modelNode().nodeSourceType() == ModelNode::NodeWithComponentSource) {
//getWidthHeight(node, width, height);
getProperties(node, propertyHash);
currentDesignDocument()->changeToSubComponent(node.nodeProperty("delegate").modelNode());
}
ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode(); ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode();
applyProperties(rootModelNode, propertyHash); applyProperties(rootModelNode, propertyHash);
//rootModelNode.setAuxiliaryData("width", width);
//rootModelNode.setAuxiliaryData("height", height);
} }
static inline bool isFileComponent(const ModelNode &node) static inline bool isFileComponent(const ModelNode &node)