Merge pull request #6350 from OPM/merge-patch-branch

Merge patch branch
2025-02-25 18:55:39 -06:00 · 2020-08-24 09:19:08 +02:00
parent 16663ed47a 6bd99fcbea
commit b741359696
58 changed files with 360 additions and 181 deletions
--- a/ApplicationCode/Application/RiaGuiApplication.cpp
+++ b/ApplicationCode/Application/RiaGuiApplication.cpp
@@ -92,6 +92,7 @@

 #include "Riu3dSelectionManager.h"
 #include "RiuDockWidgetTools.h"
+#include "RiuFileDialogTools.h"
 #include "RiuMainWindow.h"
 #include "RiuMainWindowTools.h"
 #include "RiuMdiMaximizeWindowGuard.h"
@@ -119,7 +120,6 @@
 #include <QDesktopWidget>
 #include <QDir>
 #include <QErrorMessage>
-#include <QFileDialog>
 #include <QGridLayout>
 #include <QMdiSubWindow>
 #include <QMessageBox>
@@ -241,8 +241,10 @@ QString RiaGuiApplication::promptForProjectSaveAsFileName() const
        startPath += "/ResInsightProject.rsp";
    }

-    QString fileName =
-        QFileDialog::getSaveFileName( nullptr, tr( "Save File" ), startPath, tr( "Project Files (*.rsp);;All files(*.*)" ) );
+    QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
+                                                            tr( "Save File" ),
+                                                            startPath,
+                                                            tr( "Project Files (*.rsp);;All files(*.*)" ) );
    return fileName;
 }

--- a/ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp
+++ b/ApplicationCode/Commands/AnnotationCommands/RicImportPolylinesAnnotationFeature.cpp
@@ -27,11 +27,12 @@
 #include "RimProject.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

-#include <cafSelectionManagerTools.h>
+#include "cafSelectionManagerTools.h"

 CAF_CMD_SOURCE_INIT( RicImportPolylinesAnnotationFeature, "RicImportPolylinesAnnotationFeature" );

@@ -55,10 +56,11 @@ void RicImportPolylinesAnnotationFeature::onActionTriggered( bool isChecked )
 {
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QStringList     fileNames  = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Import Poly Lines Annotation",
-                                                           defaultDir,
-                                                           "Text Files (*.txt);;Polylines (*.dat);;All Files (*.*)" );
+    QStringList     fileNames =
+        RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                              "Import Poly Lines Annotation",
+                                              defaultDir,
+                                              "Text Files (*.txt);;Polylines (*.dat);;All Files (*.*)" );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/ApplicationCommands/RicExportObjectAndFieldKeywordsFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicExportObjectAndFieldKeywordsFeature.cpp
@@ -20,6 +20,7 @@

 #include "RiaVersionInfo.h"

+#include "RiuFileDialogTools.h"
 #include "RiuMainWindow.h"

 #include "cafClassTypeName.h"
@@ -29,7 +30,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QDateTime>
-#include <QFileDialog>
+#include <QFile>
 #include <QTextStream>

 CAF_CMD_SOURCE_INIT( RicExportObjectAndFieldKeywordsFeature, "RicExportObjectAndFieldKeywordsFeature" );
