From 878abe61e773f8a5fb840e35ebe2ccd8771e2cf6 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Wed, 18 Jun 2014 18:03:52 +0200 Subject: [PATCH] QmlDesigner: Add ItemLibraryEntry to ItemLibraryItem Change-Id: I896e54fada0368fb548b39b9aff9cd19953c8ab3 Reviewed-by: Tim Jenssen --- .../components/itemlibrary/itemlibraryitem.cpp | 10 ++++++++++ .../components/itemlibrary/itemlibraryitem.h | 7 +++++++ .../components/itemlibrary/itemlibrarymodel.cpp | 1 + 3 files changed, 18 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp index 85bb0f98ff5..65500a0ea86 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.cpp @@ -90,4 +90,14 @@ bool ItemLibraryItem::isVisible() const { return m_isVisible; } + +void ItemLibraryItem::setItemLibraryEntry(const ItemLibraryEntry &itemLibraryEntry) +{ + m_itemLibraryEntry = itemLibraryEntry; +} + +ItemLibraryEntry ItemLibraryItem::itemLibraryEntry() const +{ + return m_itemLibraryEntry; +} } // namespace QmlDesigner diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h index b8a4783b106..a25afe22ccf 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryitem.h @@ -35,6 +35,8 @@ #include #include +#include "itemlibraryinfo.h" + namespace QmlDesigner { class ItemLibraryItem: public QObject { @@ -42,6 +44,7 @@ class ItemLibraryItem: public QObject { Q_OBJECT Q_PROPERTY(int itemLibId READ itemLibId FINAL) + Q_PROPERTY(ItemLibraryEntry itemLibraryEntry READ itemLibraryEntry FINAL) Q_PROPERTY(QString itemName READ itemName FINAL) Q_PROPERTY(QString itemLibraryIconPath READ itemLibraryIconPath FINAL) Q_PROPERTY(QVariant sortingRole READ sortingRole FINAL) @@ -61,7 +64,11 @@ public: bool setVisible(bool isVisible); bool isVisible() const; + void setItemLibraryEntry(const ItemLibraryEntry &itemLibraryEntry); + ItemLibraryEntry itemLibraryEntry() const; + private: + ItemLibraryEntry m_itemLibraryEntry; int m_libId; bool m_isVisible; QString m_name; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 938a0beee00..13b7899ac4c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -194,6 +194,7 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) itemModel->setItemIconPath(entry.libraryEntryIconPath()); itemModel->setItemIconSize(m_itemIconSize); + itemModel->setItemLibraryEntry(entry); sectionModel->addSectionEntry(itemModel); m_sections.insert(itemId, sectionId); }