From 61346046dcf6291f4bbdde0519a1fbfa36512865 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 29 Nov 2013 08:46:37 +0000 Subject: [PATCH] Rollback changes related to the "0022226: [CEA 825] "Display" and "Properties" panels separated in Paravis and merged in Paraview" issue. --- resources/SalomeApp.xml.in | 4 +-- src/PVGUI/PVGUI_Module_widgets.cxx | 54 ++++++++++++++++++++++-------- 2 files changed, 42 insertions(+), 16 deletions(-) diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index bf04c2e3..cca00733 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -46,9 +46,9 @@
- +
- +
diff --git a/src/PVGUI/PVGUI_Module_widgets.cxx b/src/PVGUI/PVGUI_Module_widgets.cxx index 455c282a..e6b858e9 100644 --- a/src/PVGUI/PVGUI_Module_widgets.cxx +++ b/src/PVGUI/PVGUI_Module_widgets.cxx @@ -54,6 +54,8 @@ #include #include #include +#include +#include #include #include @@ -75,7 +77,6 @@ #include #include #include -#include class ResizeHelper : public pqPVAnimationWidget { @@ -124,15 +125,40 @@ void PVGUI_Module::setupDockWidgets() pipelineBrowserDock->setWidget(browser); myDockWidgets[pipelineBrowserDock] = true; - // Properties dock - QDockWidget* propertiesDock = new QDockWidget(tr( "TTL_OBJECT_INSPECTOR" ), desk); - propertiesDock->setObjectName("propertiesDock"); - pqPropertiesPanel* propertiesPanel = new pqPropertiesPanel(); - propertiesPanel->setObjectName("propertiesPanel"); - propertiesDock->setWidget(propertiesPanel); - desk->addDockWidget(Qt::LeftDockWidgetArea, propertiesDock); - connect( propertiesPanel, SIGNAL( helpRequested(const QString&, const QString&) ), this, SLOT( showHelpForProxy(const QString&, const QString&) ) ); - myDockWidgets[propertiesDock] = true; + //Object inspector + QDockWidget* objectInspectorDock = new QDockWidget( tr( "TTL_OBJECT_INSPECTOR" ), desk ); + objectInspectorDock->setObjectName("objectInspectorDock"); + objectInspectorDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::NoDockWidgetArea|Qt::RightDockWidgetArea ); + desk->addDockWidget( Qt::LeftDockWidgetArea, objectInspectorDock ); + + pqObjectInspectorWidget* objectInspectorWidget = new pqObjectInspectorWidget(objectInspectorDock); + objectInspectorDock->setObjectName("objectInspectorWidget"); + objectInspectorWidget->setShowOnAccept(true); + objectInspectorDock->setWidget(objectInspectorWidget); + connect( objectInspectorWidget, SIGNAL( helpRequested(const QString&, const QString&) ), this, SLOT( showHelpForProxy(const QString&, const QString&) ) ); + myDockWidgets[objectInspectorDock] = true; + + //Display Dock + QDockWidget* displayDock = new QDockWidget( tr( "TTL_DISPLAY" ), desk ); + displayDock->setObjectName("displayDock"); + QWidget* displayWidgetFrame = new QWidget(displayDock); + displayWidgetFrame->setObjectName("displayWidgetFrame"); + displayDock->setWidget(displayWidgetFrame); + + QScrollArea* displayScrollArea = new QScrollArea(displayWidgetFrame); + displayScrollArea->setObjectName("displayScrollArea"); + displayScrollArea->setWidgetResizable(true); + + QVBoxLayout* verticalLayout = new QVBoxLayout(displayWidgetFrame); + verticalLayout->setSpacing(0); + verticalLayout->setContentsMargins(0, 0, 0, 0); + + pqDisplayProxyEditorWidget* displayWidget = new pqDisplayProxyEditorWidget(displayDock); + displayWidget->setObjectName("displayWidget"); + displayScrollArea->setWidget(displayWidget); + verticalLayout->addWidget(displayScrollArea); + + myDockWidgets[displayDock] = true; // information dock QDockWidget* informationDock = new QDockWidget(tr( "TTL_INFORMATION" ), desk); @@ -157,13 +183,13 @@ void PVGUI_Module::setupDockWidgets() verticalLayout_2->addWidget(informationScrollArea); informationDock->setWidget(informationWidgetFrame); - desk->addDockWidget(Qt::LeftDockWidgetArea, informationDock); myDockWidgets[informationDock] = true; - // put 'Properties' and 'Information' widgets into tabs desk->setTabPosition(Qt::LeftDockWidgetArea, QTabWidget::North); - desk->tabifyDockWidget(propertiesDock, informationDock); - propertiesDock->raise(); + desk->tabifyDockWidget(objectInspectorDock, displayDock); + desk->tabifyDockWidget(objectInspectorDock, informationDock); + objectInspectorDock->raise(); + // Statistic View QDockWidget* statisticsViewDock = new QDockWidget( tr( "TTL_STATISTICS_VIEW" ), desk ); -- 2.39.2