- //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
+ // Properties dock (previously called OBJECT_INSPECTOR)
+ QDockWidget* propertiesDock = new QDockWidget( tr( "TTL_OBJECT_INSPECTOR" ), desk );
+ propertiesDock->setObjectName("propertiesDock");
+ propertiesDock->setAllowedAreas( Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea );
+ desk->addDockWidget( Qt::LeftDockWidgetArea, propertiesDock );
+
+ pqPropertiesPanel* propertiesPanel = guiElements->getPropertiesPanel();
+ propertiesDock->setWidget(propertiesPanel);
+ connect( propertiesPanel, SIGNAL( helpRequested(const QString&, const QString&) ), this, SLOT( showHelpForProxy(const QString&, const QString&) ) );
+ // hook delete to pqDeleteReaction.
+ QAction* tempDeleteAction = new QAction(this);
+ pqDeleteReaction* handler = new pqDeleteReaction(tempDeleteAction);
+ handler->connect(propertiesPanel, SIGNAL(deleteRequested(pqPipelineSource*)), SLOT(deleteSource(pqPipelineSource*)));
+
+ myDockWidgets[propertiesDock] = true;
+
+ // Information dock