#8142 Preferences : Move system settings into separate file

ApplicationLibCode/Application/CMakeLists_files.cmake

@@ -8,6 +8,7 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSummary.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesGeoMech.h
+    ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSystem.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.h
@@ -35,6 +36,7 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferences.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSummary.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesGeoMech.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RiaPreferencesSystem.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaPorosityModel.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaSummaryCurveDefinition.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaCurveSetDefinition.cpp

ApplicationLibCode/Application/RiaApplication.cpp

@@ -25,6 +25,7 @@
 #include "RiaImportEclipseCaseTools.h"
 #include "RiaLogging.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaProjectModifier.h"
 #include "RiaSocketServer.h"
 #include "RiaTextStringTools.h"
@@ -1213,7 +1214,7 @@ void RiaApplication::applyPreferences()
         this->project()->updateConnectedEditors();
     }
 
-    caf::ProgressInfoStatic::setEnabled( m_preferences->showProgressBar() );
+    caf::ProgressInfoStatic::setEnabled( RiaPreferencesSystem::current()->showProgressBar() );
 
     m_preferences->writePreferencesToApplicationStore();
 }
@@ -1360,7 +1361,7 @@ int RiaApplication::launchUnitTests()
 
     //
     // Use the gtest filter to execute a subset of tests
-    QString filterText = RiaPreferences::current()->gtestFilter();
+    QString filterText = RiaPreferencesSystem::current()->gtestFilter();
     if ( !filterText.isEmpty() )
     {
         ::testing::GTEST_FLAG( filter ) = filterText.toStdString();

ApplicationLibCode/Application/RiaGuiApplication.cpp

@@ -28,6 +28,7 @@
 #include "RiaLogging.h"
 #include "RiaPlotWindowRedrawScheduler.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaProjectModifier.h"
 #include "RiaRegressionTestRunner.h"
 #include "RiaSocketServer.h"
@@ -239,7 +240,8 @@ QString RiaGuiApplication::promptForProjectSaveAsFileName() const
 //--------------------------------------------------------------------------------------------------
 bool RiaGuiApplication::askUserToSaveModifiedProject()
 {
-    if ( m_preferences->showProjectChangedDialog() && caf::PdmUiModelChangeDetector::instance()->isModelChanged() )
+    if ( RiaPreferencesSystem::current()->showProjectChangedDialog() &&
+         caf::PdmUiModelChangeDetector::instance()->isModelChanged() )
     {
         QMessageBox msgBox;
         msgBox.setIcon( QMessageBox::Question );
@@ -377,7 +379,7 @@ RimViewWindow* RiaGuiApplication::activePlotWindow() const
 //--------------------------------------------------------------------------------------------------
 bool RiaGuiApplication::useShaders() const
 {
-    if ( !m_preferences->useShaders() ) return false;
+    if ( !RiaPreferencesSystem::current()->useShaders() ) return false;
 
     bool isShadersSupported = true;
     if ( platformName() != "offscreen" ) // Avoid opengl access if we are in qt offscreen mode
@@ -1353,7 +1355,7 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences*
     if ( m_activeReservoirView && m_activeReservoirView->viewer() )
     {
         m_activeReservoirView->viewer()->updateNavigationPolicy();
-        m_activeReservoirView->viewer()->enablePerfInfoHud( m_preferences->show3dInformation() );
+        m_activeReservoirView->viewer()->enablePerfInfoHud( RiaPreferencesSystem::current()->show3dInformation() );
     }
 
     if ( useShaders() )
@@ -1367,10 +1369,11 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences*
 
     if ( m_mainWindow && m_mainWindow->projectTreeView() )
     {
-        m_mainWindow->projectTreeView()->enableAppendOfClassNameToUiItemText( m_preferences->appendClassNameToUiText() );
+        m_mainWindow->projectTreeView()->enableAppendOfClassNameToUiItemText(
+            RiaPreferencesSystem::current()->appendClassNameToUiText() );
         if ( mainPlotWindow() )
             mainPlotWindow()->projectTreeView()->enableAppendOfClassNameToUiItemText(
-                m_preferences->appendClassNameToUiText() );
+                RiaPreferencesSystem::current()->appendClassNameToUiText() );
     }
 
     for ( auto fontObject : defaultFontObjects )
@@ -1536,7 +1539,7 @@ void RiaGuiApplication::applyGuiPreferences( const RiaPreferences*
             uiItem->updateConnectedEditors();
         }
     }
-    caf::PdmUiItem::enableExtraDebugText( m_preferences->appendFieldKeywordToToolTipText() );
+    caf::PdmUiItem::enableExtraDebugText( RiaPreferencesSystem::current()->appendFieldKeywordToToolTipText() );
 
     if ( oldPreferences )
     {

ApplicationLibCode/Application/RiaPreferences.cpp

@@ -25,6 +25,7 @@
 #include "RiaColorTables.h"
 #include "RiaPreferencesGeoMech.h"
 #include "RiaPreferencesSummary.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaValidRegExpValidator.h"
 
 #include "RifReaderSettings.h"
@@ -173,37 +174,6 @@ RiaPreferences::RiaPreferences()
     CAF_PDM_InitFieldNoDefault( &defaultWellLabelFontSize, "defaultWellLabelFontSizePt", "Well Label Font Size", "", "", "" );
     CAF_PDM_InitFieldNoDefault( &defaultPlotFontSize, "defaultPlotFontSizePt", "Plot Font Size", "", "", "" );
 
-    CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useShaders );
-    CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showHud );
-    CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendClassNameToUiText );
-
-    CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText,
-                       "appendFieldKeywordToToolTipText",
-                       false,
-                       "Show Field Keyword in ToolTip",
-                       "",
-                       "",
-                       "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText );
-
-    CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showViewIdInProjectTree );
-
-    CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showTestToolbar );
-
-    CAF_PDM_InitField( &m_includeFractureDebugInfoFile,
-                       "includeFractureDebugInfoFile",
-                       false,
-                       "Include Fracture Debug Info for Completion Export",
-                       "",
-                       "",
-                       "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile );
-
     CAF_PDM_InitField( &m_showLegendBackground, "showLegendBackground", true, "Show Box around Legends", "", "", "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showLegendBackground );
 
@@ -231,10 +201,6 @@ RiaPreferences::RiaPreferences()
     CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &loadAndShowSoil );
 
-    CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" );
-    m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
-    m_holoLensExportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
-
     CAF_PDM_InitField( &holoLensDisableCertificateVerification,
                        "holoLensDisableCertificateVerification",
                        false,
@@ -252,15 +218,6 @@ RiaPreferences::RiaPreferences()
                        "",
                        "" );
 
-    CAF_PDM_InitField( &m_showProjectChangedDialog,
-                       "showProjectChangedDialog",
-                       true,
-                       "Show 'Project has changed' dialog",
-                       "",
-                       "",
-                       "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog );
-
     CAF_PDM_InitFieldNoDefault( &m_readerSettings, "readerSettings", "Reader Settings", "", "", "" );
     m_readerSettings = new RifReaderSettings;
     CAF_PDM_InitFieldNoDefault( &m_dateFormat, "dateFormat", "Date Format", "", "", "" );
@@ -271,9 +228,6 @@ RiaPreferences::RiaPreferences()
     m_timeFormat.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
     m_timeFormat = RiaQDateTimeTools::supportedTimeFormats().front();
 
-    CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar", "", "", "" );
-    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar );
-
     CAF_PDM_InitField( &m_useUndoRedo, "useUndoRedo", true, "Enable Undo/Redo for Property Editor changes", "", "", "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useUndoRedo );
 
@@ -300,8 +254,6 @@ RiaPreferences::RiaPreferences()
     CAF_PDM_InitField( &m_openExportedPdfInViewer, "openExportedPdfInViewer", false, "Open Exported PDF in Viewer", "", "", "" );
     caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_openExportedPdfInViewer );
 
-    CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" );
-
     CAF_PDM_InitField( &m_surfaceImportResamplingDistance,
                        "SurfaceImportResamplingDistance",
                        100.0,
@@ -327,6 +279,9 @@ RiaPreferences::RiaPreferences()
 
     CAF_PDM_InitFieldNoDefault( &m_geoMechPreferences, "geoMechPreferences", "geoMechPreferences", "", "", "" );
     m_geoMechPreferences = new RiaPreferencesGeoMech;
+
+    CAF_PDM_InitFieldNoDefault( &m_systemPreferences, "systemPreferences", "systemPreferences", "", "", "" );
+    m_systemPreferences = new RiaPreferencesSystem;
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -366,14 +321,6 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field,
         }
     }
 
