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

#1430 When closing top level windows, do not close project if other is visible

Browse Source
This commit is contained in:
Magne Sjaastad
2017-04-25 15:01:31 +02:00
parent 64d41fa109
commit 63b07b1152
4 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -1708,6 +1708,24 @@ RimViewWindow* RiaApplication::activeViewWindow()
return viewWindow;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::isMain3dWindowVisible() const
{
return RiuMainWindow::instance()->isVisible();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaApplication::isMainPlotWindowVisible() const
{
if (!m_mainPlotWindow) return false;
return m_mainPlotWindow->isVisible();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/Application/RiaApplication.h
View File

@@ -185,6 +185,9 @@ public:
static RimViewWindow* activeViewWindow();
bool isMain3dWindowVisible() const;
bool isMainPlotWindowVisible() const;
bool tryCloseMainWindow();
bool tryClosePlotWindow();

6
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -138,6 +138,12 @@ void RiuMainPlotWindow::cleanupGuiBeforeProjectClose()
void RiuMainPlotWindow::closeEvent(QCloseEvent* event)
{
RiaApplication* app = RiaApplication::instance();
if (app->isMain3dWindowVisible())
{
return;
}
if (!app->askUserToSaveModifiedProject())
{
event->ignore();

6
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -198,6 +198,12 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
void RiuMainWindow::closeEvent(QCloseEvent* event)
{
RiaApplication* app = RiaApplication::instance();
if (app->isMainPlotWindowVisible())
{
return;
}
if (!app->askUserToSaveModifiedProject())
{
event->ignore();