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

12
ApplicationLibCode/UserInterface/RiuMainWindow.cpp
View File

@@ -156,12 +156,16 @@ RiuMainWindow::RiuMainWindow()
initializeGuiNewProjectLoaded();
QString versionText = RiaApplication::getVersionStringApp( false );
m_versionInfo = new QLabel( versionText );
m_memoryCriticalWarning = new QLabel( "" );
m_memoryUsedButton = new QToolButton( nullptr );
m_memoryTotalStatus = new QLabel( "" );
m_memoryUsedButton->setDefaultAction( caf::CmdFeatureManager::instance()->action( "RicShowMemoryCleanupDialogFeature" ) );
statusBar()->addPermanentWidget( m_versionInfo );
statusBar()->addPermanentWidget( m_memoryCriticalWarning );
statusBar()->addPermanentWidget( m_memoryUsedButton );
statusBar()->addPermanentWidget( m_memoryTotalStatus );
@@ -316,7 +320,7 @@ void RiuMainWindow::closeEvent( QCloseEvent* event )
return;
}
}
this->saveWinGeoAndDockToolBarLayout();
saveWinGeoAndDockToolBarLayout();
QMainWindow::closeEvent( event );
}
@@ -880,7 +884,7 @@ void RiuMainWindow::setResultInfo( const QString& info ) const
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::refreshViewActions()
{
this->slotRefreshViewActions();
slotRefreshViewActions();
}
//==================================================================================================
@@ -1802,7 +1806,7 @@ void RiuMainWindow::updateMemoryUsage()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::showProcessMonitorDockPanel()
{
RiuDockWidgetTools::showDockWidget( this->dockManager(), RiuDockWidgetTools::mainWindowProcessMonitorName() );
RiuDockWidgetTools::showDockWidget( dockManager(), RiuDockWidgetTools::mainWindowProcessMonitorName() );
}
//--------------------------------------------------------------------------------------------------
@@ -2010,7 +2014,7 @@ void RiuMainWindow::customMenuRequested( const QPoint& pos )
// Qt doc: QAbstractScrollArea and its subclasses that map the context menu event to coordinates of the viewport().
// Since we might get this signal from different treeViews, we need to map the position accordingly.
QObject* senderObj = this->sender();
QObject* senderObj = sender();
QTreeView* treeView = dynamic_cast<QTreeView*>( senderObj );
if ( treeView )
{