From dab424ace3c89652aa4df2ef6babf5ba91177eee Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 16 Aug 2019 15:10:32 +0200
Subject: [PATCH] #4590 Preferences : Improve definition and use of tab names
 in dialog

---
 .../Application/RiaPreferences.cpp            | 82 +++++++++++++++----
 ApplicationCode/Application/RiaPreferences.h  | 10 ++-
 2 files changed, 75 insertions(+), 17 deletions(-)

diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp
index cd9bab914e..3c5dfb4a82 100644
--- a/ApplicationCode/Application/RiaPreferences.cpp
+++ b/ApplicationCode/Application/RiaPreferences.cpp
@@ -157,15 +157,6 @@ RiaPreferences::RiaPreferences(void)
 
     CAF_PDM_InitFieldNoDefault(&m_readerSettings,        "readerSettings", "Reader Settings", "", "", "");
     m_readerSettings = new RifReaderSettings;
-
-    m_tabNames << "General";
-    m_tabNames << "Eclipse";
-    m_tabNames << "Scripting";
-    m_tabNames << "Export";
-    if (RiaApplication::enableDevelopmentFeatures())
-    {
-        m_tabNames << "System";
-    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -233,7 +224,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
 //--------------------------------------------------------------------------------------------------
 void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) 
 {
-    if (uiConfigName == m_tabNames[0])
+    if (uiConfigName == RiaPreferences::tabNameGeneral())
     {
         caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup("Default Colors");
         colorGroup->add(&defaultViewerBackgroundColor);
@@ -260,7 +251,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         otherGroup->add(&showLasCurveWithoutTvdWarning);
         otherGroup->add(&holoLensDisableCertificateVerification);
     }
-    else if (uiConfigName == m_tabNames[1])
+    else if (uiConfigName == RiaPreferences::tabNameEclipse())
     {
         caf::PdmUiGroup* newCaseBehaviourGroup = uiOrdering.addNewGroup("Behavior When Loading Data");
         newCaseBehaviourGroup->add(&autocomputeDepthRelatedProperties);
@@ -291,7 +282,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
             summaryPlotsGroup->add(&defaultSummaryCurvesTextFilter);
         }
     }
-    else if (uiConfigName == m_tabNames[2])
+    else if (uiConfigName == RiaPreferences::tabNameScripting())
     {
         caf::PdmUiGroup* octaveGroup = uiOrdering.addNewGroup("Octave");
         octaveGroup->add(&octaveExecutable);
@@ -307,11 +298,11 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         scriptGroup->add(&scriptDirectories);
         scriptGroup->add(&scriptEditorExecutable);
     }
-    else if (uiConfigName == m_tabNames[3])
+    else if (uiConfigName == RiaPreferences::tabNameExport())
     {
         uiOrdering.add(&csvTextExportFieldSeparator);
     }
-    else if (RiaApplication::enableDevelopmentFeatures() && uiConfigName == m_tabNames[4])
+    else if (RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem())
     {
         uiOrdering.add(&m_appendClassNameToUiText);
         uiOrdering.add(&m_appendFieldKeywordToToolTipText);
@@ -369,12 +360,73 @@ void RiaPreferences::initAfterRead()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameGeneral()
+{
+    return "General";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameEclipse()
+{
+    return "Eclipse";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameEclipseSummary() 
+{
+    return "Summary";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameScripting()
+{
+    return "Scripting";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameExport()
+{
+    return "Export";
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferences::tabNameSystem()
+{
+    return "System";
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
 QStringList RiaPreferences::tabNames()
 {
-    return m_tabNames;
+    QStringList names;
+
+    names << tabNameGeneral();
+    names << tabNameEclipse();
+    names << tabNameEclipseSummary();
+    names << tabNameScripting();
+    names << tabNameExport();
+
+    if (RiaApplication::enableDevelopmentFeatures())
+    {
+        names << tabNameSystem();
+    }
+
+    return names;
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationCode/Application/RiaPreferences.h b/ApplicationCode/Application/RiaPreferences.h
index 7a412e2439..254b7d1866 100644
--- a/ApplicationCode/Application/RiaPreferences.h
+++ b/ApplicationCode/Application/RiaPreferences.h
@@ -121,6 +121,14 @@ protected:
     QList<caf::PdmOptionItemInfo>   calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
     void                            initAfterRead() override;
 
+private:
+    static QString tabNameGeneral();
+    static QString tabNameEclipse();
+    static QString tabNameEclipseSummary();
+    static QString tabNameScripting();
+    static QString tabNameExport();
+    static QString tabNameSystem();
+
 private:
     caf::PdmChildField<RifReaderSettings*> m_readerSettings;
     caf::PdmField<bool>                    m_appendClassNameToUiText;
@@ -131,6 +139,4 @@ private:
     caf::PdmField<bool>                    m_showTestToolbar;
     caf::PdmField<bool>                    m_includeFractureDebugInfoFile;
     caf::PdmField<QString>                 m_holoLensExportFolder;
-    QStringList                            m_tabNames;
-
 };