Merge topic 'remove-catalyst-generator-plugin'

4366c95f

 adapt to promotion of catalyst script generator in GUI proper
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrew Bauer <andy.bauer@kitware.com>
Merge-request: !408

tests/paraview.test.cmake

@@ -162,12 +162,8 @@ if (mesa_enabled AND python_enabled)
   endif()
 endif ()
 
-if (python_enabled)
-  # This test needs Python since we test that the `CatalystScriptGeneratorPlugin` can
-  # be loaded.
-  paraview_add_ui_test("loaddistributedplugins" "LoadDistributedPlugins"
-    "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/LoadDistributedPlugins.png")
-endif ()
+paraview_add_ui_test("loaddistributedplugins" "LoadDistributedPlugins"
+  "--test-baseline=${CMAKE_CURRENT_LIST_DIR}/baselines/LoadDistributedPlugins.png")
 
 if (vortexfinder2_enabled)
   paraview_add_ui_test("loadvortexfinderplugins" "LoadVotexFinderPlugins")

tests/xml/LoadDistributedPlugins.xml

@@ -7,11 +7,10 @@
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="SurfaceLIC" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
-  <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="CatalystScriptGeneratorPlugin" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/loadSelected_Local" command="activate" arguments="" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
-  <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="CoProcessing" />
-  <pqevent object="pqClientMainWindow/CoProcessing" command="activate" arguments="Export State" />
+  <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menu_Catalyst" />
+  <pqevent object="pqClientMainWindow/menubar/menu_Catalyst" command="activate" arguments="Export State" />
   <pqevent object="pqClientMainWindow/ExportStateWizard" command="key" arguments="16777216" />
   <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuSources" />
   <pqevent object="pqClientMainWindow/menubar/menuSources" command="activate" arguments="SphereSource" />

tests/xml/TestUI.xml

@@ -2,7 +2,6 @@
 <pqevents>
   <pqevent object="pqClientMainWindow/menubar" command="activate" arguments="menuTools" />
   <pqevent object="pqClientMainWindow/menubar/menuTools" command="activate" arguments="actionManage_Plugins" />
-  <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="CatalystScriptGeneratorPlugin" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="SurfaceLIC" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="ArrowGlyph" />
   <pqevent object="pqClientMainWindow/PluginManagerDialog/localGroup/localPlugins" command="setCurrent" arguments="AnalyzeNIfTIIO" />