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

Docking updates (#9219)

Browse Source 
* Add icons to dock windows. Rearrange ordering in windows menu. Set default dock layout if last stored layout is not valid when resinsight loads
This commit is contained in:
jonjenssen
2022-08-22 12:42:29 +02:00
committed by GitHub
parent 4cd38d7daf
commit 116420e82f
7 changed files with 360 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
View File

@@ -89,9 +89,11 @@ RiuPlotMainWindow::RiuPlotMainWindow()
m_mdiArea = new RiuMdiArea( this );
connect( m_mdiArea, SIGNAL( subWindowActivated( QMdiSubWindow* ) ), SLOT( slotSubWindowActivated( QMdiSubWindow* ) ) );
ads::CDockWidget* widget = new ads::CDockWidget( "Plot Window", this );
widget->setWidget( m_mdiArea );
auto dockArea = dockManager()->setCentralWidget( widget );
ads::CDockWidget* cWidget =
RiuDockWidgetTools::createDockWidget( "Plot Window", RiuDockWidgetTools::mainPlotWindowName(), this );
cWidget->setWidget( m_mdiArea );
auto dockArea = dockManager()->setCentralWidget( cWidget );
dockArea->setVisible( true );
m_toggleSelectionLinkAction = new QAction( QIcon( ":/Link3DandPlots.png" ), tr( "Link With Selection in 3D" ), this );
@@ -524,8 +526,7 @@ void RiuPlotMainWindow::createDockPanels()
// the project trees
for ( int i = 0; i < nTreeViews; i++ )
{
ads::CDockWidget* dockWidget = new ads::CDockWidget( treeViewTitles[i], dockManager() );
dockWidget->setObjectName( treeViewDockNames[i] );
auto dockWidget = RiuDockWidgetTools::createDockWidget( treeViewTitles[i], treeViewDockNames[i], dockManager() );
caf::PdmUiTreeView* projectTree = projectTreeView( i );
projectTree->enableSelectionManagerUpdating( true );
@@ -564,8 +565,9 @@ void RiuPlotMainWindow::createDockPanels()
// the plot manager
{
ads::CDockWidget* dockWidget = new ads::CDockWidget( "Plot Manager", dockManager() );
dockWidget->setObjectName( RiuDockWidgetTools::summaryPlotManagerName() );
auto dockWidget = RiuDockWidgetTools::createDockWidget( "Plot Manager",
RiuDockWidgetTools::plotMainWindowPlotManagerName(),
dockManager() );
m_summaryPlotManagerView = std::make_unique<caf::PdmUiPropertyView>( dockWidget );
@@ -582,8 +584,10 @@ void RiuPlotMainWindow::createDockPanels()
// the undo stack
if ( m_undoView && RiaPreferences::current()->useUndoRedo() )
{
ads::CDockWidget* dockWidget = new ads::CDockWidget( "Undo Stack", dockManager() );
dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowUndoStackName() );
auto dockWidget = RiuDockWidgetTools::createDockWidget( "Undo Stack",
RiuDockWidgetTools::plotMainWindowUndoStackName(),
dockManager() );
dockWidget->setWidget( m_undoView );
rightWidgets.push_back( dockWidget );
}
@@ -596,8 +600,9 @@ void RiuPlotMainWindow::createDockPanels()
// the property editor
{
ads::CDockWidget* dockWidget = new ads::CDockWidget( "Property Editor", dockManager() );
dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowPropertyEditorName() );
auto dockWidget = RiuDockWidgetTools::createDockWidget( "Property Editor",
RiuDockWidgetTools::plotMainWindowPropertyEditorName(),
dockManager() );
m_pdmUiPropertyView = std::make_unique<caf::PdmUiPropertyView>( dockWidget );
dockWidget->setWidget( m_pdmUiPropertyView.get() );
@@ -606,8 +611,10 @@ void RiuPlotMainWindow::createDockPanels()
// the log message view
{
ads::CDockWidget* dockWidget = new ads::CDockWidget( "Messages", dockManager() );
dockWidget->setObjectName( RiuDockWidgetTools::plotMainWindowMessagesName() );
auto dockWidget = RiuDockWidgetTools::createDockWidget( "Messages",
RiuDockWidgetTools::plotMainWindowMessagesName(),
dockManager() );
m_messagePanel = new RiuMessagePanel( dockWidget );
dockWidget->setWidget( m_messagePanel );
dockManager()->addDockWidget( ads::DockWidgetArea::BottomDockWidgetArea, dockWidget, rightArea );
@@ -806,7 +813,7 @@ RiuMessagePanel* RiuPlotMainWindow::messagePanel()
void RiuPlotMainWindow::showAndSetKeyboardFocusToSummaryPlotManager()
{
auto dockWidget =
RiuDockWidgetTools::findDockWidget( this->dockManager(), RiuDockWidgetTools::summaryPlotManagerName() );
RiuDockWidgetTools::findDockWidget( this->dockManager(), RiuDockWidgetTools::plotMainWindowPlotManagerName() );
if ( dockWidget )
{
dockWidget->setVisible( true );