OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#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

Browse Source
This commit is contained in:
Jacob Støren
2018-05-07 11:30:19 +02:00
parent fb518117c0
commit c4c0d46692
27 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimCalcScript.cpp
View File

@@ -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", "", "" ,"");

4
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@@ -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();

2
ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp
View File

@@ -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", "", "", "", "");

2
ApplicationCode/ProjectDataModel/Summary/RimObservedEclipseUserData.cpp
View File

@@ -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");
}

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -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", "", "", "");

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@@ -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);

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -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", "", "", "", "");

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryObservedDataFile.cpp
View File

@@ -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");
}