diff --git a/ApplicationCode/Commands/RicNew2dContourViewFeature.cpp b/ApplicationCode/Commands/RicNew2dContourViewFeature.cpp index 3edf981e26..bb52ee7a2f 100644 --- a/ApplicationCode/Commands/RicNew2dContourViewFeature.cpp +++ b/ApplicationCode/Commands/RicNew2dContourViewFeature.cpp @@ -95,5 +95,5 @@ void RicNew2dContourViewFeature::setupActionLook(QAction* actionToSetup) { actionToSetup->setText("New Contour Map"); } - actionToSetup->setIcon(QIcon(":/3DView16x16.png")); + actionToSetup->setIcon(QIcon(":/2DMap16x16.png")); } diff --git a/ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp index 5fc205dbe9..5613dfa1c3 100644 --- a/ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp +++ b/ApplicationCode/Commands/WellPathCommands/RicNewWellPathAttributeFeature.cpp @@ -106,17 +106,17 @@ void RicNewWellPathAttributeFeature::setupActionLook(QAction* actionToSetup) if (attributes.size() == 1u) { actionToSetup->setText(QString("Insert New Attribute before %1").arg(attributes[0]->componentTypeLabel())); - actionToSetup->setIcon(QIcon(":/Well.png")); + actionToSetup->setIcon(QIcon(":/CasingDesign16x16.png")); } else if (caf::SelectionManager::instance()->selectedItemOfType()) { actionToSetup->setText("Append New Attribute"); - actionToSetup->setIcon(QIcon(":/Well.png")); + actionToSetup->setIcon(QIcon(":/CasingDesign16x16.png")); } else if(caf::SelectionManager::instance()->selectedItemOfType()) { actionToSetup->setText("Create Casing Design"); - actionToSetup->setIcon(QIcon(":/Well.png")); + actionToSetup->setIcon(QIcon(":/CasingDesign16x16.png")); } } diff --git a/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp b/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp index 31c459e1f5..86dab2d4e2 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dEclipseView.cpp @@ -46,7 +46,7 @@ const cvf::Mat4d defaultViewMatrix(1, 0, 0, 0, Rim2dEclipseView::Rim2dEclipseView() { - CAF_PDM_InitObject("2d Contour Map", ":/3DView16x16.png", "", ""); + CAF_PDM_InitObject("2d Contour Map", ":/2DMap16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_2dGridProjection, "Grid2dProjection", "2d Grid Projection", "", "", ""); m_2dGridProjection = new Rim2dGridProjection(); diff --git a/ApplicationCode/ProjectDataModel/Rim2dEclipseViewCollection.cpp b/ApplicationCode/ProjectDataModel/Rim2dEclipseViewCollection.cpp index e8e8361867..987df8f6f5 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dEclipseViewCollection.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dEclipseViewCollection.cpp @@ -10,7 +10,7 @@ CAF_PDM_SOURCE_INIT(Rim2dEclipseViewCollection, "Eclipse2dViewCollection"); //-------------------------------------------------------------------------------------------------- Rim2dEclipseViewCollection::Rim2dEclipseViewCollection() { - CAF_PDM_InitObject("2D Contour Maps", ":/CrossSection16x16.png", "", ""); + CAF_PDM_InitObject("2D Contour Maps", ":/2DMaps16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&m_2dEclipseViews, "EclipseViews", "Contour Maps", ":/CrossSection16x16.png", "", ""); m_2dEclipseViews.uiCapability()->setUiTreeHidden(true); diff --git a/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.cpp b/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.cpp index 0f05e936ce..7d55dddcf3 100644 --- a/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellPathAttributeCollection.cpp @@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathAttributeCollection, "WellPathAttributes"); //-------------------------------------------------------------------------------------------------- RimWellPathAttributeCollection::RimWellPathAttributeCollection() { - CAF_PDM_InitObject("Casing Design", ":/CompletionsSymbol16x16", "", ""); + CAF_PDM_InitObject("Casing Design", ":/CasingDesign16x16", "", ""); CAF_PDM_InitFieldNoDefault(&m_attributes, "Attributes", "Casing Design Attributes", "", "", ""); m_attributes.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName()); diff --git a/ApplicationCode/Resources/2DMap16x16.png b/ApplicationCode/Resources/2DMap16x16.png new file mode 100644 index 0000000000..63fa2ca553 Binary files /dev/null and b/ApplicationCode/Resources/2DMap16x16.png differ diff --git a/ApplicationCode/Resources/2DMaps16x16.png b/ApplicationCode/Resources/2DMaps16x16.png new file mode 100644 index 0000000000..6c842a6a9b Binary files /dev/null and b/ApplicationCode/Resources/2DMaps16x16.png differ diff --git a/ApplicationCode/Resources/AICVValve16x16.png b/ApplicationCode/Resources/AICVValve16x16.png new file mode 100644 index 0000000000..ab767fc34b Binary files /dev/null and b/ApplicationCode/Resources/AICVValve16x16.png differ diff --git a/ApplicationCode/Resources/CasingDesign16x16.png b/ApplicationCode/Resources/CasingDesign16x16.png new file mode 100644 index 0000000000..1cac96aa19 Binary files /dev/null and b/ApplicationCode/Resources/CasingDesign16x16.png differ diff --git a/ApplicationCode/Resources/ICDValve16x16.png b/ApplicationCode/Resources/ICDValve16x16.png new file mode 100644 index 0000000000..a30294cae1 Binary files /dev/null and b/ApplicationCode/Resources/ICDValve16x16.png differ diff --git a/ApplicationCode/Resources/ICVValve16x16.png b/ApplicationCode/Resources/ICVValve16x16.png new file mode 100644 index 0000000000..53893d84e8 Binary files /dev/null and b/ApplicationCode/Resources/ICVValve16x16.png differ diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index f760dd4c89..40009dd8b9 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -126,6 +126,12 @@ minus-sign-red.png plus-sign-green.png arrow-right-green.png + 2DMap16x16.png + 2DMaps16x16.png + AICVValve16x16.png + ICDValve16x16.png + ICVValve16x16.png + CasingDesign16x16.png fs_CellFace.glsl