Replace MDI window system with docking

ApplicationExeCode/Resources/ResInsight.qrc

@@ -6,7 +6,8 @@
         <file>3DView16x16.png</file>
         <file>3DViewGeoMech16x16.png</file>
         <file>3DWindow.svg</file>
-        <file>AICDValve16x16.png</file>
+		<file>ActiveWindow.svg</file>
+		<file>AICDValve16x16.png</file>
 		<file>SICDValve16x16.png</file>
 		<file>Annotations16x16.png</file>
         <file>AnalysisPlot16x16.png</file>

ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp

@@ -151,7 +151,7 @@ void RiaCompletionTypeCalculationScheduler::performScheduledUpdates()
         RiaApplication::instance()->setActiveReservoirView( activeView );
         if ( RiuMainWindow::instance() )
         {
-            RiuMainWindow::instance()->setActiveViewer( activeView->viewer()->layoutWidget() );
+            RiuMainWindow::instance()->setActiveViewer( activeView->dockWindowName() );
         }
     }
 }

ApplicationLibCode/Application/RiaGuiApplication.cpp

@@ -57,6 +57,7 @@
 #include "RimAnnotationCollection.h"
 #include "RimAnnotationInViewCollection.h"
 #include "RimAnnotationTextAppearance.h"
+#include "RimDockWindowController.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseView.h"
 #include "RimFlowPlotCollection.h"
@@ -103,7 +104,6 @@
 #include "RiuGuiTheme.h"
 #include "RiuMainWindow.h"
 #include "RiuMainWindowTools.h"
-#include "RiuMdiMaximizeWindowGuard.h"
 #include "RiuMessagePanel.h"
 #include "RiuPlotMainWindow.h"
 #include "RiuPlotMainWindowTools.h"
@@ -134,7 +134,6 @@
 #include <QErrorMessage>
 #include <QGridLayout>
 #include <QKeyEvent>
-#include <QMdiSubWindow>
 #include <QMessageBox>
 #include <QProcessEnvironment>
 #include <QPushButton>
@@ -229,11 +228,6 @@ RiaGuiApplication::~RiaGuiApplication()
     }
 
     processEvents();
-
-    delete m_mainWindow.data();
-    m_mainWindow.clear();
-
-    m_mainPlotWindow.reset();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -406,6 +400,52 @@ void RiaGuiApplication::storeTreeViewState()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaGuiApplication::storeDockState()
+{
+    if ( m_mainWindow )
+    {
+        project()->mainWindowDockState = m_mainWindow->dockWidgetStateString();
+    }
+
+    if ( m_mainPlotWindow )
+    {
+        project()->plotWindowDockState = m_mainPlotWindow->dockWidgetStateString();
+    }
+}
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RiaGuiApplication::restoreDockState()
+{
+    if ( m_mainWindow )
+    {
+        bool useDefault = true;
+        if ( !project()->mainWindowDockState().isEmpty() )
+        {
+            useDefault = !m_mainWindow->restoreDockWidgetState( project()->mainWindowDockState );
+        }
+        if ( useDefault )
+        {
+            RiuDockWidgetTools::setDockLayout( m_mainWindow, RiuDockWidgetTools::dockState3DEclipseName() );
+        }
+    }
+    if ( m_mainPlotWindow )
+    {
+        bool useDefault = true;
+        if ( !project()->plotWindowDockState().isEmpty() )
+        {
+            useDefault = !m_mainPlotWindow->restoreDockWidgetState( project()->plotWindowDockState );
+        }
+        if ( useDefault )
+        {
+            RiuDockWidgetTools::setDockLayout( m_mainPlotWindow, RiuDockWidgetTools::dockStatePlotWindowName() );
+        }
+    }
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -447,11 +487,7 @@ RimViewWindow* RiaGuiApplication::activePlotWindow() const
 
     if ( m_mainPlotWindow )
     {
-        QList<QMdiSubWindow*> subwindows = m_mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
-        if ( !subwindows.empty() )
-        {
-            viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
-        }
+        return m_mainPlotWindow->activePlotView();
     }
 
     return viewWindow;
@@ -866,14 +902,9 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
                 mainPlotWnd->show();
                 mainPlotWnd->raise();
 
-                if ( snapshotHeight > -1 && snapshotWidth > -1 )
-                {
-                    RiuMainWindowTools::setWindowSizeOnWidgetsInMdiWindows( mainPlotWnd, snapshotWidth, snapshotHeight );
-                }
-
                 processEvents();
 
-                RicSnapshotAllPlotsToFileFeature::exportSnapshotOfPlotsIntoFolder( snapshotFolder );
+                RicSnapshotAllPlotsToFileFeature::exportSnapshotOfPlotsIntoFolder( snapshotFolder, snapshotWidth, snapshotHeight );
             }
         }
 