@@ -47,10 +48,9 @@ bool RicExportObjectAndFieldKeywordsFeature::isCommandEnabled()
 //--------------------------------------------------------------------------------------------------
 void RicExportObjectAndFieldKeywordsFeature::onActionTriggered( bool isChecked )
 {
-    QString dir = QFileDialog::getExistingDirectory( RiuMainWindow::instance(),
-                                                     tr( "Select Directory For Export" ),
-                                                     "c:/temp",
-                                                     QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+    QString dir = RiuFileDialogTools::getExistingDirectory( RiuMainWindow::instance(),
+                                                            tr( "Select Directory For Export" ),
+                                                            "c:/temp" );

    if ( !dir.isEmpty() )
    {
--- a/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicOpenProjectFeature.cpp
@@ -20,10 +20,11 @@

 #include "RiaGuiApplication.h"

+#include "RiuFileDialogTools.h"
 #include "RiuMainWindow.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QStyle>

 CAF_CMD_SOURCE_INIT( RicOpenProjectFeature, "RicOpenProjectFeature" );
@@ -46,10 +47,10 @@ void RicOpenProjectFeature::onActionTriggered( bool isChecked )
    if ( !app->askUserToSaveModifiedProject() ) return;

    QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QString fileName   = QFileDialog::getOpenFileName( nullptr,
-                                                     "Open ResInsight Project",
-                                                     defaultDir,
-                                                     "ResInsight project (*.rsp *.rip);;All files(*.*)" );
+    QString fileName   = RiuFileDialogTools::getOpenFileName( nullptr,
+                                                            "Open ResInsight Project",
+                                                            defaultDir,
+                                                            "ResInsight project (*.rsp *.rip);;All files(*.*)" );

    if ( fileName.isEmpty() ) return;

--- a/ApplicationCode/Commands/ApplicationCommands/RicRunCommandFileFeature.cpp
+++ b/ApplicationCode/Commands/ApplicationCommands/RicRunCommandFileFeature.cpp
@@ -20,10 +20,11 @@

 #include "RiaApplication.h"
 #include "RicfCommandFileExecutor.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
 #include <QDir>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicRunCommandFileFeature, "RicRunCommandFileFeature" );

@@ -43,10 +44,10 @@ void RicRunCommandFileFeature::onActionTriggered( bool isChecked )
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectoryWithFallbackToProjectFolder( "COMMAND_FILE" );

-    QString fileName = QFileDialog::getOpenFileName( nullptr,
-                                                     "Open ResInsight Command File",
-                                                     defaultDir,
-                                                     "ResInsight Command File (*.txt);;All files(*.*)" );
+    QString fileName = RiuFileDialogTools::getOpenFileName( nullptr,
+                                                            "Open ResInsight Command File",
+                                                            defaultDir,
+                                                            "ResInsight Command File (*.txt);;All files(*.*)" );

    if ( !fileName.isEmpty() )
    {
--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportCompletionsFileFeature.cpp
@@ -28,11 +28,12 @@
 #include "RimWellPathCompletions.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicWellPathImportCompletionsFileFeature, "RicWellPathImportCompletionsFileFeature" );

@@ -59,13 +60,13 @@ void RicWellPathImportCompletionsFileFeature::onActionTriggered( bool isChecked
    CVF_ASSERT( fishbonesWellPathCollection );

    // Open dialog box to select well path files
-    RiaApplication* app        = RiaApplication::instance();
-    QString         defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
-    QStringList     wellPathFilePaths =
-        QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                       "Import Fishbone Laterals",
-                                       defaultDir,
-                                       "Well Path Laterals (*.json *.asc *.asci *.ascii *.dev);;All Files (*.*)" );
+    RiaApplication* app               = RiaApplication::instance();
+    QString         defaultDir        = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
+    QStringList     wellPathFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                          "Import Fishbone Laterals",
+                                                                          defaultDir,
+                                                                          "Well Path Laterals (*.json *.asc *.asci "
+                                                                          "*.ascii *.dev);;All Files (*.*)" );

    if ( wellPathFilePaths.size() < 1 ) return;

--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathImportPerforationIntervalsFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathImportPerforationIntervalsFeature.cpp
@@ -30,11 +30,12 @@
 #include "RifPerforationIntervalReader.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicWellPathImportPerforationIntervalsFeature, "RicWellPathImportPerforationIntervalsFeature" );

@@ -63,10 +64,10 @@ void RicWellPathImportPerforationIntervalsFeature::onActionTriggered( bool isChe
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
    QStringList     wellPathFilePaths =
-        QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                       "Import Well Path Perforation Intervals",
-                                       defaultDir,
-                                       "Well Path Perforation Intervals (*.ev);;All Files (*.*)" );
+        RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                              "Import Well Path Perforation Intervals",
+                                              defaultDir,
+                                              "Well Path Perforation Intervals (*.ev);;All Files (*.*)" );

    if ( wellPathFilePaths.size() < 1 ) return;

--- a/ApplicationCode/Commands/EclipseCommands/RicAddEclipseInputPropertyFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicAddEclipseInputPropertyFeature.cpp
@@ -27,11 +27,11 @@

 #include "RiaApplication.h"
 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QStringList>

@@ -67,10 +67,10 @@ void RicAddEclipseInputPropertyFeature::onActionTriggered( bool isChecked )

    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectoryWithFallback( "INPUT_FILES", casePath );
-    QStringList     fileNames  = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Select Eclipse Input Property Files",
-                                                           defaultDir,
-                                                           "All Files (*.* *)" );
+    QStringList     fileNames  = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                  "Select Eclipse Input Property Files",
+                                                                  defaultDir,
+                                                                  "All Files (*.* *)" );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp
@@ -24,11 +24,12 @@
 #include "RimEclipseCaseCollection.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportEclipseCaseFeature, "RicImportEclipseCaseFeature" );

@@ -48,10 +49,10 @@ void RicImportEclipseCaseFeature::onActionTriggered( bool isChecked )
    RiaApplication* app = RiaApplication::instance();

    QString     defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QStringList fileNames  = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Import Eclipse File",
-                                                           defaultDir,
-                                                           "Eclipse Grid Files (*.GRID *.EGRID)" );
+    QStringList fileNames  = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                  "Import Eclipse File",
+                                                                  defaultDir,
+                                                                  "Eclipse Grid Files (*.GRID *.EGRID)" );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseTimeStepFilterFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseTimeStepFilterFeature.cpp
@@ -22,9 +22,9 @@
 #include "RiaImportEclipseCaseTools.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportEclipseCaseTimeStepFilterFeature, "RicImportEclipseCaseTimeStepFilterFeature" );
@@ -37,10 +37,10 @@ void RicImportEclipseCaseTimeStepFilterFeature::onActionTriggered( bool isChecke
    RiaApplication* app = RiaApplication::instance();

    QString defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QString fileName   = QFileDialog::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(),
-                                                     "Import Eclipse File",
-                                                     defaultDir,
-                                                     "Eclipse Grid Files (*.GRID *.EGRID)" );
+    QString fileName   = RiuFileDialogTools::getOpenFileName( Riu3DMainWindowTools::mainWindowWidget(),
+                                                            "Import Eclipse File",
+                                                            defaultDir,
+                                                            "Eclipse Grid Files (*.GRID *.EGRID)" );
    if ( !fileName.isEmpty() )
    {
        defaultDir = QFileInfo( fileName ).absolutePath();
--- a/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportEclipseCasesFeature.cpp
@@ -32,7 +32,7 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportEclipseCasesFeature, "RicImportEclipseCasesFeature" );

--- a/ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp
@@ -34,7 +34,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature" );

--- a/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportFaultsFeature.cpp
@@ -31,11 +31,12 @@
 #include "RimEclipseCase.h"
 #include "RimFaultInView.h"

+#include "RiuFileDialogTools.h"
+
 #include "cafSelectionManager.h"
 #include "cafUtils.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicExportFaultsFeature, "RicExportFaultsFeature" );

@@ -66,7 +67,7 @@ void RicExportFaultsFeature::onActionTriggered( bool isChecked )

    QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder( "FAULTS" );

