Merge pull request #5451 from OPM/feature-#5329-#4991-add-multiplot-cumphasefrac-icons

Feature #5329 #4991 add multiplot cumphasefrac icons

ApplicationCode/Commands/FlowCommands/RicShowCumulativePhasePlotFeature.cpp

@@ -63,6 +63,6 @@ void RicShowCumulativePhasePlotFeature::onActionTriggered( bool isChecked )
 //--------------------------------------------------------------------------------------------------
 void RicShowCumulativePhasePlotFeature::setupActionLook( QAction* actionToSetup )
 {
-    // actionToSetup->setIcon(QIcon(":/new_icon16x16.png"));
+    actionToSetup->setIcon( QIcon( ":/CumulativePhaseDist16x16.png" ) );
     actionToSetup->setText( "Show Cumulative Phase Distribution Plot" );
 }

ApplicationCode/Commands/RicNewMultiPlotFeature.cpp

@@ -110,7 +110,7 @@ void RicNewMultiPlotFeature::onActionTriggered( bool isChecked )
 void RicNewMultiPlotFeature::setupActionLook( QAction* actionToSetup )
 {
     actionToSetup->setText( "Create Multi Plot from Selected Plots" );
-    actionToSetup->setIcon( QIcon( ":/WellLogPlot16x16.png" ) );
+    actionToSetup->setIcon( QIcon( ":/MultiPlot16x16.png" ) );
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/Flow/RimWellDistributionPlotCollection.cpp

@@ -58,7 +58,7 @@ RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()
 {
     // cvf::Trace::show("RimWellDistributionPlotCollection::RimWellDistributionPlotCollection()");
 
-    CAF_PDM_InitObject( "Cumulative Phase Distribution Plot", "", "", "" );
+    CAF_PDM_InitObject( "Cumulative Phase Distribution Plot", ":/CumulativePhaseDist16x16.png", "", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_case, "Case", "Case", "", "", "" );
     CAF_PDM_InitField( &m_timeStepIndex, "TimeStepIndex", -1, "Time Step", "", "", "" );

ApplicationCode/ProjectDataModel/RimMultiPlot.cpp

@@ -61,7 +61,7 @@ CAF_PDM_SOURCE_INIT( RimMultiPlot, "MultiPlot" );
 //--------------------------------------------------------------------------------------------------
 RimMultiPlot::RimMultiPlot()
 {
-    CAF_PDM_InitObject( "Multi Plot", ":/WellLogPlot16x16.png", "", "" );
+    CAF_PDM_InitObject( "Multi Plot", ":/MultiPlot16x16.png", "", "" );
 
     CAF_PDM_InitField( &m_showPlotWindowTitle, "ShowTitleInPlot", true, "Show Title", "", "", "" );
     CAF_PDM_InitField( &m_plotWindowTitle, "PlotDescription", QString( "" ), "Name", "", "", "" );

ApplicationCode/ProjectDataModel/RimMultiPlotCollection.cpp

@@ -28,7 +28,7 @@ CAF_PDM_SOURCE_INIT( RimMultiPlotCollection, "RimMultiPlotCollection" );
 //--------------------------------------------------------------------------------------------------
 RimMultiPlotCollection::RimMultiPlotCollection()
 {
-    CAF_PDM_InitObject( "Multi Plots", ":/WellLogPlot16x16.png", "", "" );
+    CAF_PDM_InitObject( "Multi Plots", ":/MultiPlot16x16.png", "", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_multiPlots, "MultiPlots", "Plots Reports", "", "", "" );
     m_multiPlots.uiCapability()->setUiHidden( true );

ApplicationCode/Resources/ResInsight.qrc

@@ -29,12 +29,11 @@
     <file>CreateGridCaseGroup16x16.png</file>
     <file>CrossSection16x16.png</file>
     <file>CrossSections16x16.png</file>
-    <file>Default.png</file>
+    <file>CumulativePhaseDist16x16.png</file>
     <file>DownViewArrow.png</file>
     <file>EastViewArrow.png</file>
     <file>EclipseInput48x48.png</file>
     <file>EdgeResult_1.png</file>
-    <file>EdgeResult_2.png</file>
     <file>EditableWell.png</file>
     <file>EnsembleCurveSet16x16.png</file>
     <file>EnsembleCurveSets16x16.png</file>
@@ -82,6 +81,7 @@
     <file>MasterView16x16.png</file>
     <file>Minus.png</file>
     <file>NorthViewArrow.png</file>
+    <file>MultiPlot16x16.png</file>
     <file>ObservedCSVDataFile16x16.png</file>
     <file>ObservedDataFile16x16.png</file>
     <file>ObservedRFTDataFile16x16.png</file>
@@ -167,8 +167,6 @@
     <file>draw_style_faults_label_24x24.png</file>
     <file>draw_style_lines_24x24.png</file>
     <file>draw_style_meshlines_24x24.png</file>
-    <file>draw_style_meshoutlines_24x24.png</file>
-    <file>draw_style_outlines_24x24.png</file>
     <file>draw_style_surface_24x24.png</file>
     <file>draw_style_surface_w_fault_mesh_24x24.png</file>
     <file>octave.png</file>