-    if ( field == &m_holoLensExportFolder )
-    {
-        caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>( attribute );
-        if ( myAttr )
-        {
-            myAttr->m_selectDirectory = true;
-        }
-    }
     if ( field == &defaultSceneFontSize || field == &defaultWellLabelFontSize || field == &defaultAnnotationFontSize ||
          field == &defaultPlotFontSize )
     {
@@ -428,7 +375,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
         otherGroup->add( &ssihubAddress );
         otherGroup->add( &holoLensDisableCertificateVerification );
         otherGroup->add( &m_useUndoRedo );
-        otherGroup->add( &m_showProgressBar );
     }
     else if ( uiConfigName == RiaPreferences::tabNameEclipseGrid() )
     {
@@ -513,24 +459,7 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
     }
     else if ( RiaApplication::enableDevelopmentFeatures() && uiConfigName == RiaPreferences::tabNameSystem() )
     {
-        {
+        m_systemPreferences()->uiOrdering( uiConfigName, uiOrdering );
-            caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Project Tree" );
-            group->add( &m_appendClassNameToUiText );
-            group->add( &m_appendFieldKeywordToToolTipText );
-            group->add( &m_showViewIdInProjectTree );
-        }
-
-        {
-            caf::PdmUiGroup* group = uiOrdering.addNewGroup( "3D View" );
-            group->add( &m_useShaders );
-            group->add( &m_showHud );
-        }
-
-        uiOrdering.add( &m_gtestFilter );
-        uiOrdering.add( &m_showProjectChangedDialog );
-        uiOrdering.add( &m_showTestToolbar );
-        uiOrdering.add( &m_includeFractureDebugInfoFile );
-        uiOrdering.add( &m_holoLensExportFolder );
     }
 
     uiOrdering.skipRemainingFields( true );
