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

Merge pull request #2981 from OPM/2018-05-1-patch

Browse Source 
Merge into master for Release 2018.05.1 of ResInsight
This commit is contained in:
Magne Sjaastad 2018-05-25 10:53:13 +02:00 committed by GitHub
commit 55341cd74d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/UserInterface/RiuDockWidgetTools.cpp
View File

@ -142,9 +142,12 @@ QDockWidget* RiuDockWidgetTools::findDockWidget(const QObject* parent, const QSt
QAction* RiuDockWidgetTools::toggleActionForWidget(const QObject* parent, const QString& dockWidgetName)
{
auto w = RiuDockWidgetTools::findDockWidget(parent, dockWidgetName);
CVF_ASSERT(w);
if (w)
{
return w->toggleViewAction();
}
return w->toggleViewAction();
return nullptr;
}
//--------------------------------------------------------------------------------------------------

35
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -1296,6 +1296,23 @@ RiuProcessMonitor* RiuMainWindow::processMonitor()
return m_processMonitor;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void appendToggleActionForDockingWidget(QMenu* menu, QWidget* parent, const QString& dockWidgetName)
{
if (menu)
{
auto dwt = RiuDockWidgetTools::instance();
QAction* action = dwt->toggleActionForWidget(parent, dockWidgetName);
if (action)
{
// Some dock windows are depending on configuration (mohrs circle plot), so do not assert they exist
menu->addAction(action);
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -1307,18 +1324,18 @@ void RiuMainWindow::slotBuildWindowActions()
auto dwt = RiuDockWidgetTools::instance();
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->projectTreeName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->propertyEditorName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->messagesName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->processMonitorName()));
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->projectTreeName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->propertyEditorName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->messagesName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->processMonitorName());
m_windowMenu->addSeparator();
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->resultInfoName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->resultPlotName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->relPermPlotName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->pvtPlotName()));
m_windowMenu->addAction(dwt->toggleActionForWidget(this, dwt->mohrsCirclePlotName()));
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->resultInfoName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->resultPlotName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->relPermPlotName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->pvtPlotName());
appendToggleActionForDockingWidget(m_windowMenu, this, dwt->mohrsCirclePlotName());
m_windowMenu->addSeparator();
QAction* cascadeWindowsAction = new QAction("Cascade Windows", this);

2
ResInsightVersion.cmake
View File

@ -1,7 +1,7 @@
set(RESINSIGHT_MAJOR_VERSION 2018)
set(RESINSIGHT_MINOR_VERSION 05)
set(RESINSIGHT_PATCH_VERSION 0)
set(RESINSIGHT_PATCH_VERSION 1)
# Opional text with no restrictions
#set(RESINSIGHT_VERSION_TEXT "-dev")