-    QString selectedDir = QFileDialog::getExistingDirectory( nullptr, tr( "Select Directory" ), defaultDir );
+    QString selectedDir = RiuFileDialogTools::getExistingDirectory( nullptr, tr( "Select Directory" ), defaultDir );

    if ( selectedDir.isNull() )
    {
--- a/ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportSelectedWellPathsFeature.cpp
@@ -37,7 +37,8 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QDir>
+#include <QFileInfo>

 #include <cafUtils.h>

--- a/ApplicationCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportToLasFileFeature.cpp
@@ -36,7 +36,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicExportToLasFileFeature, "RicExportToLasFileFeature" );

--- a/ApplicationCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicExportVisibleWellPathsFeature.cpp
@@ -34,7 +34,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotAllPlotsToFileFeature.cpp
@@ -35,7 +35,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
+#include <QDir>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
@@ -43,7 +43,7 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
+#include <QDir>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToClipboardFeature.cpp
@@ -32,7 +32,6 @@
 #include <QAction>
 #include <QClipboard>
 #include <QDebug>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMdiSubWindow>

--- a/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp
+++ b/ApplicationCode/Commands/ExportCommands/RicSnapshotViewToFileFeature.cpp
@@ -27,6 +27,8 @@
 #include "RimPlotWindow.h"
 #include "RimProject.h"
 #include "RimViewWindow.h"
+
+#include "RiuFileDialogTools.h"
 #include "RiuPlotMainWindow.h"

 #include "RicSnapshotFilenameGenerator.h"
@@ -37,7 +39,6 @@
 #include <QClipboard>
 #include <QDebug>
 #include <QDesktopWidget>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMdiSubWindow>
 #include <QPageLayout>
@@ -210,11 +211,11 @@ QString RicSnapshotViewToFileFeature::generateSaveFileName( const QString& defau
    {
        selectedExtension = pdfFilter;
    }
-    QString fileName = QFileDialog::getSaveFileName( nullptr,
-                                                     tr( "Export to File" ),
-                                                     defaultAbsFileName,
-                                                     fileExtensionFilter,
-                                                     &selectedExtension );
+    QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
+                                                            tr( "Export to File" ),
+                                                            defaultAbsFileName,
+                                                            fileExtensionFilter,
+                                                            &selectedExtension );
    if ( !fileName.isEmpty() )
    {
        // Remember the directory to next time
--- a/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp
+++ b/ApplicationCode/Commands/FractureCommands/RicNewStimPlanFractureTemplateFeature.cpp
@@ -29,13 +29,14 @@
 #include "RimWellPathFracture.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafSelectionManager.h"

 #include "cvfAssert.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicNewStimPlanFractureTemplateFeature, "RicNewStimPlanFractureTemplateFeature" );

@@ -78,10 +79,10 @@ std::vector<RimStimPlanFractureTemplate*> RicNewStimPlanFractureTemplateFeature:
 {
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QStringList     fileNames  = QFileDialog::getOpenFileNames( nullptr,
-                                                           "Open StimPlan XML File",
-                                                           defaultDir,
-                                                           "StimPlan XML File (*.xml);;All files(*.*)" );
+    QStringList     fileNames  = RiuFileDialogTools::getOpenFileNames( nullptr,
+                                                                  "Open StimPlan XML File",
+                                                                  defaultDir,
+                                                                  "StimPlan XML File (*.xml);;All files(*.*)" );

    if ( fileNames.isEmpty() ) return std::vector<RimStimPlanFractureTemplate*>();

--- a/ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp
+++ b/ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp
@@ -27,11 +27,11 @@

 #include "RimScriptCollection.h"
 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cvfAssert.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicAddScriptPathFeature, "RicAddScriptPathFeature" );

@@ -50,7 +50,7 @@ bool RicAddScriptPathFeature::isCommandEnabled()
 void RicAddScriptPathFeature::onActionTriggered( bool isChecked )
 {
    QString selectedFolder =
-        QFileDialog::getExistingDirectory( Riu3DMainWindowTools::mainWindowWidget(), "Select script folder" );
+        RiuFileDialogTools::getExistingDirectory( Riu3DMainWindowTools::mainWindowWidget(), "Select script folder" );
    if ( !selectedFolder.isEmpty() )
    {
        QString filePathString = RiaApplication::instance()->preferences()->scriptDirectories();
--- a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.cpp
+++ b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromSelectionFeature.cpp
@@ -31,7 +31,6 @@
 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicCreatePlotFromSelectionFeature, "RicCreatePlotFromSelectionFeature" );

--- a/ApplicationCode/Commands/PlotTemplateCommands/RicSavePlotTemplateFeature.cpp
+++ b/ApplicationCode/Commands/PlotTemplateCommands/RicSavePlotTemplateFeature.cpp
@@ -32,12 +32,15 @@
 #include "RimSummaryCurve.h"
 #include "RimSummaryPlot.h"

+#include "RiuFileDialogTools.h"
+
 #include "cafPdmObject.h"
 #include "cafSelectionManager.h"
 #include "cafUtils.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFile>
+#include <QFileInfo>
 #include <QMessageBox>

 CAF_CMD_SOURCE_INIT( RicSavePlotTemplateFeature, "RicSavePlotTemplateFeature" );
@@ -75,10 +78,10 @@ void RicSavePlotTemplateFeature::onActionTriggered( bool isChecked )

    startPath = startPath + "/" + templateCandidateName + ".rpt";

-    QString fileName = QFileDialog::getSaveFileName( nullptr,
-                                                     tr( "Save Plot Template To File" ),
-                                                     startPath,
-                                                     tr( "Plot Template Files (*.rpt);;All files(*.*)" ) );
+    QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
+                                                            tr( "Save Plot Template To File" ),
+                                                            startPath,
+                                                            tr( "Plot Template Files (*.rpt);;All files(*.*)" ) );
    if ( !fileName.isEmpty() )
    {
        QFile exportFile( fileName );
--- a/ApplicationCode/Commands/RicConvertGroupToEnsembleFeature.cpp
+++ b/ApplicationCode/Commands/RicConvertGroupToEnsembleFeature.cpp
@@ -42,7 +42,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp
+++ b/ApplicationCode/Commands/RicExportContourMapToTextFeature.cpp
@@ -42,7 +42,7 @@
 #include "cafUtils.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 #include <cmath>

--- a/ApplicationCode/Commands/RicImportElementPropertyFeature.cpp
+++ b/ApplicationCode/Commands/RicImportElementPropertyFeature.cpp
@@ -26,8 +26,10 @@
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"

+#include "RiuFileDialogTools.h"
+
 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportElementPropertyFeature, "RicImportElementPropertyFeature" );

@@ -56,7 +58,7 @@ void RicImportElementPropertyFeature::importElementProperties()

    QString     defaultDir = app->lastUsedDialogDirectory( "ELM_PROPS" );
    QStringList fileNames =
-        QFileDialog::getOpenFileNames( nullptr, "Import Element Property Table", defaultDir, "Property Table (*.inp)" );
+        RiuFileDialogTools::getOpenFileNames( nullptr, "Import Element Property Table", defaultDir, "Property Table (*.inp)" );

    if ( !fileNames.empty() )
    {
--- a/ApplicationCode/Commands/RicImportEnsembleFeature.cpp
+++ b/ApplicationCode/Commands/RicImportEnsembleFeature.cpp
@@ -44,7 +44,6 @@
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp
+++ b/ApplicationCode/Commands/RicImportFormationNamesFeature.cpp
@@ -36,14 +36,18 @@
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "RimColorLegend.h"
 #include "RimColorLegendCollection.h"
 #include "RimColorLegendItem.h"
 #include "RimRegularLegendConfig.h"

+#include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"
+
 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportFormationNamesFeature, "RicImportFormationNamesFeature" );

@@ -98,7 +102,7 @@ bool RicImportFormationNamesFeature::isCommandEnabled()

 //--------------------------------------------------------------------------------------------------
 /// If only one formation file is imported, the formation will automatically be set in the active
-/// view<65>s case. Import of LYR files with colors create custom color legends according to color
+/// view<65>s case. Import of LYR files with colors create custom color legends according to color
 /// definition on each file. However, color legend must be set by the user.
 //--------------------------------------------------------------------------------------------------
 void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
@@ -110,10 +114,10 @@ void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
        QString( "Formation Names description File (*.lyr);;FMU Layer Zone Table(%1);;All Files (*.*)" )
            .arg( RimFormationNames::layerZoneTableFileName() );

-    QStringList fileNames = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Import Formation Names",
-                                                           defaultDir,
-                                                           filterText );
+    QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                  "Import Formation Names",
+                                                                  defaultDir,
+                                                                  filterText );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
+++ b/ApplicationCode/Commands/RicImportGeneralDataFeature.cpp
@@ -28,9 +28,10 @@
 #include "RimSummaryCase.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QString>
 #include <QStringList>

