diff --git a/ApplicationLibCode/Commands/RicImportGeneralDataFeature.cpp b/ApplicationLibCode/Commands/RicImportGeneralDataFeature.cpp index dd1bd5ee96..1eccf7cec5 100644 --- a/ApplicationLibCode/Commands/RicImportGeneralDataFeature.cpp +++ b/ApplicationLibCode/Commands/RicImportGeneralDataFeature.cpp @@ -281,6 +281,18 @@ QString RicImportGeneralDataFeature::getFilePattern( RiaDefines::ImportFileType return ""; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +static QString fileDialogTitle( RiaDefines::ImportFileType fileType ) +{ + if ( fileType == ImportFileType::ECLIPSE_SUMMARY_FILE ) return "Import Summary Case"; + if ( fileType == ImportFileType::ECLIPSE_INPUT_FILE ) return "Import Eclipse Input File"; + if ( fileType == ImportFileType::ROFF_FILE ) return "Import Roff File"; + + return "Import Grid Model"; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -321,7 +333,7 @@ QStringList RicImportGeneralDataFeature::getEclipseFileNamesWithDialog( RiaDefin QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectory( defaultDirectoryLabel( fileType ) ); // Use nullptr as parent to this dialog, as this function is called from both plot window and main window - QStringList fileNames = RiuFileDialogTools::getOpenFileNames( nullptr, "Import Grid Model", defaultDir, fullPattern ); + QStringList fileNames = RiuFileDialogTools::getOpenFileNames( nullptr, fileDialogTitle( fileType ), defaultDir, fullPattern ); return fileNames; } diff --git a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index d858e1a70d..c281fd3f8c 100644 --- a/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -65,7 +65,12 @@ void RimSummaryCalculationVariable::fieldChangedByUi( const caf::PdmFieldHandle* bool updateContainingEditor = false; { - RiuSummaryVectorSelectionDialog dlg( RiaGuiApplication::widgetToUseAsParent() ); + // This dialog can be opened from the summary calculator dialog. Use the active window as parent, as using + // a main window as parent will raise that main window in front of the calculator dialog when closing. + QWidget* parentWidget = RiaGuiApplication::activeWindow(); + if ( !parentWidget ) parentWidget = RiaGuiApplication::widgetToUseAsParent(); + + RiuSummaryVectorSelectionDialog dlg( parentWidget ); dlg.hideEnsembles(); dlg.hideCalculationIncompatibleCategories();