From 2c657676cc5d7be83aedffbf8da5391469c4408e Mon Sep 17 00:00:00 2001
From: abn <adrien.bruneton@cea.fr>
Date: Tue, 28 Oct 2014 11:00:02 +0100
Subject: [PATCH] Fixed: contextual menu in pipeline browser + VCR controls

---
 src/PVGUI/PVGUI_Module.cxx         | 7 +++++--
 src/PVGUI/PVGUI_Module_actions.cxx | 5 +++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 525d2777..9f8165a3 100644
--- 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 271c01aa..303d4ff7 100644
--- 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);
 
-- 
2.30.2