#2857, #2861, #2853, #2862 Icon improvements: Use new Summary plot icon in combined icons, Observed Data icons, Octave Script icon improvements, Summary Case Group icon

ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp

@@ -92,5 +92,5 @@ void RicCreateSummaryCaseCollectionFeature::onActionTriggered(bool isChecked)
 void RicCreateSummaryCaseCollectionFeature::setupActionLook(QAction* actionToSetup)
 {
     actionToSetup->setText("Group Summary Cases");
-    actionToSetup->setIcon(QIcon(":/Folder.png"));
+    actionToSetup->setIcon(QIcon(":/SummaryEnsemble16x16.png"));
 }

ApplicationCode/Commands/RicImportEnsembleFeature.cpp

@@ -98,7 +98,7 @@ void RicImportEnsembleFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicImportEnsembleFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/SummaryCase48x48.png"));
+    actionToSetup->setIcon(QIcon(":/SummaryEnsemble16x16.png"));
     actionToSetup->setText("Import Ensemble");
 }
 

ApplicationCode/Commands/RicImportObservedDataFeature.cpp

@@ -131,6 +131,6 @@ void RicImportObservedDataFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicImportObservedDataFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/Default.png"));
+    actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png"));
     actionToSetup->setText("Import Observed Time History Data");
 }

ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp

@@ -61,7 +61,7 @@ void RicImportObservedDataInMenuFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicImportObservedDataInMenuFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/Default.png"));
+    actionToSetup->setIcon(QIcon(":/ObservedDataFile16x16.png"));
     actionToSetup->setText("Import Observed Time History Data");
 }
 

ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp

@@ -103,7 +103,7 @@ void RicImportSummaryCasesFeature::onActionTriggered(bool isChecked)
 //--------------------------------------------------------------------------------------------------
 void RicImportSummaryCasesFeature::setupActionLook(QAction* actionToSetup)
 {
-    actionToSetup->setIcon(QIcon(":/SummaryCase48x48.png"));
+    actionToSetup->setIcon(QIcon(":/SummaryCases16x16.png"));
     actionToSetup->setText("Import Summary Cases Recursively");
 }
 

ApplicationCode/ProjectDataModel/RimCalcScript.cpp

