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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
View File

@@ -620,7 +620,7 @@ ads::CDockAreaWidget* RiuMainWindowBase::addTabbedWidgets( std::vector<ads::CDoc
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::setDefaultDockLayout()
{
QAction* action = dynamic_cast<QAction*>( this->sender() );
QAction* action = dynamic_cast<QAction*>( sender() );
if ( action )
{
QString layoutName = action->text();
@@ -636,7 +636,7 @@ void RiuMainWindowBase::setDefaultDockLayout()
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::setDockLayout()
{
QAction* action = dynamic_cast<QAction*>( this->sender() );
QAction* action = dynamic_cast<QAction*>( sender() );
if ( action )
{
QString layoutName = action->text();
@@ -649,7 +649,7 @@ void RiuMainWindowBase::setDockLayout()
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::deleteDockLayout()
{
QAction* action = dynamic_cast<QAction*>( this->sender() );
QAction* action = dynamic_cast<QAction*>( sender() );
if ( action )
{
QString name = action->text();
@@ -742,7 +742,7 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
{
QMenu* layoutsMenu = m_windowMenu->addMenu( "Use Window Layout" );
QMenu* deleteLayoutMenu = nullptr;
if ( names.size() > 0 ) deleteLayoutMenu = m_windowMenu->addMenu( "Delete Window Layout" );
if ( !names.empty() ) deleteLayoutMenu = m_windowMenu->addMenu( "Delete Window Layout" );
for ( auto& defLayout : defaultNames )
{
@@ -750,7 +750,7 @@ void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
connect( defLayoutAction, SIGNAL( triggered() ), this, SLOT( setDefaultDockLayout() ) );
}
if ( defaultNames.size() > 0 ) layoutsMenu->addSeparator();
if ( !defaultNames.empty() ) layoutsMenu->addSeparator();
for ( auto& layout : names )
{