From ef07e39c021d49ca936028dcd8aaa62d95e68c3e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 16 Oct 2017 14:51:01 +0200 Subject: [PATCH] QmlDesigner: Use filter on display and type names The filter was applied just to the display names which was confusing. We use the display and typ name with this patch. Task-number: QTCREATORBUG-19054 Change-Id: I5671d8d615bbb89d3a46a76fd45f88d0f76c8557 Reviewed-by: Tim Jenssen Reviewed-by: Mitch Curtis --- .../qmldesigner/components/itemlibrary/itemlibraryitem.cpp | 5 +++++ .../qmldesigner/components/itemlibrary/itemlibraryitem.h | 1 + .../components/itemlibrary/itemlibrarysection.cpp | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp index be747266f1c..827c07e8f4a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp @@ -42,6 +42,11 @@ QString ItemLibraryItem::itemName() const return m_itemLibraryEntry.name(); } +QString ItemLibraryItem::typeName() const +{ + return QString::fromUtf8(m_itemLibraryEntry.typeName()); +} + QString ItemLibraryItem::itemLibraryIconPath() const { //Prepend image provider prefix diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h index c5ac7d8d879..745418dfeab 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h @@ -48,6 +48,7 @@ public: ~ItemLibraryItem(); QString itemName() const; + QString typeName() const; QString itemLibraryIconPath() const; bool setVisible(bool isVisible); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp index 792d8539bd4..73d89b7b576 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysection.cpp @@ -75,7 +75,8 @@ bool ItemLibrarySection::updateSectionVisibility(const QString &searchText, bool *changed = false; foreach(ItemLibraryItem *itemLibraryItem, m_sectionEntries.items()) { - bool itemVisible = itemLibraryItem->itemName().toLower().contains(searchText); + bool itemVisible = itemLibraryItem->itemName().toLower().contains(searchText) + || itemLibraryItem->typeName().toLower().contains(searchText); bool itemChanged = itemLibraryItem->setVisible(itemVisible);