diff options
author | Kaj Grönholm <kaj.gronholm@qt.io> | 2018-02-26 16:34:42 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-03-02 12:53:32 +0000 |
commit | 4fac25bd7db955e9bfef9b8de8278fc84afc5327 (patch) | |
tree | d3023703503df0bc32bb2c70cf6cbfa3b2f2a788 /src/Authoring/Studio/Palettes/BasicObjects | |
parent | b22771e6953c7f0d25decaae4dabeff9a520ecd9 (diff) |
Use correct icons in mesh selector1.1
Allows setting custom icon for choosers.
Task-number: QT3DS-195
Change-Id: Iec1d7fd3cf6ebcfaabba222609ec90d86069c9ab
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Authoring/Studio/Palettes/BasicObjects')
-rw-r--r-- | src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp | 13 | ||||
-rw-r--r-- | src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp index 0888063d..5a4fff9d 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.cpp @@ -42,7 +42,12 @@ BasicObjectsModel::BasicObjectsModel(QObject *parent) : QAbstractListModel(paren void BasicObjectsModel::initialize() { - m_ObjectItems = { + m_ObjectItems = InitializeObjectModel(); +} + +const QVector<BasicObjectItem> BasicObjectsModel::InitializeObjectModel() +{ + return { {tr("Rectangle"), "Asset-Rectangle-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_RECT}, {tr("Sphere"), "Asset-Sphere-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_SPHERE}, {tr("Cube"), "Asset-Cube-Normal.png"_L1, OBJTYPE_MODEL, PRIMITIVETYPE_BOX}, @@ -57,6 +62,12 @@ void BasicObjectsModel::initialize() }; } +// Returns meshes part of basic objects +const QVector<BasicObjectItem> BasicObjectsModel::BasicMeshesModel() +{ + return InitializeObjectModel().mid(0, 5); +} + QVariant BasicObjectsModel::data(const QModelIndex &index, int role) const { if (!hasIndex(index.row(), index.column(),index.parent())) diff --git a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h index 1f0edbf9..2e2faa83 100644 --- a/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h +++ b/src/Authoring/Studio/Palettes/BasicObjects/BasicObjectsModel.h @@ -88,8 +88,11 @@ public: QStringList mimeTypes() const override; QMimeData *mimeData(const QModelIndexList &indexes) const override; + static const QVector<BasicObjectItem> BasicMeshesModel(); + private: void initialize(); + static const QVector<BasicObjectItem> InitializeObjectModel(); QVector<BasicObjectItem> m_ObjectItems; |