mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 23:20:29 -05:00
First non-MDI version. Still some missing links and features.
This commit is contained in:
1 parent
fee0599139
commit
d2d7c6ac61
79 files changed
+421
-1915
No files matched your search
@@ -103,7 +103,6 @@
|
||||
#include "RiuGuiTheme.h"
|
||||
#include "RiuMainWindow.h"
|
||||
#include "RiuMainWindowTools.h"
|
||||
#include "RiuMdiMaximizeWindowGuard.h"
|
||||
#include "RiuMessagePanel.h"
|
||||
#include "RiuPlotMainWindow.h"
|
||||
#include "RiuPlotMainWindowTools.h"
|
||||
@@ -134,7 +133,6 @@
|
||||
#include <QErrorMessage>
|
||||
#include <QGridLayout>
|
||||
#include <QKeyEvent>
|
||||
#include <QMdiSubWindow>
|
||||
#include <QMessageBox>
|
||||
#include <QProcessEnvironment>
|
||||
#include <QPushButton>
|
||||
@@ -447,11 +445,11 @@ RimViewWindow* RiaGuiApplication::activePlotWindow() const
|
||||
|
||||
if ( m_mainPlotWindow )
|
||||
{
|
||||
QList<QMdiSubWindow*> subwindows = m_mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
|
||||
if ( !subwindows.empty() )
|
||||
{
|
||||
viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
|
||||
}
|
||||
// QList<QMdiSubWindow*> subwindows = m_mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
|
||||
// if ( !subwindows.empty() )
|
||||
//{
|
||||
// viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
|
||||
// }
|
||||
}
|
||||
|
||||
return viewWindow;
|
||||
@@ -1150,11 +1148,11 @@ RimViewWindow* RiaGuiApplication::activeViewWindow()
|
||||
{
|
||||
RiuPlotMainWindow* mainPlotWindow = dynamic_cast<RiuPlotMainWindow*>( mainWindowWidget );
|
||||
|
||||
QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
|
||||
if ( !subwindows.empty() )
|
||||
{
|
||||
viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
|
||||
}
|
||||
// QList<QMdiSubWindow*> subwindows = mainPlotWindow->subWindowList( QMdiArea::StackingOrder );
|
||||
// if ( !subwindows.empty() )
|
||||
//{
|
||||
// viewWindow = RiuInterfaceToViewWindow::viewWindowFromWidget( subwindows.back()->widget() );
|
||||
// }
|
||||
}
|
||||
|
||||
return viewWindow;
|
||||
@@ -1315,9 +1313,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 +1371,6 @@ void RiaGuiApplication::onProjectOpened()
|
||||
|
||||
setWindowCaptionFromAppState();
|
||||
|
||||
m_maximizeWindowGuard.reset();
|
||||
|
||||
processEvents();
|
||||
|
||||
if ( m_mainWindow ) m_mainWindow->setBlockSubWindowActivatedSignal( false );
|
||||
|
||||
Reference in new issue
Block a user