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

QmlDesigner: Add Loader source property handling

Browse Source 
You can know go into a component.

Change-Id: I5120e70164a112b277981fda7e603c3d327f2561
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
This commit is contained in:
Marco Bubke
2014-06-16 15:51:31 +02:00
parent fd7c110c04
commit a4a17121fb
1 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,6 +35,7 @@
#include <nodemetainfo.h> #include <nodemetainfo.h>
#include <nodeproperty.h> #include <nodeproperty.h>
#include <bindingproperty.h> #include <bindingproperty.h>
#include <variantproperty.h>
namespace QmlDesigner { namespace QmlDesigner {
@@ -116,6 +117,22 @@ static void openFileComponentForDelegate(const ModelNode &modelNode)
openFileComponent(modelNode.nodeProperty("delegate").modelNode()); openFileComponent(modelNode.nodeProperty("delegate").modelNode());
} }
static void openSourcePropertyOfLoader(const ModelNode &modelNode)
{
QmlDesignerPlugin::instance()->viewManager().nextFileIsCalledInternally();
QHash<PropertyName, QVariant> propertyHash;
QString componentFileName = modelNode.variantProperty("source").value().toString();
QString componentFilePath = modelNode.model()->fileUrl().resolved(QUrl::fromLocalFile(componentFileName)).toLocalFile();
getProperties(modelNode, propertyHash);
Core::EditorManager::openEditor(componentFilePath, Core::Id(), Core::EditorManager::DoNotMakeVisible);
ModelNode rootModelNode = currentDesignDocument()->rewriterView()->rootModelNode();
applyProperties(rootModelNode, propertyHash);
}
static void handleComponent(const ModelNode &modelNode) static void handleComponent(const ModelNode &modelNode)
{ {
@@ -182,6 +199,17 @@ static bool hasDelegateWithFileComponent(const ModelNode &node)
return false; return false;
} }
static bool hasSourceWithFileComponent(const ModelNode &modelNode)
{
if (modelNode.isValid()
&& modelNode.metaInfo().isValid()
&& modelNode.metaInfo().isSubclassOf("QtQuick.Loader", -1, -1)
&& modelNode.hasVariantProperty("source"))
return true;
return false;
}
DocumentManager::DocumentManager() DocumentManager::DocumentManager()
: QObject() : QObject()
{ {
@@ -232,6 +260,8 @@ void DocumentManager::goIntoComponent(const ModelNode &modelNode)
openFileComponent(modelNode); openFileComponent(modelNode);
else if (hasDelegateWithFileComponent(modelNode)) else if (hasDelegateWithFileComponent(modelNode))
openFileComponentForDelegate(modelNode); openFileComponentForDelegate(modelNode);
else if (hasSourceWithFileComponent(modelNode))
openSourcePropertyOfLoader(modelNode);
else else
openInlineComponent(modelNode); openInlineComponent(modelNode);
} }