diff --git a/ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp b/ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp index 11a13e0130..42f4cf9b53 100644 --- a/ApplicationCode/Commands/RicCreateSummaryCaseCollectionFeature.cpp +++ b/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")); } diff --git a/ApplicationCode/Commands/RicImportEnsembleFeature.cpp b/ApplicationCode/Commands/RicImportEnsembleFeature.cpp index cf976816d6..6001bda188 100644 --- a/ApplicationCode/Commands/RicImportEnsembleFeature.cpp +++ b/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"); } diff --git a/ApplicationCode/Commands/RicImportObservedDataFeature.cpp b/ApplicationCode/Commands/RicImportObservedDataFeature.cpp index 6dc98c157b..3679c2c5b3 100644 --- a/ApplicationCode/Commands/RicImportObservedDataFeature.cpp +++ b/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"); } diff --git a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp b/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp index 1893e13105..2c55ca6726 100644 --- a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp +++ b/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"); } diff --git a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp index 0dc7224729..b1d9765424 100644 --- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp +++ b/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"); } diff --git a/ApplicationCode/ProjectDataModel/RimCalcScript.cpp b/ApplicationCode/ProjectDataModel/RimCalcScript.cpp index 7cc376c539..1ffe6debc9 100644 --- a/ApplicationCode/ProjectDataModel/RimCalcScript.cpp +++ b/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", "", "" ,""); diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 0538582d81..22ed1110f3 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/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(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp b/ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp index 4f4ba4d088..fee2e40c42 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp +++ b/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", "", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp b/ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp index bf0ad70b6e..c642ed5ed8 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp +++ b/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"); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp index ca1235e26f..6cd6eab509 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp +++ b/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", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp index 859178dd4c..ec509da4e4 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp +++ b/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); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index b5dbb4186e..8382784f3c 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/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", "", "", "", ""); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp index c698969c9c..cfe28fde9e 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp +++ b/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"); } diff --git a/ApplicationCode/Resources/Case48x48.png b/ApplicationCode/Resources/Case48x48.png index 8015d06ea7..cfab59e850 100644 Binary files a/ApplicationCode/Resources/Case48x48.png and b/ApplicationCode/Resources/Case48x48.png differ diff --git a/ApplicationCode/Resources/EclipseInput48x48.png b/ApplicationCode/Resources/EclipseInput48x48.png index 487da4807b..12038be80a 100644 Binary files a/ApplicationCode/Resources/EclipseInput48x48.png and b/ApplicationCode/Resources/EclipseInput48x48.png differ diff --git a/ApplicationCode/Resources/Folder.png b/ApplicationCode/Resources/Folder.png index 57c2202b25..662c906b08 100644 Binary files a/ApplicationCode/Resources/Folder.png and b/ApplicationCode/Resources/Folder.png differ diff --git a/ApplicationCode/Resources/InputCase48x48.png b/ApplicationCode/Resources/InputCase48x48.png new file mode 100644 index 0000000000..c91c3721d9 Binary files /dev/null and b/ApplicationCode/Resources/InputCase48x48.png differ diff --git a/ApplicationCode/Resources/ObservedCSVDataFile16x16.png b/ApplicationCode/Resources/ObservedCSVDataFile16x16.png new file mode 100644 index 0000000000..1413da6369 Binary files /dev/null and b/ApplicationCode/Resources/ObservedCSVDataFile16x16.png differ diff --git a/ApplicationCode/Resources/ObservedDataFile16x16.png b/ApplicationCode/Resources/ObservedDataFile16x16.png new file mode 100644 index 0000000000..6de9304592 Binary files /dev/null and b/ApplicationCode/Resources/ObservedDataFile16x16.png differ diff --git a/ApplicationCode/Resources/ObservedRSMDataFile16x16.png b/ApplicationCode/Resources/ObservedRSMDataFile16x16.png new file mode 100644 index 0000000000..ea90a21d80 Binary files /dev/null and b/ApplicationCode/Resources/ObservedRSMDataFile16x16.png differ diff --git a/ApplicationCode/Resources/OctaveScriptFile16x16.png b/ApplicationCode/Resources/OctaveScriptFile16x16.png new file mode 100644 index 0000000000..93e7d25d07 Binary files /dev/null and b/ApplicationCode/Resources/OctaveScriptFile16x16.png differ diff --git a/ApplicationCode/Resources/PlotWindow24x24.png b/ApplicationCode/Resources/PlotWindow24x24.png index 6d7f5fa745..555a43eff1 100644 Binary files a/ApplicationCode/Resources/PlotWindow24x24.png and b/ApplicationCode/Resources/PlotWindow24x24.png differ diff --git a/ApplicationCode/Resources/ResInsight.qrc b/ApplicationCode/Resources/ResInsight.qrc index 218fd89637..513fc55b8a 100644 --- a/ApplicationCode/Resources/ResInsight.qrc +++ b/ApplicationCode/Resources/ResInsight.qrc @@ -20,9 +20,12 @@ Well.png WellCollection.png octave.png + OctaveScriptFile16x16.png Folder.png EclipseInput48x48.png Cases16x16.png + SummaryCases16x16.png + SummaryEnsemble16x16.png CreateGridCaseGroup16x16.png GridCaseGroup16x16.png Histogram16x16.png @@ -65,6 +68,9 @@ EnsembleCurveSets16x16.png SummaryXPlotLight16x16.png SummaryXPlotsLight16x16.png + ObservedDataFile16x16.png + ObservedRSMDataFile16x16.png + ObservedCSVDataFile16x16.png FormationCollection16x16.png Formations16x16.png Parallel24x24.png @@ -77,6 +83,7 @@ 3DWindow24x24.png 3DView16x16.png SummaryCase48x48.png + SummaryCase16x16.png openFolder24x24.png clipboard.png Copy.png diff --git a/ApplicationCode/Resources/SummaryCase16x16.png b/ApplicationCode/Resources/SummaryCase16x16.png new file mode 100644 index 0000000000..a878e4321a Binary files /dev/null and b/ApplicationCode/Resources/SummaryCase16x16.png differ diff --git a/ApplicationCode/Resources/SummaryCase48x48.png b/ApplicationCode/Resources/SummaryCase48x48.png index 96c327983e..617d910f43 100644 Binary files a/ApplicationCode/Resources/SummaryCase48x48.png and b/ApplicationCode/Resources/SummaryCase48x48.png differ diff --git a/ApplicationCode/Resources/SummaryCases16x16.png b/ApplicationCode/Resources/SummaryCases16x16.png new file mode 100644 index 0000000000..5ca069bbb6 Binary files /dev/null and b/ApplicationCode/Resources/SummaryCases16x16.png differ diff --git a/ApplicationCode/Resources/SummaryEnsemble16x16.png b/ApplicationCode/Resources/SummaryEnsemble16x16.png new file mode 100644 index 0000000000..f0af79850a Binary files /dev/null and b/ApplicationCode/Resources/SummaryEnsemble16x16.png differ