diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp index cc325d58f9..7c6ae06a52 100644 --- a/ApplicationCode/Application/RiaPreferences.cpp +++ b/ApplicationCode/Application/RiaPreferences.cpp @@ -353,14 +353,6 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, myAttr->m_selectDirectory = true; myAttr->m_appendUiSelectedFolderToText = true; } - else if ( field == &m_defaultPlotTemplate ) - { - auto folders = plotTemplateFolders(); - if ( !folders.empty() ) - { - myAttr->m_defaultPath = folders.back(); - } - } } } @@ -463,7 +455,6 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Plot Templates" ); group->add( &m_plotTemplateFolders ); group->add( &m_searchPlotTemplateFoldersRecursively ); - group->add( &m_defaultPlotTemplate ); } else if ( uiConfigName == RiaPreferences::tabNameScripting() ) { diff --git a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp index 28be5ac6e2..d1467416d5 100644 --- a/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp +++ b/ApplicationCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp @@ -58,8 +58,8 @@ void RicCreatePlotFromTemplateByShortcutFeature::onActionTriggered( bool isCheck auto mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow(); auto reply = QMessageBox::question( mainPlotWindow, - QString( "No default plot template found." ), - QString( "Do you want to define default plot template? " ), + QString( "No last used plot template found." ), + QString( "Do you want to select plot template? " ), QMessageBox::Yes | QMessageBox::No ); if ( reply == QMessageBox::No ) return; @@ -68,8 +68,6 @@ void RicCreatePlotFromTemplateByShortcutFeature::onActionTriggered( bool isCheck if ( fileNameSelectedInUi.isEmpty() ) return; fileName = fileNameSelectedInUi; - RiaApplication::instance()->preferences()->setDefaultPlotTemplatePath( fileName ); - RiaApplication::instance()->preferences()->writePreferencesToApplicationStore(); } auto sumCases = RicSummaryPlotTemplateTools::selectedSummaryCases(); diff --git a/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp b/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp index d01b60bf79..9d0e709503 100644 --- a/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp +++ b/ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp @@ -21,6 +21,7 @@ #include "RiaApplication.h" #include "RiaGuiApplication.h" #include "RiaLogging.h" +#include "RiaPreferences.h" #include "RiaSummaryCurveAnalyzer.h" #include "RicSelectPlotTemplateUi.h" @@ -335,6 +336,9 @@ QString RicSummaryPlotTemplateTools::selectPlotTemplatePath() { QString fileName = ui->selectedPlotTemplates().front()->absoluteFilePath(); + RiaApplication::instance()->preferences()->setDefaultPlotTemplatePath( fileName ); + RiaApplication::instance()->preferences()->writePreferencesToApplicationStore(); + return fileName; }