Dock State : Make sure dock state is stored when exit is triggered

This commit is contained in:
Magne Sjaastad
2019-06-26 12:09:02 +02:00
parent a521748eda
commit 3ac518da4c

View File

@@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2016 Statoil ASA // Copyright (C) 2016 Statoil ASA
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@@ -20,6 +20,7 @@
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
#include <QAction> #include <QAction>
#include <QDebug> #include <QDebug>
@@ -27,7 +28,7 @@
CAF_CMD_SOURCE_INIT(RicExitApplicationFeature, "RicExitApplicationFeature"); CAF_CMD_SOURCE_INIT(RicExitApplicationFeature, "RicExitApplicationFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicExitApplicationFeature::isCommandEnabled() bool RicExitApplicationFeature::isCommandEnabled()
{ {
@@ -35,7 +36,7 @@ bool RicExitApplicationFeature::isCommandEnabled()
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExitApplicationFeature::onActionTriggered(bool isChecked) void RicExitApplicationFeature::onActionTriggered(bool isChecked)
{ {
@@ -44,6 +45,16 @@ void RicExitApplicationFeature::onActionTriggered(bool isChecked)
RiaGuiApplication* app = RiaGuiApplication::instance(); RiaGuiApplication* app = RiaGuiApplication::instance();
if (!app->askUserToSaveModifiedProject()) return; if (!app->askUserToSaveModifiedProject()) return;
if (app->mainPlotWindow())
{
app->mainPlotWindow()->saveWinGeoAndDockToolBarLayout();
}
if (app->mainWindow())
{
app->mainWindow()->saveWinGeoAndDockToolBarLayout();
}
// Hide all windows first to make sure they get closed properly // Hide all windows first to make sure they get closed properly
for (QWidget* topLevelWidget : app->topLevelWidgets()) for (QWidget* topLevelWidget : app->topLevelWidgets())
{ {
@@ -54,7 +65,7 @@ void RicExitApplicationFeature::onActionTriggered(bool isChecked)
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExitApplicationFeature::setupActionLook(QAction* actionToSetup) void RicExitApplicationFeature::setupActionLook(QAction* actionToSetup)
{ {