@@ -27,7 +27,7 @@ CAF_PDM_SOURCE_INIT(RimCalcScript, "CalcScript");
 //--------------------------------------------------------------------------------------------------
 RimCalcScript::RimCalcScript()
 {
-    CAF_PDM_InitObject("CalcScript", ":/octave.png", "Calc Script", "");
+    CAF_PDM_InitObject("CalcScript", ":/OctaveScriptFile16x16.png", "Calc Script", "");
 
     CAF_PDM_InitField(&absolutePath, "AbsolutePath", QString(), "Location", "", "" ,"");
     CAF_PDM_InitField(&content, "Content", QString(), "Directory", "", "" ,"");

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -99,7 +99,7 @@ RimProject::RimProject(void)
     CAF_PDM_InitFieldNoDefault(&oilFields, "OilFields", "Oil Fields",  "", "", "");
     oilFields.uiCapability()->setUiHidden(true);
 
-    CAF_PDM_InitFieldNoDefault(&scriptCollection, "ScriptCollection", "Scripts", ":/Default.png", "", "");
+    CAF_PDM_InitFieldNoDefault(&scriptCollection, "ScriptCollection", "Octave Scripts", ":/octave.png", "", "");
     scriptCollection.uiCapability()->setUiHidden(true);
 
     CAF_PDM_InitFieldNoDefault(&wellPathImport, "WellPathImport", "WellPathImport", "", "", "");
@@ -156,7 +156,7 @@ RimProject::RimProject(void)
     scriptCollection = new RimScriptCollection();
     scriptCollection->directory.uiCapability()->setUiHidden(true);
     scriptCollection->uiCapability()->setUiName("Scripts");
-    scriptCollection->uiCapability()->setUiIcon(QIcon(":/Default.png"));
+    scriptCollection->uiCapability()->setUiIcon(QIcon(":/octave.png"));
 
     mainPlotCollection = new RimMainPlotCollection();
 

ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp

@@ -36,7 +36,7 @@ CAF_PDM_SOURCE_INIT(RimCsvUserData, "RimCsvUserData");
 //--------------------------------------------------------------------------------------------------
 RimCsvUserData::RimCsvUserData()
 {
-    CAF_PDM_InitObject("Observed CSV Data File", ":/Default.png", "", "");
+    CAF_PDM_InitObject("Observed CSV Data File", ":/ObservedCSVDataFile16x16.png", "", "");
     m_summaryHeaderFilename.uiCapability()->setUiName("File");
 
     CAF_PDM_InitFieldNoDefault(&m_parseOptions, "ParseOptions", "", "", "", "");

ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp

@@ -39,7 +39,7 @@ CAF_PDM_SOURCE_INIT(RimObservedEclipseUserData, "RimObservedEclipseUserData");
 //--------------------------------------------------------------------------------------------------
 RimObservedEclipseUserData::RimObservedEclipseUserData()
 {
-    CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/Default.png", "", "");
+    CAF_PDM_InitObject("Observed RSMSPEC Column Based Data File", ":/ObservedRSMDataFile16x16.png", "", "");
     m_summaryHeaderFilename.uiCapability()->setUiName("File");
 }
 

ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp

@@ -37,7 +37,7 @@ CAF_PDM_ABSTRACT_SOURCE_INIT(RimSummaryCase,"SummaryCase");
 //--------------------------------------------------------------------------------------------------
 RimSummaryCase::RimSummaryCase()
 {
-    CAF_PDM_InitObject("Summary Case",":/SummaryCase48x48.png","","");
+    CAF_PDM_InitObject("Summary Case",":/SummaryCase16x16.png","","");
 
     CAF_PDM_InitField(&m_shortName, "ShortName", QString("Display Name"), "Display Name", "", "", "");
     CAF_PDM_InitField(&m_useAutoShortName, "AutoShortyName", false, "Use Auto Display Name", "", "", "");

ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp

@@ -30,7 +30,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryCaseCollection, "SummaryCaseSubCollection");
 //--------------------------------------------------------------------------------------------------
 RimSummaryCaseCollection::RimSummaryCaseCollection()
 {
-    CAF_PDM_InitObject("Summary Case Group", ":/Folder.png", "", "");
+    CAF_PDM_InitObject("Summary Case Group", ":/SummaryEnsemble16x16.png", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_cases, "SummaryCases", "", "", "", "");
     m_cases.uiCapability()->setUiHidden(true);

ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp

@@ -61,7 +61,7 @@ void addCaseRealizationParametersIfFound(RimSummaryCase& sumCase, const QString
 //--------------------------------------------------------------------------------------------------
 RimSummaryCaseMainCollection::RimSummaryCaseMainCollection()
 {
-    CAF_PDM_InitObject("Summary Cases",":/Cases16x16.png","","");
+    CAF_PDM_InitObject("Summary Cases",":/SummaryCases16x16.png","","");
 
     CAF_PDM_InitFieldNoDefault(&m_cases, "SummaryCases", "", "", "", "");
     CAF_PDM_InitFieldNoDefault(&m_caseCollections, "SummaryCaseCollections", "", "", "", "");

ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp

@@ -31,7 +31,7 @@ CAF_PDM_SOURCE_INIT(RimSummaryObservedDataFile, "SummaryObservedDataFile");
 //--------------------------------------------------------------------------------------------------
 RimSummaryObservedDataFile::RimSummaryObservedDataFile()
 {
-    CAF_PDM_InitObject("Observed data file", ":/Default.png", "", "");
+    CAF_PDM_InitObject("Observed data file", ":/ObservedDataFile16x16.png", "", "");
     m_summaryHeaderFilename.uiCapability()->setUiName("File");
 }
 

ApplicationCode/Resources/ResInsight.qrc

@@ -20,9 +20,12 @@
     <file>Well.png</file>
     <file>WellCollection.png</file>
     <file>octave.png</file>
+    <file>OctaveScriptFile16x16.png</file>
     <file>Folder.png</file>
     <file>EclipseInput48x48.png</file>
     <file>Cases16x16.png</file>
+    <file>SummaryCases16x16.png</file>
+    <file>SummaryEnsemble16x16.png</file>
     <file>CreateGridCaseGroup16x16.png</file>
     <file>GridCaseGroup16x16.png</file>
     <file>Histogram16x16.png</file>
@@ -65,6 +68,9 @@
     <file>EnsembleCurveSets16x16.png</file>
     <file>SummaryXPlotLight16x16.png</file>
     <file>SummaryXPlotsLight16x16.png</file>
+    <file>ObservedDataFile16x16.png</file>
+    <file>ObservedRSMDataFile16x16.png</file>
+    <file>ObservedCSVDataFile16x16.png</file>
     <file>FormationCollection16x16.png</file>
     <file>Formations16x16.png</file>
     <file>Parallel24x24.png</file>
@@ -77,6 +83,7 @@
     <file>3DWindow24x24.png</file>
     <file>3DView16x16.png</file>
     <file>SummaryCase48x48.png</file>
+    <file>SummaryCase16x16.png</file>
     <file>openFolder24x24.png</file>
     <file>clipboard.png</file>
     <file>Copy.png</file>