@@ -197,8 +198,10 @@ QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefin

    QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileType ) );

-    QStringList fileNames =
-        QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Data File", defaultDir, fullPattern );
+    QStringList fileNames = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                  "Import Data File",
+                                                                  defaultDir,
+                                                                  fullPattern );
    return fileNames;
 }

--- a/ApplicationCode/Commands/RicImportGeoMechCaseFeature.cpp
+++ b/ApplicationCode/Commands/RicImportGeoMechCaseFeature.cpp
@@ -20,8 +20,10 @@

 #include "RiaApplication.h"

+#include "RiuFileDialogTools.h"
+
 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseFeature, "RicImportGeoMechCaseFeature" );

@@ -42,7 +44,7 @@ void RicImportGeoMechCaseFeature::onActionTriggered( bool isChecked )

    QString     defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
    QStringList fileNames =
-        QFileDialog::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
+        RiuFileDialogTools::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
    if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath();
    app->setLastUsedDialogDirectory( "GEOMECH_MODEL", defaultDir );

--- a/ApplicationCode/Commands/RicImportGeoMechCaseTimeStepFilterFeature.cpp
+++ b/ApplicationCode/Commands/RicImportGeoMechCaseTimeStepFilterFeature.cpp
@@ -22,9 +22,9 @@
 #include "RiaImportEclipseCaseTools.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportGeoMechCaseTimeStepFilterFeature, "RicImportGeoMechCaseTimeStepFilterFeature" );
