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

#4410 Dock Window State : Use hideAllDockWidgets() in base class

Browse Source
This commit is contained in:
Magne Sjaastad
2019-05-15 12:31:27 +02:00
parent 95124adca6
commit 699870c8c7
11 changed files with 22 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/UserInterface/RiuDockWidgetTools.cpp
View File

@@ -235,15 +235,17 @@ void RiuDockWidgetTools::restoreDockWidgetsVisibility(const QObject* parent, QVa
{
if (dock)
{
auto widgetVisibility = widgetVisibilityMap.find(dock->objectName());
bool isVisible = true;
auto widgetVisibility = widgetVisibilityMap.find(dock->objectName());
if (widgetVisibility != widgetVisibilityMap.end())
{
bool isVisible = widgetVisibility.value().toBool();
dock->setVisible(isVisible);
// qDebug() << "Restore " << dock->objectName() << " : " << (isVisible ? "visible" : "not visible");
isVisible = widgetVisibility.value().toBool();
}
dock->setVisible(isVisible);
// qDebug() << "Restore " << dock->objectName() << " : " << (isVisible ? "visible" : "not visible");
}
}
}

6
ApplicationCode/UserInterface/RiuDockWidgetTools.h
View File

@@ -54,10 +54,10 @@ public:
static QVariant storeDockWidgetsVisibility(const QObject* parent);
static void restoreDockWidgetsVisibility(const QObject* parent, QVariant widgetVisibilities);
static void setVisibleDockingWindowsForEclipse();
static void setVisibleDockingWindowsForGeoMech();
static void setVisibleDockingWindowsForEclipse();
static void setVisibleDockingWindowsForGeoMech();
static void trySetDockWidgetVisibility(const QObject* parent, const QString& dockWidgetName, bool isVisible);
private:
static QDockWidget* findDockWidget(const QObject* parent, const QString& dockWidgetName);
static void trySetDockWidgetVisibility(const QObject* parent, const QString& dockWidgetName, bool isVisible);
};

36
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -271,7 +271,7 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
void RiuMainWindow::closeEvent(QCloseEvent* event)
{
this->saveWinGeoAndDockToolBarLayout();
this->hideAllDockWindows();
this->hideAllDockWidgets();
RiaGuiApplication* app = RiaGuiApplication::instance();
if (app->isMainPlotWindowVisible())
@@ -1501,19 +1501,6 @@ void RiuMainWindow::slotSnapshotAllViewsToFile()
RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(absolutePathToSnapshotDir);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::hideAllDockWindows()
{
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
for (auto* dockWidget : dockWidgets)
{
dockWidget->close();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1675,25 +1662,6 @@ void RiuMainWindow::restoreTreeViewState()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::showDockPanel(const QString& dockPanelName)
{
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
foreach (QDockWidget* dock, dockWidgets)
{
if (dock && dock->objectName() == dockPanelName)
{
dock->show();
dock->raise();
return;
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1781,7 +1749,7 @@ void RiuMainWindow::updateMemoryUsage()
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::showProcessMonitorDockPanel()
{
showDockPanel(RiuDockWidgetTools::processMonitorName());
RiuDockWidgetTools::trySetDockWidgetVisibility(this, RiuDockWidgetTools::processMonitorName(), true);
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -99,9 +99,6 @@ public:
RiuProcessMonitor* processMonitor();
void hideAllDockWindows();
void selectedCases(std::vector<RimCase*>& cases);
void setDefaultWindowSize();
@@ -141,8 +138,6 @@ private:
void restoreTreeViewState();
void showDockPanel(const QString& dockPanelName);
void updateUiFieldsFromActiveResult(caf::PdmObjectHandle* objectToUpdate);
private:

2
ApplicationCode/UserInterface/RiuMainWindowBase.cpp
View File

@@ -142,7 +142,7 @@ void RiuMainWindowBase::showWindow()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMainWindowBase::closeAllDockWidgets()
void RiuMainWindowBase::hideAllDockWidgets()
{
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();

2
ApplicationCode/UserInterface/RiuMainWindowBase.h
View File

@@ -59,7 +59,7 @@ public:
void restoreDockWidgetVisibilities();
void showWindow();
void closeAllDockWidgets();
void hideAllDockWidgets();
caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView;}
void setExpanded(const caf::PdmUiItem* uiItem, bool expanded = true);

15
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@@ -181,7 +181,7 @@ void RiuPlotMainWindow::closeEvent(QCloseEvent* event)
{
this->saveWinGeoAndDockToolBarLayout();
this->hideAllDockWindows();
this->hideAllDockWidgets();
RiaGuiApplication* app = RiaGuiApplication::instance();
@@ -769,19 +769,6 @@ void RiuPlotMainWindow::selectedObjectsChanged()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuPlotMainWindow::hideAllDockWindows()
{
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
for (int i = 0; i < dockWidgets.size(); i++)
{
dockWidgets[i]->close();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/UserInterface/RiuPlotMainWindow.h
View File

@@ -64,8 +64,6 @@ public:
void addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry) override;
void setActiveViewer(QWidget* subWindow) override;
void hideAllDockWindows();
void setDefaultWindowSize();
void tileSubWindows() override;