OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1830 AppFwk : Add support for icons

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-07 14:39:15 +02:00
parent 5994ef1393
commit de7c4617d8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/cafTests/cafTestApplication/MainWindow.cpp
View File

@@ -122,7 +122,7 @@ public:
options.push_back(caf::PdmOptionItemInfo(text, text)); options.push_back(caf::PdmOptionItemInfo(text, text));
text = "Second"; 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"; text = "Second_a";
@@ -133,7 +133,7 @@ public:
{ {
text = "Second_b"; 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); itemInfo.setLevel(1);
options.push_back(itemInfo); options.push_back(itemInfo);
} }

4
Fwk/AppFwk/cafUserInterface/cafPdmUiTreeSelectionQModel.cpp
View File

@@ -187,6 +187,10 @@ QVariant caf::PdmUiTreeSelectionQModel::data(const QModelIndex &index, int role
{ {
return m_options[opIndex].optionUiText(); return m_options[opIndex].optionUiText();
} }
else if (role == Qt::DecorationRole)
{
return m_options[opIndex].icon();
}
else if (role == Qt::CheckStateRole && !m_options[opIndex].isHeading()) else if (role == Qt::CheckStateRole && !m_options[opIndex].isHeading())
{ {
CAF_ASSERT(m_uiFieldHandle); CAF_ASSERT(m_uiFieldHandle);