@@ -38,7 +38,7 @@ void RicImportGeoMechCaseTimeStepFilterFeature::onActionTriggered( bool isChecke

    QString     defaultDir = app->lastUsedDialogDirectory( "GEOMECH_MODEL" );
    QStringList fileNames =
-        QFileDialog::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
+        RiuFileDialogTools::getOpenFileNames( nullptr, "Import Geo-Mechanical Model", defaultDir, "Abaqus results (*.odb)" );
    if ( fileNames.size() ) defaultDir = QFileInfo( fileNames.last() ).absolutePath();
    for ( QString fileName : fileNames )
    {
--- a/ApplicationCode/Commands/RicImportObservedDataFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedDataFeature.cpp
@@ -26,12 +26,13 @@
 #include "RimProject.h"
 #include "RimSummaryObservedDataFile.h"

+#include "RiuFileDialogTools.h"
 #include "RiuPlotMainWindowTools.h"

 #include "cafSelectionManager.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 CAF_CMD_SOURCE_INIT( RicImportObservedDataFeature, "RicImportObservedDataFeature" );
@@ -43,10 +44,11 @@ void RicImportObservedDataFeature::selectObservedDataFileInDialog()
 {
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "INPUT_FILES" );
-    QStringList     fileNames  = QFileDialog::getOpenFileNames( nullptr,
-                                                           "Import Observed Data",
-                                                           defaultDir,
-                                                           "Observed Data (*.RSM *.txt *.csv);;All Files (*.*)" );
+    QStringList     fileNames =
+        RiuFileDialogTools::getOpenFileNames( nullptr,
+                                              "Import Observed Data",
+                                              defaultDir,
+                                              "Observed Data (*.RSM *.txt *.csv);;All Files (*.*)" );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedDataInMenuFeature.cpp
@@ -26,7 +26,6 @@
 #include "RimSummaryObservedDataFile.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportObservedDataInMenuFeature, "RicImportObservedDataInMenuFeature" );

--- a/ApplicationCode/Commands/RicImportObservedFmuDataFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedFmuDataFeature.cpp
@@ -33,6 +33,7 @@
 #include "RimOilField.h"
 #include "RimProject.h"

+#include "RiuFileDialogTools.h"
 #include "RiuPlotMainWindowTools.h"

 #include "cafPdmObject.h"
@@ -40,7 +41,6 @@

 #include <QAction>
 #include <QDir>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QMessageBox>

@@ -53,10 +53,9 @@ void RicImportObservedFmuDataFeature::selectObservedDataPathInDialog()
 {
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "SUMMARY_CASE_DIR" );
-    QString         directory  = QFileDialog::getExistingDirectory( nullptr,
-                                                           "Import Observed FMU Data Recursively from Directory",
-                                                           defaultDir,
-                                                           QFileDialog::ShowDirsOnly );
+    QString         directory  = RiuFileDialogTools::getExistingDirectory( nullptr,
+                                                                  "Import Observed FMU Data Recursively from Directory",
+                                                                  defaultDir );

    QStringList subDirsWithFmuData = RifReaderFmuRft::findSubDirectoriesWithFmuRftData( directory );
    if ( subDirsWithFmuData.empty() )
--- a/ApplicationCode/Commands/RicImportObservedFmuDataInMenuFeature.cpp
+++ b/ApplicationCode/Commands/RicImportObservedFmuDataInMenuFeature.cpp
@@ -26,7 +26,6 @@
 #include "RimSummaryObservedDataFile.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataInMenuFeature, "RicImportObservedFmuDataInMenuFeature" );

--- a/ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
@@ -33,7 +33,6 @@
 #include "RiuPlotMainWindow.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature" );

--- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
@@ -51,7 +51,7 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 CAF_CMD_SOURCE_INIT( RicImportSummaryCasesFeature, "RicImportSummaryCasesFeature" );
--- a/ApplicationCode/Commands/RicImportSummaryGroupFeature.cpp
+++ b/ApplicationCode/Commands/RicImportSummaryGroupFeature.cpp
@@ -40,7 +40,6 @@
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"

 #include <QAction>
-#include <QFileDialog>
 #include <QInputDialog>
 #include <QMessageBox>

--- a/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp
+++ b/ApplicationCode/Commands/RicRecursiveFileSearchDialog.cpp
@@ -21,13 +21,14 @@
 #include "RiaFilePathTools.h"
 #include "RiaGuiApplication.h"

+#include "RiuFileDialogTools.h"
 #include "RiuTools.h"

 #include <QAbstractItemView>
 #include <QAction>
 #include <QClipboard>
 #include <QDialogButtonBox>
-#include <QFileDialog>
+#include <QDir>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
@@ -711,7 +712,7 @@ void RicRecursiveFileSearchDialog::slotDialogCancelClicked()
 //--------------------------------------------------------------------------------------------------
 void RicRecursiveFileSearchDialog::slotBrowseButtonClicked()
 {
-    QString folder = QFileDialog::getExistingDirectory( this, "Select folder", rootDirWithEndSeparator() );
+    QString folder = RiuFileDialogTools::getExistingDirectory( this, "Select folder", rootDirWithEndSeparator() );
    RiaFilePathTools::appendSeparatorIfNo( folder );
    folder += "*";
    if ( !folder.isEmpty() ) m_pathFilterField->setText( QDir::toNativeSeparators( folder ) );
--- a/ApplicationCode/Commands/RicResampleDialog.cpp
+++ b/ApplicationCode/Commands/RicResampleDialog.cpp
@@ -24,7 +24,6 @@
 #include <QAction>
 #include <QComboBox>
 #include <QDialogButtonBox>
-#include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
--- a/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
+++ b/ApplicationCode/Commands/RicSummaryCaseRestartDialog.cpp
@@ -41,7 +41,8 @@
 #include <QClipboard>
 #include <QDateTime>
 #include <QDialogButtonBox>
-#include <QFileDialog>
+#include <QDir>
+#include <QFileInfo>
 #include <QGroupBox>
 #include <QLabel>
 #include <QLineEdit>
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
@@ -26,6 +26,7 @@

 #include "RimSummaryPlot.h"

+#include "RiuFileDialogTools.h"
 #include "RiuMainWindow.h"

 #include "cafPdmUiPropertyViewDialog.h"
@@ -37,7 +38,6 @@

 #include <QAction>
 #include <QDebug>
-#include <QFileDialog>
 #include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicAsciiExportSummaryPlotFeature, "RicAsciiExportSummaryPlotFeature" );
@@ -138,10 +138,10 @@ QString RicAsciiExportSummaryPlotFeature::getFileNameFromUserDialog( const QStri
                                                                     const QString& defaultDir )
 {
    QString defaultFileName = defaultDir + "/" + caf::Utils::makeValidFileBasename( fileNameCandidate ) + ".ascii";
-    QString fileName        = QFileDialog::getSaveFileName( nullptr,
-                                                     "Select File for Summary Plot Export",
-                                                     defaultFileName,
-                                                     "Text File(*.ascii);;All files(*.*)" );
+    QString fileName        = RiuFileDialogTools::getSaveFileName( nullptr,
+                                                            "Select File for Summary Plot Export",
+                                                            defaultFileName,
+                                                            "Text File(*.ascii);;All files(*.*)" );
    return fileName;
 }

--- a/ApplicationCode/Commands/SurfaceCommands/RicImportSurfacesFeature.cpp
+++ b/ApplicationCode/Commands/SurfaceCommands/RicImportSurfacesFeature.cpp
@@ -26,9 +26,10 @@
 #include "RimSurfaceCollection.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportSurfacesFeature, "RicImportSurfacesFeature" );

@@ -47,10 +48,10 @@ void RicImportSurfacesFeature::onActionTriggered( bool isChecked )
 {
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "BINARY_GRID" );
-    QStringList     fileNames  = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                           "Import Surfaces",
-                                                           defaultDir,
-                                                           "Surface files (*.ptl *.ts);;All Files (*.*)" );
+    QStringList     fileNames  = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                  "Import Surfaces",
+                                                                  defaultDir,
+                                                                  "Surface files (*.ptl *.ts);;All Files (*.*)" );

    if ( fileNames.isEmpty() ) return;

--- a/ApplicationCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicAsciiExportWellLogPlotFeature.cpp
@@ -23,6 +23,7 @@

 #include "RimWellLogPlot.h"

+#include "RiuFileDialogTools.h"
 #include "RiuMainWindow.h"

 #include "cafPdmUiPropertyViewDialog.h"
@@ -33,7 +34,7 @@

 #include <QAction>
 #include <QDebug>
-#include <QFileDialog>
+#include <QDir>
 #include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicAsciiExportWellLogPlotFeature, "RicAsciiExportWellLogPlotFeature" );
@@ -66,10 +67,10 @@ void RicAsciiExportWellLogPlotFeature::onActionTriggered( bool isChecked )
        RimWellLogPlot* wellLogPlot     = selectedWellLogPlots.at( 0 );
        QString         defaultFileName = defaultDir + "/" +
                                  caf::Utils::makeValidFileBasename( ( wellLogPlot->description() ) ) + ".ascii";
-        QString fileName = QFileDialog::getSaveFileName( nullptr,
-                                                         "Select File for Plot Data Export",
-                                                         defaultFileName,
-                                                         "Text File(*.ascii);;All files(*.*)" );
+        QString fileName = RiuFileDialogTools::getSaveFileName( nullptr,
+                                                                "Select File for Plot Data Export",
+                                                                defaultFileName,
+                                                                "Text File(*.ascii);;All files(*.*)" );
        if ( fileName.isEmpty() ) return;
        RicAsciiExportWellLogPlotFeature::exportAsciiForWellLogPlot( fileName, wellLogPlot );

--- a/ApplicationCode/Commands/WellLogCommands/RicMoveWellLogFilesFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicMoveWellLogFilesFeature.cpp
@@ -28,7 +28,6 @@
 #include "cafSelectionManagerTools.h"

 #include <QAction>
-#include <QFileDialog>

 CAF_CMD_SOURCE_INIT( RicMoveWellLogFilesFeature, "RicMoveWellLogFilesFeature" );

--- a/ApplicationCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp
+++ b/ApplicationCode/Commands/WellLogCommands/RicWellLogsImportFileFeature.cpp
@@ -25,11 +25,12 @@

 #include "RimProject.h"
 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafPdmUiObjectEditorHandle.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 CAF_CMD_SOURCE_INIT( RicWellLogsImportFileFeature, "RicWellLogsImportFileFeature" );
@@ -80,10 +81,10 @@ void RicWellLogsImportFileFeature::onActionTriggered( bool isChecked )
    RiaApplication* app        = RiaApplication::instance();
    QString         defaultDir = app->lastUsedDialogDirectory( "WELL_LOGS_DIR" );
    QString nameFilterString = QString( "Well Logs (%1);;All Files (*.*)" ).arg( wellLogFileNameFilters().join( " " ) );
-    QStringList wellLogFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                                  "Import Well Logs",
-                                                                  defaultDir,
-                                                                  nameFilterString );
+    QStringList wellLogFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                         "Import Well Logs",
+                                                                         defaultDir,
+                                                                         nameFilterString );

    if ( wellLogFilePaths.size() >= 1 )
    {
--- a/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellMeasurementsFeature.cpp
@@ -25,9 +25,10 @@
 #include "RicWellMeasurementImportTools.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicImportWellMeasurementsFeature, "RicImportWellMeasurementsFeature" );

@@ -48,12 +49,13 @@ void RicImportWellMeasurementsFeature::onActionTriggered( bool isChecked )
    CVF_ASSERT( wellPathCollection );

    // Open dialog box to select well path files
-    RiaApplication* app               = RiaApplication::instance();
-    QString         defaultDir        = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
-    QStringList     wellPathFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                                   "Import Well Measurements",
-                                                                   defaultDir,
-                                                                   "Well Measurements (*.csv);;All Files (*.*)" );
+    RiaApplication* app        = RiaApplication::instance();
+    QString         defaultDir = app->lastUsedDialogDirectory( "WELLPATH_DIR" );
+    QStringList     wellPathFilePaths =
+        RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                              "Import Well Measurements",
+                                              defaultDir,
+                                              "Well Measurements (*.csv);;All Files (*.*)" );

    if ( wellPathFilePaths.size() < 1 ) return;

