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

22
ApplicationLibCode/UserInterface/RiuMainWindowBase.cpp
View File

@@ -50,7 +50,7 @@
#include <QUndoStack>
#include <QUndoView>
#define DOCKSTATE_VERSION 1
#define DOCKSTATE_VERSION 2
//--------------------------------------------------------------------------------------------------
///
@@ -154,9 +154,17 @@ void RiuMainWindowBase::loadWinGeoAndDockToolBarLayout()
}
}
}
bool dockingOk = false;
if ( dockState.isValid() )
{
m_dockManager->restoreState( dockState.toByteArray(), DOCKSTATE_VERSION );
dockingOk = m_dockManager->restoreState( dockState.toByteArray(), DOCKSTATE_VERSION );
}
if ( !dockingOk )
{
m_dockManager->restoreState( RiuDockWidgetTools::defaultDockState( defaultDockStateNames()[0] ), DOCKSTATE_VERSION );
}
settings.beginGroup( registryFolderName() );
@@ -692,11 +700,15 @@ void RiuMainWindowBase::saveDockLayout()
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::addDefaultEntriesToWindowsMenu()
{
QMenu* showHideMenu = m_windowMenu->addMenu( "Show/Hide Windows" );
QMenu* dockWindowsMenu = m_windowMenu->addMenu( QIcon( ":/window-management.svg" ), "Windows" );
for ( auto dock : dockManager()->dockWidgetsMap() )
auto dockMap = dockManager()->dockWidgetsMap();
auto keys = dockMap.keys();
keys.sort();
for ( auto& key : keys )
{
showHideMenu->addAction( dock->toggleViewAction() );
auto dock = dockMap[key];
dockWindowsMenu->addAction( dock->toggleViewAction() );
}
m_windowMenu->addSeparator();