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

#4892 Add (Primary) and (Controlled) labels to view window titles

Browse Source
This commit is contained in:
Jacob Støren 2019-10-28 13:19:27 +01:00
parent 3710b4ba58
commit b729ce7228
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/Rim3dView.cpp
View File

@ -291,7 +291,8 @@ void Rim3dView::updateMdiWindowTitle()
{
if ( m_viewer )
{
m_viewer->layoutWidget()->setWindowTitle( autoName() );
m_viewer->layoutWidget()->setWindowTitle(
autoName() + ( isMasterView() ? " (Primary)" : viewController() ? " (Controlled)" : "" ) );
}
}

7
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@ -95,6 +95,10 @@ RimViewController::RimViewController()
RimViewController::~RimViewController()
{
this->removeOverrides();
RimGridView* managedView = m_managedView;
m_managedView = nullptr;
if (managedView) managedView->updateHolder();
}
//--------------------------------------------------------------------------------------------------
@ -485,6 +489,7 @@ void RimViewController::setManagedView( RimGridView* view )
updateCameraLink();
updateDisplayNameAndIcon();
updateTimeStepLink();
m_managedView->updateHolder();
}
//--------------------------------------------------------------------------------------------------
@ -1132,7 +1137,7 @@ bool RimViewController::askUserToRestoreOriginalRangeFilterCollection( const QSt
questionText = QString( "The range filters in the view \"%1\" are about to be unlinked." ).arg( viewName );
msgBox.setText( questionText );
msgBox.setInformativeText( "Do you want to keep the range filters from the master view?" );
msgBox.setInformativeText( "Do you want to keep the range filters from the primary view?" );
msgBox.setStandardButtons( QMessageBox::Yes | QMessageBox::No );
int ret = msgBox.exec();

6
ApplicationCode/ProjectDataModel/RimViewLinker.cpp
View File

@ -86,6 +86,9 @@ RimViewLinker::~RimViewLinker()
removeOverrides();
m_viewControllers.deleteAllChildObjects();
RimGridView* masterView = m_masterView;
m_masterView = nullptr;
if (masterView) masterView->updateHolder();
}
//--------------------------------------------------------------------------------------------------
@ -408,6 +411,9 @@ void RimViewLinker::updateUiNameAndIcon()
{
caf::QIconProvider iconProvider;
RimViewLinker::findNameAndIconFromView( &m_name.v(), &iconProvider, m_masterView );
if (m_masterView) m_masterView->updateHolder();
setUiIcon( iconProvider );
}