--- a/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
@@ -30,11 +30,12 @@
 #include "RimWellPathCollection.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include "cafPdmFieldIOScriptability.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QDir>
 #include <QMessageBox>

 //==================================================================================================
@@ -216,8 +217,10 @@ void RicImportWellPaths::onActionTriggered( bool isChecked )

    QString nameList = QString( "Well Paths (%1);;All Files (*.*)" ).arg( wellPathNameFilters().join( " " ) );

-    QStringList wellPathFilePaths =
-        QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(), "Import Well Paths", defaultDir, nameList );
+    QStringList wellPathFilePaths = RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                                                          "Import Well Paths",
+                                                                          defaultDir,
+                                                                          nameList );

    if ( wellPathFilePaths.size() >= 1 )
    {
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathFormationsImportFileFeature.cpp
@@ -27,9 +27,10 @@
 #include "RimWellPathCollection.h"

 #include "Riu3DMainWindowTools.h"
+#include "RiuFileDialogTools.h"

 #include <QAction>
-#include <QFileDialog>
+#include <QFileInfo>

 CAF_CMD_SOURCE_INIT( RicWellPathFormationsImportFileFeature, "RicWellPathFormationsImportFileFeature" );

@@ -47,12 +48,13 @@ bool RicWellPathFormationsImportFileFeature::isCommandEnabled()
 void RicWellPathFormationsImportFileFeature::onActionTriggered( bool isChecked )
 {
    // Open dialog box to select well path formations files
-    RiaApplication* app                     = RiaApplication::instance();
-    QString         defaultDir              = app->lastUsedDialogDirectory( "WELLPATHFORMATIONS_DIR" );
-    QStringList wellPathFormationsFilePaths = QFileDialog::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
-                                                                             "Import Well Picks",
-                                                                             defaultDir,
-                                                                             "Well Picks (*.csv);;All Files (*.*)" );
+    RiaApplication* app        = RiaApplication::instance();
+    QString         defaultDir = app->lastUsedDialogDirectory( "WELLPATHFORMATIONS_DIR" );
+    QStringList     wellPathFormationsFilePaths =
+        RiuFileDialogTools::getOpenFileNames( Riu3DMainWindowTools::mainWindowWidget(),
+                                              "Import Well Picks",
+                                              defaultDir,
+                                              "Well Picks (*.csv);;All Files (*.*)" );

    if ( wellPathFormationsFilePaths.size() < 1 ) return;

--- a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.cpp
@@ -161,21 +161,18 @@ void RimWellFlowRateCurve::onLoadDataAndUpdate( bool updateParentPlot )
 {
    this->RimPlotCurve::updateCurvePresentation( updateParentPlot );

-    if ( isCurveVisible() )
+    m_qwtPlotCurve->setTitle( createCurveAutoName() );
+
+    if ( updateParentPlot )
    {
-        m_qwtPlotCurve->setTitle( createCurveAutoName() );
+        RimWellLogTrack* track = nullptr;
+        this->firstAncestorOrThisOfTypeAsserted( track );
+        track->updateStackedCurveData();

-        if ( updateParentPlot )
-        {
-            RimWellLogTrack* track = nullptr;
-            this->firstAncestorOrThisOfTypeAsserted( track );
-            track->updateStackedCurveData();
-
-            updateZoomInParentPlot();
-        }
-
-        if ( m_parentQwtPlot ) m_parentQwtPlot->replot();
+        updateZoomInParentPlot();
    }
+
+    if ( m_parentQwtPlot ) m_parentQwtPlot->replot();
 }

 //--------------------------------------------------------------------------------------------------
@@ -191,7 +188,11 @@ void RimWellFlowRateCurve::updateCurveAppearance()
        firstAncestorOrThisOfTypeAsserted( wellLogTrack );
        std::map<int, std::vector<RimWellLogCurve*>> stackedCurveGroups = wellLogTrack->visibleStackedCurves();
        const std::vector<RimWellLogCurve*>&         curveGroup         = stackedCurveGroups[this->m_groupId];
-        isLastCurveInGroup                                              = ( curveGroup.back() == this );
+
+        if ( !curveGroup.empty() )
+        {
+            isLastCurveInGroup = ( curveGroup.back() == this );
+        }
    }

    if ( isUsingConnectionNumberDepthType() )
