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

#846 Use one tile window feature for both main windows

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-06 07:55:02 +02:00
parent 95d4cd15cd
commit 7c5dbf8bc2
7 changed files with 32 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/UserInterface/RiuMainPlotWindow.cpp
View File

@@ -228,7 +228,7 @@ void RiuMainPlotWindow::createToolBars()
QToolBar* toolbar = addToolBar(tr("Window Management"));
toolbar->setObjectName(toolbar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicShowMainWindowFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicTilePlotWindowsFeature"));
toolbar->addAction(cmdFeatureMgr->action("RicTileWindowsFeature"));
}
{
@@ -501,7 +501,7 @@ void RiuMainPlotWindow::slotBuildWindowActions()
QAction* closeAllSubWindowsAction = new QAction("Close All Windows", this);
connect(closeAllSubWindowsAction, SIGNAL(triggered()), m_mdiArea, SLOT(closeAllSubWindows()));
m_windowMenu->addAction(caf::CmdFeatureManager::instance()->action("RicTilePlotWindowsFeature"));
m_windowMenu->addAction(caf::CmdFeatureManager::instance()->action("RicTileWindowsFeature"));
m_windowMenu->addAction(cascadeWindowsAction);
m_windowMenu->addAction(closeAllSubWindowsAction);
}

19
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -278,16 +278,12 @@ void RiuMainWindow::createActions()
m_viewFromBelow = new QAction(QIcon(":/UpViewArrow.png"),"Look Up", this);
m_viewFromBelow->setToolTip("Look Up");
m_zoomAll = new QAction(QIcon(":/ZoomAll16x16.png"),"Zoom all", this);
m_zoomAll->setToolTip("Zoom to view all");
connect(m_viewFromNorth, SIGNAL(triggered()), SLOT(slotViewFromNorth()));
connect(m_viewFromSouth, SIGNAL(triggered()), SLOT(slotViewFromSouth()));
connect(m_viewFromEast, SIGNAL(triggered()), SLOT(slotViewFromEast()));
connect(m_viewFromWest, SIGNAL(triggered()), SLOT(slotViewFromWest()));
connect(m_viewFromAbove, SIGNAL(triggered()), SLOT(slotViewFromAbove()));
connect(m_viewFromBelow, SIGNAL(triggered()), SLOT(slotViewFromBelow()));
connect(m_zoomAll, SIGNAL(triggered()), SLOT(slotZoomAll()));
// Debug actions
m_newPropertyView = new QAction("New Project and Property View", this);
@@ -403,7 +399,7 @@ void RiuMainWindow::createMenus()
// View menu
QMenu* viewMenu = menuBar()->addMenu("&View");
viewMenu->addAction(m_zoomAll);
viewMenu->addAction(cmdFeatureMgr->action("RicViewZoomAllFeature"));
viewMenu->addSeparator();
viewMenu->addAction(m_viewFromSouth);
viewMenu->addAction(m_viewFromNorth);
@@ -479,7 +475,7 @@ void RiuMainWindow::createToolBars()
QToolBar* toolbar = addToolBar(tr("View"));
toolbar->setObjectName(toolbar->windowTitle());
toolbar->addAction(cmdFeatureMgr->action("RicTogglePerspectiveViewFeature"));
toolbar->addAction(m_zoomAll);
toolbar->addAction(cmdFeatureMgr->action("RicViewZoomAllFeature"));
toolbar->addAction(m_viewFromNorth);
toolbar->addAction(m_viewFromSouth);
toolbar->addAction(m_viewFromEast);
@@ -995,17 +991,6 @@ void RiuMainWindow::slotViewFromBelow()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::slotZoomAll()
{
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RiaApplication::instance()->activeReservoirView()->viewer()->zoomAll();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -148,7 +148,6 @@ private:
QAction* m_viewFromWest;
QAction* m_viewFromAbove;
QAction* m_viewFromBelow;
QAction* m_zoomAll;
// Mock actions
QAction* m_mockModelAction;
@@ -198,7 +197,6 @@ private slots:
void slotViewFromWest();
void slotViewFromAbove();
void slotViewFromBelow();
void slotZoomAll();
void slotScaleChanged(int scaleValue);
void slotDrawStyleChanged(QAction* activatedAction);