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

Rename caf::PdmUiItem::setUiIcon(QString) to setUiIconFromResourceString

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-05-06 11:08:59 +02:00
parent 274dee70fa
commit 30769d7f2a
14 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@ -62,9 +62,9 @@ RimAnnotationCollection::RimAnnotationCollection()
m_userDefinedPolylineAnnotations->uiCapability()->setUiName(RimAnnotationGroupCollection::USED_DEFINED_POLYLINE_ANNOTATION_UI_NAME);
m_polylineFromFileAnnotations->uiCapability()->setUiName(RimAnnotationGroupCollection::POLYLINE_FROM_FILE_ANNOTATION_UI_NAME);
m_reachCircleAnnotations->uiCapability()->setUiIcon(":/ReachCircle16x16.png");
m_userDefinedPolylineAnnotations->uiCapability()->setUiIcon(":/PolylinesFromFile16x16.png");
m_polylineFromFileAnnotations->uiCapability()->setUiIcon(":/PolylinesFromFile16x16.png");
m_reachCircleAnnotations->uiCapability()->setUiIconFromResourceString(":/ReachCircle16x16.png");
m_userDefinedPolylineAnnotations->uiCapability()->setUiIconFromResourceString(":/PolylinesFromFile16x16.png");
m_polylineFromFileAnnotations->uiCapability()->setUiIconFromResourceString(":/PolylinesFromFile16x16.png");
}

2
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationCollectionBase.cpp
View File

@ -51,7 +51,7 @@ RimAnnotationCollectionBase::RimAnnotationCollectionBase()
m_textAnnotations.uiCapability()->setUiHidden(true);
m_textAnnotations = new RimAnnotationGroupCollection();
m_textAnnotations->uiCapability()->setUiName(RimAnnotationGroupCollection::TEXT_ANNOTATION_UI_NAME);
m_textAnnotations->uiCapability()->setUiIcon(":/TextAnnotation16x16.png");
m_textAnnotations->uiCapability()->setUiIconFromResourceString(":/TextAnnotation16x16.png");
}

8
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.cpp
View File

@ -105,10 +105,10 @@ RimAnnotationInViewCollection::RimAnnotationInViewCollection()
m_globalUserDefinedPolylineAnnotations->uiCapability()->setUiName("Global User Defined Polylines Annotations");
m_globalPolylineFromFileAnnotations->uiCapability()->setUiName("Global Polylines From File Annotations");
m_globalTextAnnotations->uiCapability()->setUiIcon(":/TextAnnotation16x16.png");
m_globalReachCircleAnnotations->uiCapability()->setUiIcon(":/ReachCircle16x16.png");
m_globalUserDefinedPolylineAnnotations->uiCapability()->setUiIcon(":/PolylinesFromFile16x16.png");
m_globalPolylineFromFileAnnotations->uiCapability()->setUiIcon(":/PolylinesFromFile16x16.png");
m_globalTextAnnotations->uiCapability()->setUiIconFromResourceString(":/TextAnnotation16x16.png");
m_globalReachCircleAnnotations->uiCapability()->setUiIconFromResourceString(":/ReachCircle16x16.png");
m_globalUserDefinedPolylineAnnotations->uiCapability()->setUiIconFromResourceString(":/PolylinesFromFile16x16.png");
m_globalPolylineFromFileAnnotations->uiCapability()->setUiIconFromResourceString(":/PolylinesFromFile16x16.png");
}
//--------------------------------------------------------------------------------------------------

6
ApplicationCode/ProjectDataModel/Completions/RimValveTemplate.cpp
View File

@ -256,15 +256,15 @@ void RimValveTemplate::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrderi
this->setName(fullLabel());
if (m_type() == RiaDefines::ICV)
{
this->setUiIcon(":/ICVValve16x16.png");
this->setUiIconFromResourceString(":/ICVValve16x16.png");
}
else if (m_type() == RiaDefines::ICD)
{
this->setUiIcon(":/ICDValve16x16.png");
this->setUiIconFromResourceString(":/ICDValve16x16.png");
}
else if (m_type() == RiaDefines::AICD)
{
this->setUiIcon(":/AICDValve16x16.png");
this->setUiIconFromResourceString(":/AICDValve16x16.png");
}
}

6
ApplicationCode/ProjectDataModel/Completions/RimWellPathValve.cpp
View File