@@ -246,6 +247,21 @@ void RimWellFlowRateCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
    uiOrdering.skipRemainingFields();
 }

+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimWellFlowRateCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
+                                             const QVariant&            oldValue,
+                                             const QVariant&            newValue )
+{
+    if ( changedField == &m_showCurve )
+    {
+        loadDataAndUpdate( true );
+    }
+
+    RimWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue );
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellFlowRateCurve.h
@@ -60,6 +60,7 @@ protected:
    void    updateCurveAppearance() override;

    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue );

 private:
    bool                   isUsingConnectionNumberDepthType() const;
--- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
@@ -34,7 +34,7 @@

 #include "cafPdmFieldIOScriptability.h"

-#include <QFileDialog>
+#include <QFileInfo>
 #include <QMessageBox>

 #include <algorithm>
--- a/ApplicationCode/UserInterface/CMakeLists_files.cmake
+++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake
@@ -92,6 +92,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractOverlayContentFrame.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractLegendFrame.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuCategoryLegendFrame.h
 ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.h
+${CMAKE_CURRENT_LIST_DIR}/RiuFileDialogTools.h
 )

 set (SOURCE_GROUP_SOURCE_FILES
@@ -183,6 +184,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractOverlayContentFrame.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuAbstractLegendFrame.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuCategoryLegendFrame.cpp
 ${CMAKE_CURRENT_LIST_DIR}/RiuScalarMapperLegendFrame.cpp
+${CMAKE_CURRENT_LIST_DIR}/RiuFileDialogTools.cpp
 )

 list(APPEND CODE_HEADER_FILES
--- a/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp
+++ b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp
@@ -29,6 +29,7 @@
 #include "RimEclipseView.h"
 #include "RimProject.h"

+#include "RiuFileDialogTools.h"
 #include "RiuTools.h"

 #include "cafCmdFeatureManager.h"
@@ -38,7 +39,6 @@
 #include <QAbstractItemView>
 #include <QBoxLayout>
 #include <QDialogButtonBox>
-#include <QFileDialog>
 #include <QHeaderView>
 #include <QLabel>
 #include <QLineEdit>
@@ -247,10 +247,7 @@ void RiuAdvancedSnapshotExportWidget::folderSelectionClicked()
    QString defaultPath = m_exportFolderLineEdit->text();

    QString directoryPath =
-        QFileDialog::getExistingDirectory( m_exportFolderLineEdit,
-                                           tr( "Get existing directory" ),
-                                           defaultPath,
-                                           QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks );
+        RiuFileDialogTools::getExistingDirectory( m_exportFolderLineEdit, tr( "Get existing directory" ), defaultPath );

    if ( !directoryPath.isEmpty() )
    {
--- a/ApplicationCode/UserInterface/RiuFileDialogTools.cpp
+++ b/ApplicationCode/UserInterface/RiuFileDialogTools.cpp
@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2020 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 "RiuFileDialogTools.h"
+
+#include <QFileDialog>
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiuFileDialogTools::getSaveFileName( QWidget*       parent /*= nullptr*/,
+                                             const QString& caption /*= QString()*/,
+                                             const QString& dir /*= QString()*/,
+                                             const QString& filter /*= QString()*/,
+                                             QString*       selectedFilter /*= nullptr */ )
+{
+#ifdef WIN32
+    return QFileDialog::getSaveFileName( parent, caption, dir, filter, selectedFilter, QFileDialog::DontUseNativeDialog );
+#else
+    auto options = QFileDialog::DontUseNativeDialog;
+    return QFileDialog::getSaveFileName( parent, caption, dir, filter, selectedFilter, options );
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QStringList RiuFileDialogTools::getOpenFileNames( QWidget*       parent /*= nullptr*/,
+                                                  const QString& caption /*= QString()*/,
+                                                  const QString& dir /*= QString()*/,
+                                                  const QString& filter /*= QString()*/,
+                                                  QString*       selectedFilter /*= nullptr */ )
+{
+#ifdef WIN32
+    return QFileDialog::getOpenFileNames( parent, caption, dir, filter, selectedFilter );
+#else
+    auto options = QFileDialog::DontUseNativeDialog;
+    return QFileDialog::getOpenFileNames( parent, caption, dir, filter, selectedFilter, options );
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiuFileDialogTools::getExistingDirectory( QWidget*       parent /*= nullptr*/,
+                                                  const QString& caption /*= QString()*/,
+                                                  const QString& dir /*= QString() */ )
+{
+#ifdef WIN32
+    return QFileDialog::getExistingDirectory( parent, caption, dir );
+#else
+    auto options = QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks | QFileDialog::DontUseNativeDialog;
+    return QFileDialog::getExistingDirectory( parent, caption, dir, options );
+#endif
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QString RiuFileDialogTools::getOpenFileName( QWidget*       parent /*= nullptr*/,
+                                             const QString& caption /*= QString()*/,
+                                             const QString& dir /*= QString()*/,
+                                             const QString& filter /*= QString()*/,
+                                             QString*       selectedFilter /*= nullptr */ )
+{
+#ifdef WIN32
+    return QFileDialog::getOpenFileName( parent, caption, dir, filter, selectedFilter );
+#else
+    auto options = QFileDialog::DontUseNativeDialog;
+    return QFileDialog::getOpenFileName( parent, caption, dir, filter, selectedFilter, options );
+#endif
+}
--- a/ApplicationCode/UserInterface/RiuFileDialogTools.h
+++ b/ApplicationCode/UserInterface/RiuFileDialogTools.h
@@ -0,0 +1,49 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2020 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 <QString>
+#include <QStringList>
+
+class QWidget;
+
+namespace RiuFileDialogTools
+{
+QString getSaveFileName( QWidget*       parent         = nullptr,
+                         const QString& caption        = QString(),
+                         const QString& dir            = QString(),
+                         const QString& filter         = QString(),
+                         QString*       selectedFilter = nullptr );
+
+QStringList getOpenFileNames( QWidget*       parent         = nullptr,
+                              const QString& caption        = QString(),
+                              const QString& dir            = QString(),
+                              const QString& filter         = QString(),
+                              QString*       selectedFilter = nullptr );
+
+QString
+    getExistingDirectory( QWidget* parent = nullptr, const QString& caption = QString(), const QString& dir = QString() );
+
+QString getOpenFileName( QWidget*       parent         = nullptr,
+                         const QString& caption        = QString(),
+                         const QString& dir            = QString(),
+                         const QString& filter         = QString(),
+                         QString*       selectedFilter = nullptr );
+
+} // namespace RiuFileDialogTools
--- a/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
+++ b/ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
@@ -20,11 +20,11 @@

 #include "RiaApplication.h"

+#include "RiuFileDialogTools.h"
 #include "RiuTools.h"

 #include "ui_RiuMultiCaseImportDialog.h"

-#include <QFileDialog>
 #include <QFileIconProvider>
 #include <QFileSystemModel>
 #include <QStringListModel>
@@ -101,11 +101,11 @@ RiuMultiCaseImportDialog::~RiuMultiCaseImportDialog()
 //--------------------------------------------------------------------------------------------------
 void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
 {
-    QString selectedFolder =
-        QFileDialog::getExistingDirectory( this,
-                                           "Select an Eclipse case search folder",
-                                           RiaApplication::instance()->lastUsedDialogDirectory( "MULTICASEIMPORT" ) );
-    QStringList folderNames = m_searchFolders->stringList();
+    QString     selectedFolder = RiuFileDialogTools::getExistingDirectory( this,
+                                                                       "Select an Eclipse case search folder",
+                                                                       RiaApplication::instance()->lastUsedDialogDirectory(
+                                                                           "MULTICASEIMPORT" ) );
+    QStringList folderNames    = m_searchFolders->stringList();

    if ( !folderNames.contains( selectedFolder ) )
    {