Merge branch 'master' into V7_5_BR

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index a62e2fc8721b49aa12b3d27bba0449a9f4e9293f..e97566a1de124236f4e9b7138cac22156ffb2726 100644 (file)
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -132,11 +132,9 @@
 #include <pqScalarBarVisibilityReaction.h>
 #include <pqServerResource.h>
 #include <pqServerConnectReaction.h>
+#include <pqPluginManager.h>
 
-// TO REMOVE:
-#include <PyInterp_Interp.h>
-
-#include <PVViewer_EngineWrapper.h>
+//#include <PVViewer_EngineWrapper.h>
 
 
 //----------------------------------------------------------------------------

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index cf88c7d084ed08c368dc6c81815af3b60416fdc7..e41713e2ae6341a42c8f8eade5ab6e2490ade34b 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -484,22 +484,18 @@ void PVGUI_Module::pvCreateMenus()
   // --- Menu "Sources"
   // Install ParaView managers for "Sources" menu
   QMenu* aRes = 0;
-  QMenu* filtersMenu = 0;
   PVViewer_GUIElements * guiElements = PVViewer_GUIElements::GetInstance(desk);
-  mySourcesMenuId = createMenu( tr( "MEN_DESK_SOURCES" ), -1, -1, 60);
-  if ( (aRes = getMenu( mySourcesMenuId )) )
-    pqParaViewMenuBuilders::buildSourcesMenu(*aRes, desk);
+  aRes = guiElements->getSourcesMenu();
+  mySourcesMenuId = createMenu( tr( "MEN_DESK_SOURCES" ), -1, -1, 60, -1, aRes);
   
   // --- Menu "Filters"
   // Install ParaView managers for "Filters" menu
-  myFiltersMenuId = createMenu( tr( "MEN_DESK_FILTERS" ), -1, -1, 70 );
-  if ( (filtersMenu = getMenu( myFiltersMenuId )) )
-    pqParaViewMenuBuilders::buildFiltersMenu(*filtersMenu, desk);
+  aRes = guiElements->getFiltersMenu();
+  myFiltersMenuId = createMenu( tr( "MEN_DESK_FILTERS" ), -1, -1, 70, -1, aRes);
 
    // --- Menu "Macros"
-  myMacrosMenuId = createMenu( tr( "MEN_MACROS" ), -1, -1, 80 );
-  if ( (aRes = getMenu( myMacrosMenuId )) )
-    pqParaViewMenuBuilders::buildMacrosMenu(*aRes);
+  aRes = guiElements->getMacrosMenu();
+  myMacrosMenuId = createMenu( tr( "MEN_MACROS" ), -1, -1, 80, -1, aRes);
  
   // --- Menu "Tools"
   int aToolsMnu = createMenu( tr( "MEN_DESK_TOOLS" ), -1, -1, 90 );