@@ -883,14 +914,9 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments( gsl::not_n
             mainWnd->show();
             mainWnd->raise();
 
-            if ( snapshotHeight > -1 && snapshotWidth > -1 )
-            {
-                RiuMainWindowTools::setFixedWindowSizeFor3dViews( mainWnd, snapshotWidth, snapshotHeight );
-            }
-
             processEvents();
 
-            RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( snapshotFolder );
+            RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( snapshotFolder, snapshotWidth, snapshotHeight );
         }
 
         auto mainPlotWnd = mainPlotWindow();
@@ -1078,7 +1104,7 @@ void RiaGuiApplication::createMainPlotWindow()
     // Always enable undo/redo framework, as multi-select operations perform significantly better with it enabled
     caf::CmdExecCommandManager::instance()->enableUndoCommandSystem( true );
 
-    m_mainPlotWindow = std::make_unique<RiuPlotMainWindow>();
+    m_mainPlotWindow = new RiuPlotMainWindow();
     m_mainPlotWindow->setWindowTitle( "Plots - ResInsight" );
     m_mainPlotWindow->setDefaultWindowSize();
     m_mainPlotWindow->loadWinGeoAndDockToolBarLayout();
@@ -1125,9 +1151,9 @@ RiuPlotMainWindow* RiaGuiApplication::mainPlotWindow()
 //--------------------------------------------------------------------------------------------------
 RiuMainWindowBase* RiaGuiApplication::mainWindowByID( int mainWindowID )
 {
-    if ( mainWindowID == 0 )
+    if ( mainWindowID == RimDockWindowController::MAIN_WINDOW_ID_3D )
         return m_mainWindow;
-    else if ( mainWindowID == 1 )
+    else if ( mainWindowID == RimDockWindowController::MAIN_WINDOW_ID_PLOTS )
         return m_mainPlotWindow.get();
     else
         return nullptr;
@@ -1146,15 +1172,9 @@ RimViewWindow* RiaGuiApplication::activeViewWindow()
     {
         viewWindow = RiaGuiApplication::instance()->activeReservoirView();
     }
-    else if ( dynamic_cast<RiuPlotMainWindow*>( mainWindowWidget ) )
+    else if ( auto mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>( mainWindowWidget ) )
     {
-        RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>( mainWindowWidget );
-
-        QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
-        if ( !subwindows.empty() )
-        {
-            viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
-        }
+        viewWindow = mainPlotWindow->activePlotView();
     }
 
     return viewWindow;
@@ -1315,9 +1335,6 @@ void RiaGuiApplication::onFileSuccessfullyLoaded( const QString& fileName, RiaDe
 //--------------------------------------------------------------------------------------------------
 void RiaGuiApplication::onProjectBeingOpened()
 {
-    // When importing a project, do not maximize the first MDI window to be created
-    m_maximizeWindowGuard = std::make_unique<RiuMdiMaximizeWindowGuard>();
-
     if ( m_mainWindow ) m_mainWindow->setBlockSubWindowActivatedSignal( true );
     if ( mainPlotWindow() ) mainPlotWindow()->setBlockSubWindowActivatedSignal( true );
 }
@@ -1376,8 +1393,6 @@ void RiaGuiApplication::onProjectOpened()
 
     setWindowCaptionFromAppState();
 
-    m_maximizeWindowGuard.reset();
-
     processEvents();
 
     if ( m_mainWindow ) m_mainWindow->setBlockSubWindowActivatedSignal( false );
@@ -1391,6 +1406,8 @@ void RiaGuiApplication::onProjectOpened()
         m_mainPlotWindow->raise();
         m_mainPlotWindow->activateWindow();
     }
+
+    restoreDockState();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -1432,6 +1449,7 @@ void RiaGuiApplication::onProjectBeingSaved()
 {
     setLastUsedDialogDirectory( "BINARY_GRID", QFileInfo( m_project->fileName() ).absolutePath() );
     storeTreeViewState();
+    storeDockState();
 
     if ( auto sumCaseMainColl = RiaSummaryTools::summaryCaseMainCollection() )
     {
@@ -1817,13 +1835,30 @@ bool RiaGuiApplication::notify( QObject* receiver, QEvent* event )
                 if ( plot ) done = plot->handleGlobalKeyEvent( keyEvent );
             }
         }
+        else if ( event->type() == QEvent::MouseButtonPress )
+        {
+            if ( activeWindow() != mainWindow() )
+            {
+                if ( auto plotMain = mainPlotWindow() )
+                {
+                    QMouseEvent* mouseEvent = static_cast<QMouseEvent*>( event );
+                    for ( auto view : plotMain->viewWindows() )
+                    {
+                        RimPlotWindow* plot = dynamic_cast<RimPlotWindow*>( view );
+                        if ( plot ) done = plot->handleGlobalMousePressEvent( mouseEvent );
+                    }
+                }
+            }
+        }
         else if ( event->type() == QEvent::Wheel )
         {
             if ( activeWindow() != mainWindow() )
             {
-                QWheelEvent*   wheelEvent = static_cast<QWheelEvent*>( event );
-                RimPlotWindow* plot       = dynamic_cast<RimPlotWindow*>( activePlotWindow() );
-                if ( plot ) done = plot->handleGlobalWheelEvent( wheelEvent );
+                QWheelEvent* wheelEvent = static_cast<QWheelEvent*>( event );
+                if ( RimPlotWindow* plot = dynamic_cast<RimPlotWindow*>( activePlotWindow() ) )
+                {
+                    done = plot->handleGlobalWheelEvent( wheelEvent );
+                }
             }
         }
         if ( !done )

ApplicationLibCode/Application/RiaGuiApplication.h

@@ -55,7 +55,6 @@ class RimWellAllocationPlot;
 
 class RiuMainWindow;
 class RiuMainWindowBase;
-class RiuMdiMaximizeWindowGuard;
 class RiuPlotMainWindow;
 class RiuRecentFileActionProvider;
 class RiaArgumentParser;
@@ -157,16 +156,16 @@ class RiaGuiApplication : public QApplication, public RiaApplication
     void createMainPlotWindow();
 
     void storeTreeViewState();
+    void storeDockState();
+    void restoreDockState();
 
 private slots:
     void slotWorkerProcessFinished( int exitCode, QProcess::ExitStatus exitStatus );
     void onLastWindowClosed();
 
 private:
-    QPointer<RiuMainWindow>            m_mainWindow;
-    std::unique_ptr<RiuPlotMainWindow> m_mainPlotWindow;
+    QPointer<RiuMainWindow>     m_mainWindow;
+    QPointer<RiuPlotMainWindow> m_mainPlotWindow;
 
     std::unique_ptr<RiuRecentFileActionProvider> m_recentFileActionProvider;
-
-    std::unique_ptr<RiuMdiMaximizeWindowGuard> m_maximizeWindowGuard;
 };

ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.cpp

@@ -18,10 +18,14 @@
 
 #include "RiaPlotWindowRedrawScheduler.h"
 
+#include "RimViewWindow.h"
+
 #include "RiuMultiPlotBook.h"
 #include "RiuMultiPlotPage.h"
 #include "RiuPlotWidget.h"
 
+#include "DockWidget.h"
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
@@ -108,6 +112,12 @@ void RiaPlotWindowRedrawScheduler::performScheduledUpdates()
                 if ( pagesToUpdate.count( page ) > 0 ) pagesToUpdate.erase( page );
             }
         }
+
+        if ( auto pdmView = plotBook->ownerViewWindow() )
+        {
+            QSize s = pdmView->dockWidget()->size();
+            plotBook->resize( s );
+        }
         plotBook->performUpdate( updateType );
     }