@ -184,13 +184,13 @@ void RimWellPathValve::applyValveLabelAndIcon()
{
if (componentType() == RiaDefines::ICV)
{
this->setUiIcon(":/ICVValve16x16.png");
this->setUiIconFromResourceString(":/ICVValve16x16.png");
QString fullName = QString("%1: %2").arg(componentLabel()).arg(m_measuredDepth());
this->setName(fullName);
}
else if (componentType() == RiaDefines::ICD)
{
this->setUiIcon(":/ICDValve16x16.png");
this->setUiIconFromResourceString(":/ICDValve16x16.png");
QString fullName = QString("%1 %2: %3 - %4")
.arg(m_multipleValveLocations->valveLocations().size())
.arg(componentLabel())
@ -200,7 +200,7 @@ void RimWellPathValve::applyValveLabelAndIcon()
}
else if (componentType() == RiaDefines::AICD)
{
this->setUiIcon(":/AICDValve16x16.png");
this->setUiIconFromResourceString(":/AICDValve16x16.png");
QString fullName = QString("%1 %2: %3 - %4")
.arg(m_multipleValveLocations->valveLocations().size())
.arg(componentLabel())

2
ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
View File

@ -98,7 +98,7 @@ RimWellAllocationPlot::RimWellAllocationPlot()
m_accumulatedWellFlowPlot->setDepthUnit(RiaDefines::UNIT_NONE);
m_accumulatedWellFlowPlot->setDepthType(RimWellLogPlot::CONNECTION_NUMBER);
m_accumulatedWellFlowPlot->setTrackLegendsVisible(false);
m_accumulatedWellFlowPlot->uiCapability()->setUiIcon(":/WellFlowPlot16x16.png");
m_accumulatedWellFlowPlot->uiCapability()->setUiIconFromResourceString(":/WellFlowPlot16x16.png");
CAF_PDM_InitFieldNoDefault(&m_totalWellAllocationPlot, "TotalWellFlowPlot", "Total Well Flow", "", "", "");
m_totalWellAllocationPlot.uiCapability()->setUiHidden(true);

10
ApplicationCode/ProjectDataModel/RimGridCollection.cpp
View File

@ -260,18 +260,18 @@ RimGridCollection::RimGridCollection()
m_mainGrid = new RimGridInfo();
m_mainGrid->setUiName("Main Grid");
m_mainGrid->uiCapability()->setUiTreeHidden(true);
m_mainGrid->setUiIcon(":/MainGrid16x16.png");
m_mainGrid->setUiIconFromResourceString(":/MainGrid16x16.png");
CAF_PDM_InitFieldNoDefault(&m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", "");
m_persistentLgrs = new RimGridInfoCollection();
m_persistentLgrs->setUiName(persistentGridUiName());
m_persistentLgrs->setUiIcon(":/LGR16x16.png");
m_persistentLgrs->setUiIconFromResourceString(":/LGR16x16.png");
CAF_PDM_InitFieldNoDefault(&m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", "");
m_temporaryLgrs.xmlCapability()->disableIO();
m_temporaryLgrs = new RimGridInfoCollection();
m_temporaryLgrs->setUiName(temporaryGridUiName());
m_temporaryLgrs->setUiIcon(":/TempLGR16x16.png");
m_temporaryLgrs->setUiIconFromResourceString(":/TempLGR16x16.png");
}
//--------------------------------------------------------------------------------------------------
@ -390,7 +390,7 @@ void RimGridCollection::syncFromMainEclipseGrid()
auto gridInfo = new RimGridInfo();
gridInfo->setName(gridName);
gridInfo->setEclipseGridIndex((int)gridIndex);
gridInfo->setUiIcon(":/TempLGR16x16.png");
gridInfo->setUiIconFromResourceString(":/TempLGR16x16.png");
m_temporaryLgrs->addGridInfo(gridInfo);
}
}
@ -405,7 +405,7 @@ void RimGridCollection::syncFromMainEclipseGrid()
auto gridInfo = new RimGridInfo();
gridInfo->setName(gridName);
gridInfo->setEclipseGridIndex((int)gridIndex);
gridInfo->setUiIcon(":/LGR16x16.png");
gridInfo->setUiIconFromResourceString(":/LGR16x16.png");
m_persistentLgrs->addGridInfo(gridInfo);
}
}

4
ApplicationCode/ProjectDataModel/RimIdenticalGridCaseGroup.cpp
View File

