From de7c4617d8c82c57ed9a3da339ef141af40ea865 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 7 Sep 2017 14:39:15 +0200 Subject: [PATCH] #1830 AppFwk : Add support for icons --- Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp | 4 ++-- Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp index 79e840913c..621fa70305 100644 --- a/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp +++ b/Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp @@ -122,7 +122,7 @@ public: options.push_back(caf::PdmOptionItemInfo(text, text)); text = "Second"; - options.push_back(caf::PdmOptionItemInfo::createHeader(text)); + options.push_back(caf::PdmOptionItemInfo::createHeader(text, false, QIcon(QString(":/images/win/textbold.png")))); { text = "Second_a"; @@ -133,7 +133,7 @@ public: { text = "Second_b"; - caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text); + caf::PdmOptionItemInfo itemInfo = caf::PdmOptionItemInfo(text, text, false, QIcon(QString(":/images/win/filenew.png"))); itemInfo.setLevel(1); options.push_back(itemInfo); } diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp index 2d89f88825..7cd0a8efed 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp @@ -187,6 +187,10 @@ QVariant caf::PdmUiTreeSelectionQModel::data(const QModelIndex &index, int role { return m_options[opIndex].optionUiText(); } + else if (role == Qt::DecorationRole) + { + return m_options[opIndex].icon(); + } else if (role == Qt::CheckStateRole && !m_options[opIndex].isHeading()) { CAF_ASSERT(m_uiFieldHandle);