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

#4410 Dock Window State : Restore dock widgets when opening main window

Browse Source
This commit is contained in:
Magne Sjaastad 2019-05-15 13:54:05 +02:00
parent a52afd7b34
commit bfe8e7176a
3 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -18,6 +18,8 @@
#include "RiaImportEclipseCaseTools.h" #include "RiaImportEclipseCaseTools.h"
#include "ApplicationCommands/RicShowMainWindowFeature.h"
#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h" #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h" #include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
@ -275,7 +277,10 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(const QStr
return false; return false;
} }
RiuMainWindow::instance()->show(); if (RiaGuiApplication::isRunning())
{
RicShowMainWindowFeature::showMainWindow();
}
analysisModels->cases.push_back(rimResultReservoir); analysisModels->cases.push_back(rimResultReservoir);

37
ApplicationCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp
View File

@ -29,22 +29,10 @@ CAF_CMD_SOURCE_INIT(RicShowMainWindowFeature, "RicShowMainWindowFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RicShowMainWindowFeature::isCommandEnabled() void RicShowMainWindowFeature::showMainWindow()
{ {
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicShowMainWindowFeature::onActionTriggered(bool isChecked)
{
this->disableModelChangeContribution();
RiuMainWindow* mainWnd = RiuMainWindow::instance(); RiuMainWindow* mainWnd = RiuMainWindow::instance();
bool triggerReloadOfDockWindowVisibilities = !mainWnd->isVisible();
if (mainWnd->isMinimized()) if (mainWnd->isMinimized())
{ {
mainWnd->showNormal(); mainWnd->showNormal();
@ -57,10 +45,25 @@ void RicShowMainWindowFeature::onActionTriggered(bool isChecked)
mainWnd->raise(); mainWnd->raise();
if (triggerReloadOfDockWindowVisibilities) mainWnd->restoreDockWidgetVisibilities();
{ }
mainWnd->restoreDockWidgetVisibilities();
} //--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicShowMainWindowFeature::isCommandEnabled()
{
return true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicShowMainWindowFeature::onActionTriggered(bool isChecked)
{
this->disableModelChangeContribution();
RicShowMainWindowFeature::showMainWindow();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/Commands/ApplicationCommands/RicShowMainWindowFeature.h
View File

@ -28,6 +28,9 @@ class RicShowMainWindowFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
public:
static void showMainWindow();
protected: protected:
// Overrides // Overrides
bool isCommandEnabled() override; bool isCommandEnabled() override;