mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4410 Dock Window State : Use hideAllDockWidgets() in base class
This commit is contained in:
parent
95124adca6
commit
699870c8c7
@ -567,7 +567,7 @@ void RiaGuiApplication::initialize()
|
|||||||
// The plot window is created to be able to set expanded state on created objects, but hidden by default
|
// The plot window is created to be able to set expanded state on created objects, but hidden by default
|
||||||
getOrCreateAndShowMainWindow();
|
getOrCreateAndShowMainWindow();
|
||||||
RiuPlotMainWindow* plotMainWindow = getOrCreateMainPlotWindow();
|
RiuPlotMainWindow* plotMainWindow = getOrCreateMainPlotWindow();
|
||||||
plotMainWindow->hideAllDockWindows();
|
plotMainWindow->hideAllDockWidgets();
|
||||||
|
|
||||||
RiaLogging::setLoggerInstance(new RiuMessagePanelLogger(m_mainWindow->messagePanel()));
|
RiaLogging::setLoggerInstance(new RiuMessagePanelLogger(m_mainWindow->messagePanel()));
|
||||||
RiaLogging::loggerInstance()->setLevel(RI_LL_DEBUG);
|
RiaLogging::loggerInstance()->setLevel(RI_LL_DEBUG);
|
||||||
@ -808,7 +808,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments(cvf::Progra
|
|||||||
{
|
{
|
||||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||||
CVF_ASSERT(mainWnd);
|
CVF_ASSERT(mainWnd);
|
||||||
mainWnd->hideAllDockWindows();
|
mainWnd->hideAllDockWidgets();
|
||||||
|
|
||||||
// 2016-11-09 : Location of snapshot folder was previously located in 'snapshot' folder
|
// 2016-11-09 : Location of snapshot folder was previously located in 'snapshot' folder
|
||||||
// relative to current working folder. Now harmonized to behave as RiuMainWindow::slotSnapshotAllViewsToFile()
|
// relative to current working folder. Now harmonized to behave as RiuMainWindow::slotSnapshotAllViewsToFile()
|
||||||
@ -822,7 +822,7 @@ RiaApplication::ApplicationStatus RiaGuiApplication::handleArguments(cvf::Progra
|
|||||||
{
|
{
|
||||||
if (mainPlotWindow())
|
if (mainPlotWindow())
|
||||||
{
|
{
|
||||||
mainPlotWindow()->hideAllDockWindows();
|
mainPlotWindow()->hideAllDockWidgets();
|
||||||
|
|
||||||
// Will be saved relative to current directory
|
// Will be saved relative to current directory
|
||||||
RicSnapshotAllPlotsToFileFeature::saveAllPlots();
|
RicSnapshotAllPlotsToFileFeature::saveAllPlots();
|
||||||
@ -1030,7 +1030,7 @@ void RiaGuiApplication::createMainPlotWindow()
|
|||||||
m_mainPlotWindow->setWindowTitle("Plots - ResInsight");
|
m_mainPlotWindow->setWindowTitle("Plots - ResInsight");
|
||||||
m_mainPlotWindow->setDefaultWindowSize();
|
m_mainPlotWindow->setDefaultWindowSize();
|
||||||
m_mainPlotWindow->loadWinGeoAndDockToolBarLayout();
|
m_mainPlotWindow->loadWinGeoAndDockToolBarLayout();
|
||||||
m_mainPlotWindow->hideAllDockWindows();
|
m_mainPlotWindow->hideAllDockWidgets();
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
@ -1645,7 +1645,7 @@ void RiaGuiApplication::runMultiCaseSnapshots(const QString& templateProje
|
|||||||
{
|
{
|
||||||
if (!m_mainWindow) return;
|
if (!m_mainWindow) return;
|
||||||
|
|
||||||
m_mainWindow->hideAllDockWindows();
|
m_mainWindow->hideAllDockWidgets();
|
||||||
|
|
||||||
const size_t numGridFiles = gridFileNames.size();
|
const size_t numGridFiles = gridFileNames.size();
|
||||||
for (size_t i = 0; i < numGridFiles; i++)
|
for (size_t i = 0; i < numGridFiles; i++)
|
||||||
|
@ -641,7 +641,7 @@ void RiaRegressionTestRunner::executeRegressionTests(const QString& regressionTe
|
|||||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||||
if (mainWnd)
|
if (mainWnd)
|
||||||
{
|
{
|
||||||
mainWnd->hideAllDockWindows();
|
mainWnd->hideAllDockWidgets();
|
||||||
mainWnd->statusBar()->close();
|
mainWnd->statusBar()->close();
|
||||||
|
|
||||||
mainWnd->setDefaultWindowSize();
|
mainWnd->setDefaultWindowSize();
|
||||||
|
@ -66,7 +66,7 @@ void RicfExportSnapshots::execute()
|
|||||||
|
|
||||||
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
RiuMainWindow* mainWnd = RiuMainWindow::instance();
|
||||||
CVF_ASSERT(mainWnd);
|
CVF_ASSERT(mainWnd);
|
||||||
mainWnd->hideAllDockWindows();
|
mainWnd->hideAllDockWidgets();
|
||||||
RiaGuiApplication::instance()->processEvents();
|
RiaGuiApplication::instance()->processEvents();
|
||||||
|
|
||||||
QString absolutePathToSnapshotDir = RicfCommandFileExecutor::instance()->getExportPath(RicfCommandFileExecutor::SNAPSHOTS);
|
QString absolutePathToSnapshotDir = RicfCommandFileExecutor::instance()->getExportPath(RicfCommandFileExecutor::SNAPSHOTS);
|
||||||
|
@ -235,15 +235,17 @@ void RiuDockWidgetTools::restoreDockWidgetsVisibility(const QObject* parent, QVa
|
|||||||
{
|
{
|
||||||
if (dock)
|
if (dock)
|
||||||
{
|
{
|
||||||
auto widgetVisibility = widgetVisibilityMap.find(dock->objectName());
|
bool isVisible = true;
|
||||||
|
|
||||||
|
auto widgetVisibility = widgetVisibilityMap.find(dock->objectName());
|
||||||
if (widgetVisibility != widgetVisibilityMap.end())
|
if (widgetVisibility != widgetVisibilityMap.end())
|
||||||
{
|
{
|
||||||
bool isVisible = widgetVisibility.value().toBool();
|
isVisible = widgetVisibility.value().toBool();
|
||||||
dock->setVisible(isVisible);
|
|
||||||
|
|
||||||
// qDebug() << "Restore " << dock->objectName() << " : " << (isVisible ? "visible" : "not visible");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
dock->setVisible(isVisible);
|
||||||
|
|
||||||
|
// qDebug() << "Restore " << dock->objectName() << " : " << (isVisible ? "visible" : "not visible");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -54,10 +54,10 @@ public:
|
|||||||
static QVariant storeDockWidgetsVisibility(const QObject* parent);
|
static QVariant storeDockWidgetsVisibility(const QObject* parent);
|
||||||
static void restoreDockWidgetsVisibility(const QObject* parent, QVariant widgetVisibilities);
|
static void restoreDockWidgetsVisibility(const QObject* parent, QVariant widgetVisibilities);
|
||||||
|
|
||||||
static void setVisibleDockingWindowsForEclipse();
|
static void setVisibleDockingWindowsForEclipse();
|
||||||
static void setVisibleDockingWindowsForGeoMech();
|
static void setVisibleDockingWindowsForGeoMech();
|
||||||
|
static void trySetDockWidgetVisibility(const QObject* parent, const QString& dockWidgetName, bool isVisible);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static QDockWidget* findDockWidget(const QObject* parent, const QString& dockWidgetName);
|
static QDockWidget* findDockWidget(const QObject* parent, const QString& dockWidgetName);
|
||||||
static void trySetDockWidgetVisibility(const QObject* parent, const QString& dockWidgetName, bool isVisible);
|
|
||||||
};
|
};
|
||||||
|
@ -271,7 +271,7 @@ void RiuMainWindow::cleanupGuiBeforeProjectClose()
|
|||||||
void RiuMainWindow::closeEvent(QCloseEvent* event)
|
void RiuMainWindow::closeEvent(QCloseEvent* event)
|
||||||
{
|
{
|
||||||
this->saveWinGeoAndDockToolBarLayout();
|
this->saveWinGeoAndDockToolBarLayout();
|
||||||
this->hideAllDockWindows();
|
this->hideAllDockWidgets();
|
||||||
|
|
||||||
RiaGuiApplication* app = RiaGuiApplication::instance();
|
RiaGuiApplication* app = RiaGuiApplication::instance();
|
||||||
if (app->isMainPlotWindowVisible())
|
if (app->isMainPlotWindowVisible())
|
||||||
@ -1501,19 +1501,6 @@ void RiuMainWindow::slotSnapshotAllViewsToFile()
|
|||||||
RicSnapshotAllViewsToFileFeature::exportSnapshotOfAllViewsIntoFolder(absolutePathToSnapshotDir);
|
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()
|
void RiuMainWindow::showProcessMonitorDockPanel()
|
||||||
{
|
{
|
||||||
showDockPanel(RiuDockWidgetTools::processMonitorName());
|
RiuDockWidgetTools::trySetDockWidgetVisibility(this, RiuDockWidgetTools::processMonitorName(), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -99,9 +99,6 @@ public:
|
|||||||
|
|
||||||
RiuProcessMonitor* processMonitor();
|
RiuProcessMonitor* processMonitor();
|
||||||
|
|
||||||
void hideAllDockWindows();
|
|
||||||
|
|
||||||
|
|
||||||
void selectedCases(std::vector<RimCase*>& cases);
|
void selectedCases(std::vector<RimCase*>& cases);
|
||||||
|
|
||||||
void setDefaultWindowSize();
|
void setDefaultWindowSize();
|
||||||
@ -141,8 +138,6 @@ private:
|
|||||||
|
|
||||||
void restoreTreeViewState();
|
void restoreTreeViewState();
|
||||||
|
|
||||||
void showDockPanel(const QString& dockPanelName);
|
|
||||||
|
|
||||||
void updateUiFieldsFromActiveResult(caf::PdmObjectHandle* objectToUpdate);
|
void updateUiFieldsFromActiveResult(caf::PdmObjectHandle* objectToUpdate);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
@ -142,7 +142,7 @@ void RiuMainWindowBase::showWindow()
|
|||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
void RiuMainWindowBase::closeAllDockWidgets()
|
void RiuMainWindowBase::hideAllDockWidgets()
|
||||||
{
|
{
|
||||||
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
|
QList<QDockWidget*> dockWidgets = findChildren<QDockWidget*>();
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ public:
|
|||||||
void restoreDockWidgetVisibilities();
|
void restoreDockWidgetVisibilities();
|
||||||
void showWindow();
|
void showWindow();
|
||||||
|
|
||||||
void closeAllDockWidgets();
|
void hideAllDockWidgets();
|
||||||
|
|
||||||
caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView;}
|
caf::PdmUiTreeView* projectTreeView() { return m_projectTreeView;}
|
||||||
void setExpanded(const caf::PdmUiItem* uiItem, bool expanded = true);
|
void setExpanded(const caf::PdmUiItem* uiItem, bool expanded = true);
|
||||||
|
@ -181,7 +181,7 @@ void RiuPlotMainWindow::closeEvent(QCloseEvent* event)
|
|||||||
{
|
{
|
||||||
this->saveWinGeoAndDockToolBarLayout();
|
this->saveWinGeoAndDockToolBarLayout();
|
||||||
|
|
||||||
this->hideAllDockWindows();
|
this->hideAllDockWidgets();
|
||||||
|
|
||||||
RiaGuiApplication* app = RiaGuiApplication::instance();
|
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
///
|
///
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
@ -64,8 +64,6 @@ public:
|
|||||||
void addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry) override;
|
void addViewer(QWidget* viewer, const RimMdiWindowGeometry& windowsGeometry) override;
|
||||||
void setActiveViewer(QWidget* subWindow) override;
|
void setActiveViewer(QWidget* subWindow) override;
|
||||||
|
|
||||||
void hideAllDockWindows();
|
|
||||||
|
|
||||||
void setDefaultWindowSize();
|
void setDefaultWindowSize();
|
||||||
|
|
||||||
void tileSubWindows() override;
|
void tileSubWindows() override;
|
||||||
|
Loading…
Reference in New Issue
Block a user