#3577, #3537, #3487 New icons created, and some put into place.

This commit is contained in:
Jacob Støren
2018-10-30 17:26:30 +01:00
parent 69d079f942
commit 68d34d7000
12 changed files with 13 additions and 7 deletions

View File

@@ -95,5 +95,5 @@ void RicNew2dContourViewFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setText("New Contour Map"); actionToSetup->setText("New Contour Map");
} }
actionToSetup->setIcon(QIcon(":/3DView16x16.png")); actionToSetup->setIcon(QIcon(":/2DMap16x16.png"));
} }

View File

@@ -106,17 +106,17 @@ void RicNewWellPathAttributeFeature::setupActionLook(QAction* actionToSetup)
if (attributes.size() == 1u) if (attributes.size() == 1u)
{ {
actionToSetup->setText(QString("Insert New Attribute before %1").arg(attributes[0]->componentTypeLabel())); 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<RimWellPathAttributeCollection>()) else if (caf::SelectionManager::instance()->selectedItemOfType<RimWellPathAttributeCollection>())
{ {
actionToSetup->setText("Append New Attribute"); actionToSetup->setText("Append New Attribute");
actionToSetup->setIcon(QIcon(":/Well.png")); actionToSetup->setIcon(QIcon(":/CasingDesign16x16.png"));
} }
else if(caf::SelectionManager::instance()->selectedItemOfType<RimWellPath>()) else if(caf::SelectionManager::instance()->selectedItemOfType<RimWellPath>())
{ {
actionToSetup->setText("Create Casing Design"); actionToSetup->setText("Create Casing Design");
actionToSetup->setIcon(QIcon(":/Well.png")); actionToSetup->setIcon(QIcon(":/CasingDesign16x16.png"));
} }
} }

View File

@@ -46,7 +46,7 @@ const cvf::Mat4d defaultViewMatrix(1, 0, 0, 0,
Rim2dEclipseView::Rim2dEclipseView() 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", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_2dGridProjection, "Grid2dProjection", "2d Grid Projection", "", "", "");
m_2dGridProjection = new Rim2dGridProjection(); m_2dGridProjection = new Rim2dGridProjection();

View File

@@ -10,7 +10,7 @@ CAF_PDM_SOURCE_INIT(Rim2dEclipseViewCollection, "Eclipse2dViewCollection");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
Rim2dEclipseViewCollection::Rim2dEclipseViewCollection() 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", "", ""); CAF_PDM_InitFieldNoDefault(&m_2dEclipseViews, "EclipseViews", "Contour Maps", ":/CrossSection16x16.png", "", "");
m_2dEclipseViews.uiCapability()->setUiTreeHidden(true); m_2dEclipseViews.uiCapability()->setUiTreeHidden(true);

View File

@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimWellPathAttributeCollection, "WellPathAttributes");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimWellPathAttributeCollection::RimWellPathAttributeCollection() RimWellPathAttributeCollection::RimWellPathAttributeCollection()
{ {
CAF_PDM_InitObject("Casing Design", ":/CompletionsSymbol16x16", "", ""); CAF_PDM_InitObject("Casing Design", ":/CasingDesign16x16", "", "");
CAF_PDM_InitFieldNoDefault(&m_attributes, "Attributes", "Casing Design Attributes", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_attributes, "Attributes", "Casing Design Attributes", "", "", "");
m_attributes.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName()); m_attributes.uiCapability()->setUiEditorTypeName(caf::PdmUiTableViewEditor::uiEditorTypeName());

Binary file not shown.

After

Width:  |  Height:  |  Size: 729 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 637 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 B

View File

@@ -126,6 +126,12 @@
<file>minus-sign-red.png</file> <file>minus-sign-red.png</file>
<file>plus-sign-green.png</file> <file>plus-sign-green.png</file>
<file>arrow-right-green.png</file> <file>arrow-right-green.png</file>
<file>2DMap16x16.png</file>
<file>2DMaps16x16.png</file>
<file>AICVValve16x16.png</file>
<file>ICDValve16x16.png</file>
<file>ICVValve16x16.png</file>
<file>CasingDesign16x16.png</file>
</qresource> </qresource>
<qresource prefix="/Shader/"> <qresource prefix="/Shader/">
<file>fs_CellFace.glsl</file> <file>fs_CellFace.glsl</file>