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

QmlOutline: Treat grouped property items as properties

Browse Source 
E.g. "anchors {}" is represented in the AST as a UiObjectDefinition.
Treat it nevertheless like a property in the outline, such that it
isn't shown in the outline if you deactivate showing bindings.
This commit is contained in:
Kai Koehne
2010-07-22 10:12:04 +02:00
parent 39b1bb8bd4
commit 40e36e0cd0
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,8 +44,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);
Q_ASSERT(itemType.isValid()); if (itemType == QmlOutlineModel::PropertyType) {
if (itemType.isValid() && itemType == QmlOutlineModel::PropertyType) {
return false; return false;
} }
} }

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

@@ -347,20 +347,28 @@ QModelIndex QmlOutlineModel::enterObjectDefinition(AST::UiObjectDefinition *objD
QmlOutlineItem prototype(this); QmlOutlineItem prototype(this);
const QString typeName = asString(objDef->qualifiedTypeNameId); const QString typeName = asString(objDef->qualifiedTypeNameId);
const QString id = getId(objDef);
if (!id.isEmpty()) { if (typeName.at(0).isUpper()) {
prototype.setText(id); const QString id = getId(objDef);
if (!id.isEmpty()) {
prototype.setText(id);
} else {
prototype.setText(typeName);
}
if (!m_typeToIcon.contains(typeName)) {
m_typeToIcon.insert(typeName, getIcon(objDef));
}
prototype.setIcon(m_typeToIcon.value(typeName));
prototype.setData(ElementType, ItemTypeRole);
prototype.setIdNode(objDef->qualifiedTypeNameId);
} else { } else {
// it's a grouped propery like 'anchors'
prototype.setText(typeName); prototype.setText(typeName);
prototype.setIcon(m_icons->scriptBindingIcon());
prototype.setData(PropertyType, ItemTypeRole);
} }
if (!m_typeToIcon.contains(typeName)) {
m_typeToIcon.insert(typeName, getIcon(objDef));
}
prototype.setIcon(m_typeToIcon.value(typeName));
prototype.setData(ElementType, ItemTypeRole);
prototype.setSourceLocation(getLocation(objDef)); prototype.setSourceLocation(getLocation(objDef));
prototype.setNode(objDef); prototype.setNode(objDef);
prototype.setIdNode(objDef->qualifiedTypeNameId);
return enterNode(prototype); return enterNode(prototype);
} }