@@ -723,96 +652,6 @@ const RifReaderSettings* RiaPreferences::readerSettings() const
     return m_readerSettings;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::appendClassNameToUiText() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_appendClassNameToUiText();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::appendFieldKeywordToToolTipText() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_appendFieldKeywordToToolTipText();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::showViewIdInProjectTree() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_showViewIdInProjectTree();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::showTestToolbar() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_showTestToolbar();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::includeFractureDebugInfoFile() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_includeFractureDebugInfoFile();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::showProjectChangedDialog() const
-{
-    if ( !RiaApplication::enableDevelopmentFeatures() )
-    {
-        return true;
-    }
-
-    return m_showProjectChangedDialog();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QString RiaPreferences::holoLensExportFolder() const
-{
-    return m_holoLensExportFolder();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::useShaders() const
-{
-    if ( !RiaApplication::enableDevelopmentFeatures() )
-    {
-        return true;
-    }
-
-    return m_useShaders();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::show3dInformation() const
-{
-    return RiaApplication::enableDevelopmentFeatures() && m_showHud();
-}
-
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-QString RiaPreferences::gtestFilter() const
-{
-    return m_gtestFilter();
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -906,14 +745,6 @@ void RiaPreferences::setDefaultPlotTemplatePath( const QString& templatePath )
     m_defaultPlotTemplate = templatePath;
 }
 
-//--------------------------------------------------------------------------------------------------
-///
-//--------------------------------------------------------------------------------------------------
-bool RiaPreferences::showProgressBar() const
-{
-    return m_showProgressBar;
-}
-
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -1066,6 +897,14 @@ RiaPreferencesSummary* RiaPreferences::summaryPreferences() const
     return m_summaryPreferences();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RiaPreferencesSystem* RiaPreferences::systemPreferences() const
+{
+    return m_systemPreferences();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaPreferences.h

@@ -42,6 +42,7 @@
 class RifReaderSettings;
 class RiaPreferencesSummary;
 class RiaPreferencesGeoMech;
+class RiaPreferencesSystem;
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -70,18 +71,7 @@ public:
 
     const RifReaderSettings* readerSettings() const;
 
-    // Debug settings
+    bool useUndoRedo() const;
-    bool    appendClassNameToUiText() const;
-    bool    appendFieldKeywordToToolTipText() const;
-    bool    showViewIdInProjectTree() const;
-    bool    showTestToolbar() const;
-    bool    includeFractureDebugInfoFile() const;
-    bool    showProjectChangedDialog() const;
-    QString holoLensExportFolder() const;
-    bool    useShaders() const;
-    bool    show3dInformation() const;
-    QString gtestFilter() const;
-    bool    useUndoRedo() const;
 
     const QString& dateFormat() const;
     const QString& timeFormat() const;
@@ -93,7 +83,6 @@ public:
     void        appendPlotTemplateFolders( const QString& folder );
     QString     defaultPlotTemplateAbsolutePath() const;
     void        setDefaultPlotTemplatePath( const QString& templatePath );
-    bool        showProgressBar() const;
     bool        openExportedPdfInViewer() const;
 
     RiaDefines::ThemeEnum guiTheme() const;
@@ -123,6 +112,7 @@ public:
 
     RiaPreferencesGeoMech* geoMechPreferences() const;
     RiaPreferencesSummary* summaryPreferences() const;
+    RiaPreferencesSystem*  systemPreferences() const;
 
 public:
     caf::PdmField<bool> enableGrpcServer;
@@ -179,23 +169,10 @@ private:
 private:
     caf::PdmChildField<RifReaderSettings*> m_readerSettings;
 
-    caf::PdmField<bool> m_appendClassNameToUiText;
-    caf::PdmField<bool> m_appendFieldKeywordToToolTipText;
-    caf::PdmField<bool> m_showViewIdInProjectTree;
-    caf::PdmField<bool> m_useShaders;
-    caf::PdmField<bool> m_showHud;
-
-    caf::PdmField<bool> m_showProjectChangedDialog;
-
-    caf::PdmField<bool>    m_showTestToolbar;
-    caf::PdmField<bool>    m_includeFractureDebugInfoFile;
-    caf::PdmField<QString> m_holoLensExportFolder;
     caf::PdmField<QString> m_dateFormat;
     caf::PdmField<QString> m_timeFormat;
 
-    caf::PdmField<bool>    m_showProgressBar;
+    caf::PdmField<bool> m_useUndoRedo;
-    caf::PdmField<QString> m_gtestFilter;
-    caf::PdmField<bool>    m_useUndoRedo;
 
     caf::PdmField<caf::AppEnum<RiaDefines::ThemeEnum>> m_guiTheme;
 
@@ -227,6 +204,9 @@ private:
     // Summary data
     caf::PdmChildField<RiaPreferencesSummary*> m_summaryPreferences;
 
+    // System settings
+    caf::PdmChildField<RiaPreferencesSystem*> m_systemPreferences;
+
     // 3d view
     caf::PdmField<caf::AppEnum<RiaDefines::MeshModeType>>       m_defaultMeshModeType;
     caf::PdmField<caf::AppEnum<RiaDefines::RINavigationPolicy>> m_navigationPolicy;

ApplicationLibCode/Application/RiaPreferencesSystem.cpp

@@ -0,0 +1,286 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2021     Equinor ASA
+//
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RiaApplication.h"
+
+#include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
+
+#include "cafPdmUiCheckBoxEditor.h"
+#include "cafPdmUiFilePathEditor.h"
+
+CAF_PDM_SOURCE_INIT( RiaPreferencesSystem, "RiaPreferencesSystem" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RiaPreferencesSystem::RiaPreferencesSystem()
+{
+    CAF_PDM_InitField( &m_useShaders, "useShaders", true, "Use Shaders", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useShaders );
+    CAF_PDM_InitField( &m_showHud, "showHud", false, "Show 3D Information", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showHud );
+    CAF_PDM_InitField( &m_appendClassNameToUiText, "appendClassNameToUiText", false, "Show Class Names", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendClassNameToUiText );
+
+    CAF_PDM_InitField( &m_appendFieldKeywordToToolTipText,
+                       "appendFieldKeywordToToolTipText",
+                       false,
+                       "Show Field Keyword in ToolTip",
+                       "",
+                       "",
+                       "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_appendFieldKeywordToToolTipText );
+
+    CAF_PDM_InitField( &m_showViewIdInProjectTree, "showViewIdInTree", false, "Show View Id in Project Tree", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showViewIdInProjectTree );
+
+    CAF_PDM_InitField( &m_showTestToolbar, "showTestToolbar", false, "Enable Test Toolbar", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showTestToolbar );
+
+    CAF_PDM_InitField( &m_includeFractureDebugInfoFile,
+                       "includeFractureDebugInfoFile",
+                       false,
+                       "Include Fracture Debug Info for Completion Export",
+                       "",
+                       "",
+                       "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_includeFractureDebugInfoFile );
+
+    CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" );
+    m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
+    m_holoLensExportFolder.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
+
+    CAF_PDM_InitField( &m_showProjectChangedDialog,
+                       "showProjectChangedDialog",
+                       true,
+                       "Show 'Project has changed' dialog",
+                       "",
+                       "",
+                       "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProjectChangedDialog );
+
+    CAF_PDM_InitField( &m_showProgressBar, "showProgressBar", true, "Show Progress Bar", "", "", "" );
+    caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar );
+
+    CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RiaPreferencesSystem* RiaPreferencesSystem::current()
+{
+    return RiaApplication::instance()->preferences()->systemPreferences();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::appendClassNameToUiText() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_appendClassNameToUiText();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::appendFieldKeywordToToolTipText() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_appendFieldKeywordToToolTipText();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::showViewIdInProjectTree() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_showViewIdInProjectTree();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::showTestToolbar() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_showTestToolbar();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::includeFractureDebugInfoFile() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_includeFractureDebugInfoFile();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::showProjectChangedDialog() const
+{
+    if ( !RiaApplication::enableDevelopmentFeatures() )
+    {
+        return true;
+    }
+
+    return m_showProjectChangedDialog();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferencesSystem::holoLensExportFolder() const
+{
+    return m_holoLensExportFolder();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::useShaders() const
+{
+    if ( !RiaApplication::enableDevelopmentFeatures() )
+    {
+        return true;
+    }
+
+    return m_useShaders();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::show3dInformation() const
+{
+    return RiaApplication::enableDevelopmentFeatures() && m_showHud();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiaPreferencesSystem::gtestFilter() const
+{
+    return m_gtestFilter();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RiaPreferencesSystem::showProgressBar() const
+{
+    return m_showProgressBar();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaPreferencesSystem::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
+{
+    {
+        caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Project Tree" );
+        group->add( &m_appendClassNameToUiText );
+        group->add( &m_appendFieldKeywordToToolTipText );
+        group->add( &m_showViewIdInProjectTree );
+    }
+
+    {
+        caf::PdmUiGroup* group = uiOrdering.addNewGroup( "3D View" );
+        group->add( &m_useShaders );
+        group->add( &m_showHud );
+    }
+
+    uiOrdering.add( &m_gtestFilter );
+    uiOrdering.add( &m_showProjectChangedDialog );
+    uiOrdering.add( &m_showTestToolbar );
+    uiOrdering.add( &m_includeFractureDebugInfoFile );
+    uiOrdering.add( &m_holoLensExportFolder );
+    uiOrdering.add( &m_showProgressBar );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo>
+    RiaPreferencesSystem::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly )
+{
+    QList<caf::PdmOptionItemInfo> options;
+    *useOptionsOnly = true;
+
+    /*
+        if ( fieldNeedingOptions == &m_summaryReader )
+        {
+            std::vector<SummaryReaderMode> availableModes;
+
+    #ifdef USE_HDF5
+            availableModes.push_back( SummaryReaderMode::HDF5_OPM_COMMON );
+    #endif // USE_HDF5
+            availableModes.push_back( SummaryReaderMode::LIBECL );
+            availableModes.push_back( SummaryReaderMode::OPM_COMMON );
+
+            for ( auto enumValue : availableModes )
+            {
+                options.push_back( caf::PdmOptionItemInfo( SummaryReaderModeType::uiText( enumValue ), enumValue ) );
+            }
+        }
+        else if ( fieldNeedingOptions == &m_gridImportMode )
+        {
+            // Manual option handling in order to one only a subset of the enum values
+            SummaryRestartFilesImportModeType skip( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT );
+            SummaryRestartFilesImportModeType separate(
+    RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES );
+
+            options.push_back(
+                caf::PdmOptionItemInfo( skip.uiText(), RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT
+    ) ); options.push_back( caf::PdmOptionItemInfo( separate.uiText(),
+                                                       RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES
+    ) );
+        }
+        else if ( fieldNeedingOptions == &m_summaryEnsembleImportMode )
+        {
+            // Manual option handling in order to one only a subset of the enum values
+            SummaryRestartFilesImportModeType skip( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT );
+            SummaryRestartFilesImportModeType allowImport( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT
+    );
+
+            options.push_back(
+                caf::PdmOptionItemInfo( skip.uiText(), RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT
+    ) ); options.push_back( caf::PdmOptionItemInfo( allowImport.uiText(),
+                                                       RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ) );
+        }
+    */
+
+    return options;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaPreferencesSystem::defineEditorAttribute( const caf::PdmFieldHandle* field,
+                                                  QString                    uiConfigName,
+                                                  caf::PdmUiEditorAttribute* attribute )
+{
+    if ( field == &m_holoLensExportFolder )
+    {
+        caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>( attribute );
+        if ( myAttr )
+        {
+            myAttr->m_selectDirectory = true;
+        }
+    }
+}

ApplicationLibCode/Application/RiaPreferencesSystem.h

@@ -0,0 +1,73 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2021     Equinor ASA
+//
+//  ResInsight is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
+//  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//  FITNESS FOR A PARTICULAR PURPOSE.
+//
+//  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafAppEnum.h"
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+class RiaPreferencesSystem : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+
+public:
+public:
+    RiaPreferencesSystem();
+
+    static RiaPreferencesSystem* current();
+
+    bool    appendClassNameToUiText() const;
+    bool    appendFieldKeywordToToolTipText() const;
+    bool    showViewIdInProjectTree() const;
+    bool    showTestToolbar() const;
+    bool    includeFractureDebugInfoFile() const;
+    bool    showProjectChangedDialog() const;
+    QString holoLensExportFolder() const;
+    bool    useShaders() const;
+    bool    show3dInformation() const;
+    QString gtestFilter() const;
+    bool    showProgressBar() const;
+
+protected:
+    void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
+                                                         bool*                      useOptionsOnly ) override;
+    void                          defineEditorAttribute( const caf::PdmFieldHandle* field,
+                                                         QString                    uiConfigName,
+                                                         caf::PdmUiEditorAttribute* attribute ) override;
+
+private:
+    caf::PdmField<bool> m_appendClassNameToUiText;
+    caf::PdmField<bool> m_appendFieldKeywordToToolTipText;
+    caf::PdmField<bool> m_showViewIdInProjectTree;
+    caf::PdmField<bool> m_useShaders;
+    caf::PdmField<bool> m_showHud;
+
+    caf::PdmField<bool> m_showProjectChangedDialog;
+
+    caf::PdmField<bool>    m_showTestToolbar;
+    caf::PdmField<bool>    m_includeFractureDebugInfoFile;
+    caf::PdmField<QString> m_holoLensExportFolder;
+
+    caf::PdmField<bool>    m_showProgressBar;
+    caf::PdmField<QString> m_gtestFilter;
+};

ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp

@@ -22,7 +22,7 @@
 #include "RiaFilePathTools.h"
 #include "RiaFractureDefines.h"
 #include "RiaLogging.h"
-#include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaWeightedMeanCalculator.h"
 
 #include "ExportCommands/RicExportLgrFeature.h"
@@ -113,7 +113,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
         std::unique_ptr<QTextStream>               fractureTransmissibilityExportInformationStream = nullptr;
         QFile                                      fractureTransmissibilityExportInformationFile;
 
-        RiaPreferences* prefs = RiaPreferences::current();
+        RiaPreferencesSystem* prefs = RiaPreferencesSystem::current();
         if ( prefs->includeFractureDebugInfoFile() )
         {
             QDir outputDir = QDir( exportSettings.folder );

ApplicationLibCode/Commands/HoloLensCommands/RicHoloLensSession.cpp

@@ -21,6 +21,7 @@
 
 #include "RiaLogging.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 
 #include "VdeArrayDataPacket.h"
 #include "VdeFileExporter.h"
@@ -80,7 +81,7 @@ RicHoloLensSession* RicHoloLensSession::createSession( const QString&
 
     newSession->m_sessionObserver = sessionObserver;
 
-    const QString dbgExportFolder = RiaPreferences::current()->holoLensExportFolder();
+    const QString dbgExportFolder = RiaPreferencesSystem::current()->holoLensExportFolder();
     if ( !dbgExportFolder.isEmpty() )
     {
         newSession->m_dbgFileExportDestinationFolder = dbgExportFolder;
@@ -99,7 +100,7 @@ RicHoloLensSession* RicHoloLensSession::createDummyFileBackedSession()
 
     newSession->m_isSessionValid = true;
 
-    newSession->m_dbgFileExportDestinationFolder = RiaPreferences::current()->holoLensExportFolder();
+    newSession->m_dbgFileExportDestinationFolder = RiaPreferencesSystem::current()->holoLensExportFolder();
 
     return newSession;
 }

ApplicationLibCode/ProjectDataModel/Rim3dView.cpp

@@ -24,6 +24,7 @@
 #include "RiaGuiApplication.h"
 #include "RiaOptionItemFactory.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaViewRedrawScheduler.h"
 
 #include "RicfCommandObject.h"
@@ -335,7 +336,7 @@ void Rim3dView::updateViewWidgetAfterCreation()
     this->onResetLegendsInViewer();
 
     m_viewer->updateNavigationPolicy();
-    m_viewer->enablePerfInfoHud( RiaGuiApplication::instance()->preferences()->show3dInformation() );
+    m_viewer->enablePerfInfoHud( RiaPreferencesSystem::current()->show3dInformation() );
 
     m_viewer->mainCamera()->setViewMatrix( m_cameraPosition );
     m_viewer->setPointOfInterest( m_cameraPointOfInterest() );

ApplicationLibCode/ProjectDataModel/RimViewWindow.cpp

@@ -22,7 +22,7 @@
 #include "RiaColorTools.h"
 #include "RiaFieldHandleTools.h"
 #include "RiaGuiApplication.h"
-#include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 
 #include "RicfCommandObject.h"
 
@@ -328,7 +328,7 @@ void RimViewWindow::initAfterRead()
 void RimViewWindow::defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
 {
     caf::PdmUiTreeViewItemAttribute* treeItemAttribute = dynamic_cast<caf::PdmUiTreeViewItemAttribute*>( attribute );
-    if ( treeItemAttribute && RiaPreferences::current()->showViewIdInProjectTree() && id() >= 0 )
+    if ( treeItemAttribute && RiaPreferencesSystem::current()->showViewIdInProjectTree() && id() >= 0 )
     {
         treeItemAttribute->tags.clear();
         auto tag                   = caf::PdmUiTreeViewItemAttribute::Tag::create();

ApplicationLibCode/UserInterface/RiuMainWindow.cpp

@@ -23,6 +23,7 @@
 #include "RiaBaseDefs.h"
 #include "RiaGuiApplication.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaRegressionTest.h"
 #include "RiaRegressionTestRunner.h"
 
@@ -685,7 +686,7 @@ void RiuMainWindow::createToolBars()
         toolbar->addAction( polyMeasureAction );
     }
 
-    if ( RiaPreferences::current()->showTestToolbar() )
+    if ( RiaPreferencesSystem::current()->showTestToolbar() )
     {
         QToolBar* toolbar = addToolBar( tr( "Test" ) );
         toolbar->setObjectName( toolbar->windowTitle() );
@@ -717,7 +718,7 @@ void RiuMainWindow::createDockPanels()
         m_projectTreeView = new caf::PdmUiTreeView( this );
         m_projectTreeView->enableSelectionManagerUpdating( true );
 
-        m_projectTreeView->enableAppendOfClassNameToUiItemText( RiaPreferences::current()->appendClassNameToUiText() );
+        m_projectTreeView->enableAppendOfClassNameToUiItemText( RiaPreferencesSystem::current()->appendClassNameToUiText() );
 
         dockWidget->setWidget( m_projectTreeView );
 

ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp

@@ -22,6 +22,7 @@
 #include "RiaBaseDefs.h"
 #include "RiaGuiApplication.h"
 #include "RiaPreferences.h"
+#include "RiaPreferencesSystem.h"
 #include "RiaRegressionTestRunner.h"
 #include "RiaSummaryTools.h"
 
@@ -450,7 +451,7 @@ void RiuPlotMainWindow::createDockPanels()
         m_projectTreeView = new caf::PdmUiTreeView( this );
         m_projectTreeView->enableSelectionManagerUpdating( true );
 
-        m_projectTreeView->enableAppendOfClassNameToUiItemText( RiaPreferences::current()->appendClassNameToUiText() );
+        m_projectTreeView->enableAppendOfClassNameToUiItemText( RiaPreferencesSystem::current()->appendClassNameToUiText() );
 
         dockWidget->setWidget( m_projectTreeView );