mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#803 Added version number to dock/toolbar layout registry settings
This commit is contained in:
parent
3bcb7b9f1b
commit
71dce565c5
@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
#include "RiuMainWindowBase.h"
|
#include "RiuMainWindowBase.h"
|
||||||
#include "QSettings"
|
#include "QSettings"
|
||||||
|
#include "RiaVersionInfo.h"
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
@ -35,8 +36,8 @@ void RiuMainWindowBase::loadWinGeoAndDockToolBarLayout()
|
|||||||
// Company and appname set through QCoreApplication
|
// Company and appname set through QCoreApplication
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
|
|
||||||
QVariant winGeo = settings.value(QString("%1/winGeometry").arg(mainWindowName()));
|
QVariant winGeo = settings.value(QString("%1/winGeometry").arg(registryFolderName()));
|
||||||
QVariant layout = settings.value(QString("%1/dockAndToolBarLayout").arg(mainWindowName()));
|
QVariant layout = settings.value(QString("%1/dockAndToolBarLayout").arg(registryFolderName()));
|
||||||
|
|
||||||
if (winGeo.isValid())
|
if (winGeo.isValid())
|
||||||
{
|
{
|
||||||
@ -59,12 +60,12 @@ void RiuMainWindowBase::saveWinGeoAndDockToolBarLayout()
|
|||||||
QSettings settings;
|
QSettings settings;
|
||||||
|
|
||||||
QByteArray winGeo = saveGeometry();
|
QByteArray winGeo = saveGeometry();
|
||||||
settings.setValue(QString("%1/winGeometry").arg(mainWindowName()), winGeo);
|
settings.setValue(QString("%1/winGeometry").arg(registryFolderName()), winGeo);
|
||||||
|
|
||||||
QByteArray layout = saveState(0);
|
QByteArray layout = saveState(0);
|
||||||
settings.setValue(QString("%1/dockAndToolBarLayout").arg(mainWindowName()), layout);
|
settings.setValue(QString("%1/dockAndToolBarLayout").arg(registryFolderName()), layout);
|
||||||
|
|
||||||
settings.setValue(QString("%1/isMaximized").arg(mainWindowName()), isMaximized());
|
settings.setValue(QString("%1/isMaximized").arg(registryFolderName()), isMaximized());
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -77,9 +78,19 @@ void RiuMainWindowBase::showWindow()
|
|||||||
|
|
||||||
showNormal();
|
showNormal();
|
||||||
|
|
||||||
QVariant isMax = settings.value(QString("%1/isMaximized").arg(mainWindowName()), false);
|
QVariant isMax = settings.value(QString("%1/isMaximized").arg(registryFolderName()), false);
|
||||||
if (isMax.toBool())
|
if (isMax.toBool())
|
||||||
{
|
{
|
||||||
showMaximized();
|
showMaximized();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
///
|
||||||
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
QString RiuMainWindowBase::registryFolderName()
|
||||||
|
{
|
||||||
|
QString versionName(STRPRODUCTVER);
|
||||||
|
QString regFolder = QString("%1/%2").arg(versionName).arg(mainWindowName());
|
||||||
|
return regFolder;
|
||||||
|
}
|
||||||
|
@ -32,6 +32,8 @@ public:
|
|||||||
void loadWinGeoAndDockToolBarLayout();
|
void loadWinGeoAndDockToolBarLayout();
|
||||||
void saveWinGeoAndDockToolBarLayout();
|
void saveWinGeoAndDockToolBarLayout();
|
||||||
void showWindow();
|
void showWindow();
|
||||||
|
private:
|
||||||
|
QString registryFolderName();
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user