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

Merge pull request #4630 from OPM/release-adjustments

Browse Source 
Release adjustments
This commit is contained in:
Magne Sjaastad 2019-08-26 10:33:04 +02:00 committed by GitHub
commit 4b92427a4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -268,8 +268,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
viewsGroup->add(&showHud); viewsGroup->add(&showHud);
caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup("Other"); caf::PdmUiGroup* otherGroup = uiOrdering.addNewGroup("Other");
otherGroup->add(&m_dateFormat);
otherGroup->add(&m_timeFormat);
otherGroup->add(&ssihubAddress); otherGroup->add(&ssihubAddress);
otherGroup->add(&showLasCurveWithoutTvdWarning); otherGroup->add(&showLasCurveWithoutTvdWarning);
otherGroup->add(&holoLensDisableCertificateVerification); otherGroup->add(&holoLensDisableCertificateVerification);
@ -300,10 +298,12 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
group->add(&summaryEnsembleImportMode); group->add(&summaryEnsembleImportMode);
} }
} }
else if (uiConfigName == RiaPreferences::tabNameEclipseSummary()) else if (uiConfigName == RiaPreferences::tabNamePlotting())
{ {
uiOrdering.add(&defaultSummaryCurvesTextFilter); uiOrdering.add(&defaultSummaryCurvesTextFilter);
uiOrdering.add(&defaultSummaryHistoryCurveStyle); uiOrdering.add(&defaultSummaryHistoryCurveStyle);
uiOrdering.add(&m_dateFormat);
uiOrdering.add(&m_timeFormat);
} }
else if (uiConfigName == RiaPreferences::tabNameScripting()) else if (uiConfigName == RiaPreferences::tabNameScripting())
{ {
@ -426,9 +426,9 @@ QString RiaPreferences::tabNameEclipse()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RiaPreferences::tabNameEclipseSummary() QString RiaPreferences::tabNamePlotting()
{ {
return "Summary"; return "Plotting";
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -464,7 +464,7 @@ QStringList RiaPreferences::tabNames()
names << tabNameGeneral(); names << tabNameGeneral();
names << tabNameEclipse(); names << tabNameEclipse();
names << tabNameEclipseSummary(); names << tabNamePlotting();
names << tabNameScripting(); names << tabNameScripting();
names << tabNameExport(); names << tabNameExport();

2
ApplicationCode/Application/RiaPreferences.h
View File

@ -135,7 +135,7 @@ protected:
private: private:
static QString tabNameGeneral(); static QString tabNameGeneral();
static QString tabNameEclipse(); static QString tabNameEclipse();
static QString tabNameEclipseSummary(); static QString tabNamePlotting();
static QString tabNameScripting(); static QString tabNameScripting();
static QString tabNameExport(); static QString tabNameExport();
static QString tabNameSystem(); static QString tabNameSystem();

2
ApplicationCode/Application/Tools/RiaQDateTimeTools.cpp
View File

@ -438,7 +438,9 @@ std::vector<QString> RiaQDateTimeTools::supportedDateFormats()
dateFormats.push_back("yy;M/yy;d/M/yy"); dateFormats.push_back("yy;M/yy;d/M/yy");
dateFormats.push_back("yy;M/yy;M/d/yy"); dateFormats.push_back("yy;M/yy;M/d/yy");
dateFormats.push_back("yyyy;MM-yyyy;dd-MM-yyyy"); dateFormats.push_back("yyyy;MM-yyyy;dd-MM-yyyy");
dateFormats.push_back("yyyy;MM.yyyy;dd.MM.yyyy");
dateFormats.push_back("yyyy;MM-yyyy;MM-dd-yyyy"); dateFormats.push_back("yyyy;MM-yyyy;MM-dd-yyyy");
dateFormats.push_back("yyyy;MM.yyyy;MM.dd.yyyy");
dateFormats.push_back("yy;MM-yy;dd-MM-yy"); dateFormats.push_back("yy;MM-yy;dd-MM-yy");
dateFormats.push_back("yy;MM-yy;MM-dd-yy"); dateFormats.push_back("yy;MM-yy;MM-dd-yy");