Fixed: contextual menu in pipeline browser + VCR controls

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 525d2777499c5869d13456a8b9a0bfa199db206d..9f8165a3d920b50b2e90149527a26c644a0771d2 100644 (file)
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -380,11 +380,14 @@ void PVGUI_Module::initialize( CAM_Application* app )
   // Behaviors and connection must be instanciated *after* widgets are in place
   // In PARAVIS module we do not wait for PVViewer_ViewWindow to be instanciated to have this:
   PVViewer_ViewManager::ParaviewInitBehaviors(true, aDesktop);
-  PVViewer_ViewManager::ConnectToExternalPVServer(aDesktop);
 
   pvCreateActions();
-  pvCreateToolBars();
   pvCreateMenus();
+  pvCreateToolBars();
+
+  // Connect after toolbar creation, etc ... as some activations of the toolbars is triggered
+  // by the ServerConnection event:
+  PVViewer_ViewManager::ConnectToExternalPVServer(aDesktop);
 
   QList<QDockWidget*> activeDocks = aDesktop->findChildren<QDockWidget*>();
   QList<QMenu*> activeMenus = aDesktop->findChildren<QMenu*>();

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index 271c01aaf54eb13351076afe0591d504f103bb5a..303d4ff781dd059c8457ed3e1dacbf0af36c3106 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -82,6 +82,7 @@
 #include <pqViewManager.h>
 #include <pqDataQueryReaction.h>
 #include <pqRecentFilesMenu.h>
+#include <pqPipelineBrowserWidget.h>
 
 #include "PVGUI_Tools.h"
 
@@ -536,6 +537,10 @@ void PVGUI_Module::pvCreateMenus()
 #endif
   createMenu( AboutParaViewId, aPVHelpMnu );
 
+  // -- Context menu in the pipeline browser
+  pqPipelineBrowserWidget * pq = guiElements->getPipelineBrowserWidget();
+  pqParaViewMenuBuilders::buildPipelineBrowserContextMenu( *pq );
+
   // Reload configuration to populate dynamic menus from ParaView:
   PVViewer_ViewManager::ParaviewLoadConfigurations(true);