@ -64,11 +64,11 @@ RimIdenticalGridCaseGroup::RimIdenticalGridCaseGroup()
caseCollection = new RimCaseCollection;
caseCollection->uiCapability()->setUiName("Source Cases");
caseCollection->uiCapability()->setUiIcon(":/Cases16x16.png");
caseCollection->uiCapability()->setUiIconFromResourceString(":/Cases16x16.png");
statisticsCaseCollection = new RimCaseCollection;
statisticsCaseCollection->uiCapability()->setUiName("Derived Statistics");
statisticsCaseCollection->uiCapability()->setUiIcon(":/Histograms16x16.png");
statisticsCaseCollection->uiCapability()->setUiIconFromResourceString(":/Histograms16x16.png");
m_mainGrid = nullptr;

8
ApplicationCode/ProjectDataModel/RimIntersectionBox.cpp
View File

@ -543,21 +543,21 @@ void RimIntersectionBox::updateVisibility()
if (m_singlePlaneState == PLANE_STATE_X)
{
m_maxXCoord.uiCapability()->setUiReadOnly(true);
this->setUiIcon(QString(":/IntersectionXPlane16x16.png"));
this->setUiIconFromResourceString(QString(":/IntersectionXPlane16x16.png"));
}
else if (m_singlePlaneState == PLANE_STATE_Y)
{
m_maxYCoord.uiCapability()->setUiReadOnly(true);
this->setUiIcon(QString(":/IntersectionYPlane16x16.png"));
this->setUiIconFromResourceString(QString(":/IntersectionYPlane16x16.png"));
}
else if (m_singlePlaneState == PLANE_STATE_Z)
{
m_maxDepth.uiCapability()->setUiReadOnly(true);
this->setUiIcon(QString(":/IntersectionZPlane16x16.png"));
this->setUiIconFromResourceString(QString(":/IntersectionZPlane16x16.png"));
}
else
{
this->setUiIcon(QString(":/IntersectionBox16x16.png"));
this->setUiIconFromResourceString(QString(":/IntersectionBox16x16.png"));
}
}

4
ApplicationCode/ProjectDataModel/RimPlotAxisProperties.cpp
View File

@ -218,8 +218,8 @@ void RimPlotAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axis ax
m_name = name;
m_axis = axis;
if (axis == QwtPlot::yRight) this->setUiIcon(":/RightAxis16x16.png");
if (axis == QwtPlot::xBottom) this->setUiIcon(":/BottomAxis16x16.png");
if (axis == QwtPlot::yRight) this->setUiIconFromResourceString(":/RightAxis16x16.png");
if (axis == QwtPlot::xBottom) this->setUiIconFromResourceString(":/BottomAxis16x16.png");
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -174,7 +174,7 @@ RimProject::RimProject(void)
scriptCollection = new RimScriptCollection();
scriptCollection->directory.uiCapability()->setUiHidden(true);
scriptCollection->uiCapability()->setUiName("Scripts");
scriptCollection->uiCapability()->setUiIcon(":/octave.png");
scriptCollection->uiCapability()->setUiIconFromResourceString(":/octave.png");
mainPlotCollection = new RimMainPlotCollection();

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@ -576,8 +576,8 @@ QString RimSummaryCaseCollection::nameAndItemCount() const
//--------------------------------------------------------------------------------------------------
void RimSummaryCaseCollection::updateIcon()
{
if (m_isEnsemble) setUiIcon(":/SummaryEnsemble16x16.png");
else setUiIcon(":/SummaryGroup16x16.png");
if (m_isEnsemble) setUiIconFromResourceString(":/SummaryEnsemble16x16.png");
else setUiIconFromResourceString(":/SummaryGroup16x16.png");
}
//--------------------------------------------------------------------------------------------------

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.cpp
View File

@ -279,7 +279,7 @@ void PdmUiItem::setUiIcon(const QIconProvider& uiIconProvider, const QString& ui
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiItem::setUiIcon(const QString& uiIconResourceName, const QString& uiConfigName /*= ""*/)
void PdmUiItem::setUiIconFromResourceString(const QString& uiIconResourceName, const QString& uiConfigName /*= ""*/)
{
setUiIcon(caf::QIconProvider(uiIconResourceName), uiConfigName);
}

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiItem.h
View File

@ -227,7 +227,7 @@ public:
const QIcon uiIcon(const QString& uiConfigName = "") const;
const QIconProvider uiIconProvider(const QString& uiConfigName = "") const;
void setUiIcon(const QIconProvider& uiIcon, const QString& uiConfigName = "");
void setUiIcon(const QString& uiIconResourceName, const QString& uiConfigName = "");
void setUiIconFromResourceString(const QString& uiIconResourceName, const QString& uiConfigName = "");
const QColor uiContentTextColor(const QString& uiConfigName = "") const;
void setUiContentTextColor(const QColor& uiIcon, const QString& uiConfigName = "");