OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1401 Ask user to save modified project before project close

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-20 08:07:47 +02:00
parent 82b6e4b8f2
commit d7d80bc53e
8 changed files with 99 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -137,11 +137,18 @@ void RiuMainPlotWindow::cleanupGuiBeforeProjectClose()
//--------------------------------------------------------------------------------------------------
void RiuMainPlotWindow::closeEvent(QCloseEvent* event)
{
RiaApplication* app = RiaApplication::instance();
if (!app->askUserToSaveModifiedProject())
{
event->ignore();
return;
}
saveWinGeoAndDockToolBarLayout();
if (!RiaApplication::instance()->tryCloseMainWindow()) return;
if (!app->tryCloseMainWindow()) return;
RiaApplication::instance()->closeProject();
app->closeProject();
}
//--------------------------------------------------------------------------------------------------

13
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -197,15 +197,18 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::closeEvent(QCloseEvent* event)
{
saveWinGeoAndDockToolBarLayout();
RiaApplication* app = RiaApplication::instance();
if (!app->askUserToSaveModifiedProject())
{
event->ignore();
return;
}
saveWinGeoAndDockToolBarLayout();
if (!app->tryClosePlotWindow()) return;
RiaApplication::instance()->closeProject();
event->accept();
app->closeProject();
}
//--------------------------------------------------------------------------------------------------

16
ApplicationCode/UserInterface/RiuRecentFileActionProvider.cpp
View File

@@ -122,18 +122,24 @@ void RiuRecentFileActionProvider::slotOpenRecentFile()
QAction* action = qobject_cast<QAction *>(sender());
if (action)
{
QString filename = action->data().toString();
bool loadingSucceded = RiaApplication::instance()->openFile(filename);
QString fileName = action->data().toString();
RiaApplication* app = RiaApplication::instance();
if (RiaApplication::hasValidProjectFileExtension(fileName))
{
if (!app->askUserToSaveModifiedProject()) return;
}
bool loadingSucceded = RiaApplication::instance()->openFile(fileName);
if (loadingSucceded)
{
addFileName(filename);
addFileName(fileName);
}
else
{
QMessageBox::warning(NULL, "File open", "Failed to import file located at\n" + filename);
QMessageBox::warning(NULL, "File open", "Failed to import file located at\n" + fileName);
removeFileName(filename);
removeFileName(fileName);
}
}
}