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

QmlOutline: Show non-leaf bindings even when filter is active

Browse Source 
Otherwise we would filter out also e.g. all States elements.
This commit is contained in:
Kai Koehne
2010-08-12 12:47:25 +02:00
parent e05ba37ac3
commit 0783b1e40a
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljsoutline.cpp
View File

@@ -33,7 +33,7 @@ bool QmlJSOutlineFilterModel::filterAcceptsRow(int sourceRow,
if (m_filterBindings) { if (m_filterBindings) {
QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent); QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
QVariant itemType = sourceIndex.data(QmlOutlineModel::ItemTypeRole); QVariant itemType = sourceIndex.data(QmlOutlineModel::ItemTypeRole);
if (itemType == QmlOutlineModel::PropertyType) { if (itemType == QmlOutlineModel::NonElementBindingType) {
return false; return false;
} }
} }
@@ -69,7 +69,7 @@ QmlJSOutlineWidget::QmlJSOutlineWidget(QWidget *parent) :
layout->addWidget(m_treeView); layout->addWidget(m_treeView);
m_showBindingsAction = new QAction(this); m_showBindingsAction = new QAction(this);
m_showBindingsAction->setText(tr("Show bindings")); m_showBindingsAction->setText(tr("Show all bindings"));
m_showBindingsAction->setCheckable(true); m_showBindingsAction->setCheckable(true);
m_showBindingsAction->setChecked(true); m_showBindingsAction->setChecked(true);
connect(m_showBindingsAction, SIGNAL(toggled(bool)), this, SLOT(setShowBindings(bool))); connect(m_showBindingsAction, SIGNAL(toggled(bool)), this, SLOT(setShowBindings(bool)));

10
src/plugins/qmljseditor/qmloutlinemodel.cpp
View File

@@ -409,7 +409,7 @@ QModelIndex QmlOutlineModel::enterObjectDefinition(AST::UiObjectDefinition *objD
// it's a grouped propery like 'anchors' // it's a grouped propery like 'anchors'
prototype.setText(typeName); prototype.setText(typeName);
prototype.setIcon(m_icons->scriptBindingIcon()); prototype.setIcon(m_icons->scriptBindingIcon());
prototype.setData(PropertyType, ItemTypeRole); prototype.setData(NonElementBindingType, ItemTypeRole);
} }
prototype.setSourceLocation(getLocation(objDef)); prototype.setSourceLocation(getLocation(objDef));
prototype.setNode(objDef); prototype.setNode(objDef);
@@ -428,7 +428,7 @@ QModelIndex QmlOutlineModel::enterObjectBinding(AST::UiObjectBinding *objBinding
bindingPrototype.setText(asString(objBinding->qualifiedId)); bindingPrototype.setText(asString(objBinding->qualifiedId));
bindingPrototype.setIcon(m_icons->scriptBindingIcon()); bindingPrototype.setIcon(m_icons->scriptBindingIcon());
bindingPrototype.setData(PropertyType, ItemTypeRole); bindingPrototype.setData(ElementBindingType, ItemTypeRole);
bindingPrototype.setNode(objBinding); bindingPrototype.setNode(objBinding);
bindingPrototype.setSourceLocation(getLocation(objBinding)); bindingPrototype.setSourceLocation(getLocation(objBinding));
bindingPrototype.setIdNode(objBinding->qualifiedId); bindingPrototype.setIdNode(objBinding->qualifiedId);
@@ -466,7 +466,7 @@ QModelIndex QmlOutlineModel::enterArrayBinding(AST::UiArrayBinding *arrayBinding
bindingPrototype.setText(asString(arrayBinding->qualifiedId)); bindingPrototype.setText(asString(arrayBinding->qualifiedId));
bindingPrototype.setIcon(m_icons->scriptBindingIcon()); bindingPrototype.setIcon(m_icons->scriptBindingIcon());
bindingPrototype.setData(PropertyType, ItemTypeRole); bindingPrototype.setData(ElementBindingType, ItemTypeRole);
bindingPrototype.setNode(arrayBinding); bindingPrototype.setNode(arrayBinding);
bindingPrototype.setSourceLocation(getLocation(arrayBinding)); bindingPrototype.setSourceLocation(getLocation(arrayBinding));
bindingPrototype.setIdNode(arrayBinding->qualifiedId); bindingPrototype.setIdNode(arrayBinding->qualifiedId);
@@ -487,7 +487,7 @@ QModelIndex QmlOutlineModel::enterScriptBinding(AST::UiScriptBinding *scriptBind
prototype.setText(asString(scriptBinding->qualifiedId)); prototype.setText(asString(scriptBinding->qualifiedId));
prototype.setIcon(m_icons->scriptBindingIcon()); prototype.setIcon(m_icons->scriptBindingIcon());
prototype.setData(PropertyType, ItemTypeRole); prototype.setData(NonElementBindingType, ItemTypeRole);
prototype.setSourceLocation(getLocation(scriptBinding)); prototype.setSourceLocation(getLocation(scriptBinding));
prototype.setNode(scriptBinding); prototype.setNode(scriptBinding);
prototype.setIdNode(scriptBinding->qualifiedId); prototype.setIdNode(scriptBinding->qualifiedId);
@@ -507,7 +507,7 @@ QModelIndex QmlOutlineModel::enterPublicMember(AST::UiPublicMember *publicMember
if (publicMember->name) if (publicMember->name)
prototype.setText(publicMember->name->asString()); prototype.setText(publicMember->name->asString());
prototype.setIcon(m_icons->publicMemberIcon()); prototype.setIcon(m_icons->publicMemberIcon());
prototype.setData(PropertyType, ItemTypeRole); prototype.setData(NonElementBindingType, ItemTypeRole);
prototype.setSourceLocation(getLocation(publicMember)); prototype.setSourceLocation(getLocation(publicMember));
prototype.setNode(publicMember); prototype.setNode(publicMember);

3
src/plugins/qmljseditor/qmloutlinemodel.h
View File

@@ -67,7 +67,8 @@ public:
enum ItemTypes { enum ItemTypes {
ElementType, ElementType,
PropertyType ElementBindingType, // might contain elements as childs
NonElementBindingType // can be filtered out
}; };
QmlOutlineModel(QObject *parent = 0); QmlOutlineModel(QObject *parent = 0);