Add 'Catalyst' menu into ParaVis module.

diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx
index 60a1635c08f9814d8415e67f94701072801d94bd..8b99bb82c38d75e38aa0f1f81df5b738f5e9c144 100644 (file)
--- a/src/PVGUI/PVGUI_Module.cxx
+++ b/src/PVGUI/PVGUI_Module.cxx
@@ -168,6 +168,7 @@ PVGUI_Module::PVGUI_Module()
     myFiltersMenuId( -1 ),
     myMacrosMenuId(-1),
     myRecentMenuId(-1),
+    myCatalystMenuId(-1),
     myOldMsgHandler(0),
     myTraceWindow(0),
     myInitTimer(0),
@@ -582,6 +583,7 @@ bool PVGUI_Module::activateModule( SUIT_Study* study )
   if ( mySourcesMenuId != -1 ) menuMgr()->show(mySourcesMenuId);
   if ( myFiltersMenuId != -1 ) menuMgr()->show(myFiltersMenuId);
   if ( myMacrosMenuId != -1 ) menuMgr()->show(myMacrosMenuId);
+  if ( myCatalystMenuId != -1 ) menuMgr()->show(myCatalystMenuId);
 
   // Update the various menus with the content pre-loaded in myGuiElements
 //  QMenu* srcMenu = menuMgr()->findMenu( mySourcesMenuId );
@@ -660,6 +662,7 @@ bool PVGUI_Module::deactivateModule( SUIT_Study* study )
   menuMgr()->hide(mySourcesMenuId);
   menuMgr()->hide(myFiltersMenuId);
   menuMgr()->hide(myMacrosMenuId);
+  menuMgr()->hide(myCatalystMenuId);
   setMenuShown( false );
   setToolShown( false );
 

diff --git a/src/PVGUI/PVGUI_Module.h b/src/PVGUI/PVGUI_Module.h
index bbeed82bdc63333b3f7fee268c1a9664b53d2809..f7646aad831eb251bbfad2f8f92dddf9ca9a37a2 100644 (file)
--- a/src/PVGUI/PVGUI_Module.h
+++ b/src/PVGUI/PVGUI_Module.h
@@ -208,6 +208,7 @@ private:
   int                    myFiltersMenuId;
   int                    myMacrosMenuId;
   int                    myRecentMenuId;
+  int                    myCatalystMenuId;
   
   typedef QMap<QWidget*, bool> WgMap;
   WgMap                  myDockWidgets;

diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx
index cc927f2541057a9b82164f10a2f30456def10451..463ce6cf01bf73949c7b26ab68321b025dbf96d5 100644 (file)
--- a/src/PVGUI/PVGUI_Module_actions.cxx
+++ b/src/PVGUI/PVGUI_Module_actions.cxx
@@ -505,6 +505,10 @@ void PVGUI_Module::pvCreateMenus()
   createMenu( ShowTraceId, aToolsMnu );
   createMenu( RestartTraceId, aToolsMnu );
 
+  // --- Menu "Catalyst"
+  aRes = guiElements->getCatalystMenu();
+  myCatalystMenuId = createMenu( tr( "MEN_DESK_CATALYST" ), -1, -1, 100, -1, aRes);
+
   // --- Menu "Help"
 
   int aHelpMnu = createMenu( tr( "MEN_DESK_HELP" ), -1, -1 );

diff --git a/src/PVGUI/resources/PARAVIS_msg_en.ts b/src/PVGUI/resources/PARAVIS_msg_en.ts
index fc5cc66f9678aca67976c54c7ab95cce7647d076..2a71722c99d167b76a9c017824a93d4e016decd8 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_en.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_en.ts
@@ -1257,5 +1257,9 @@
         <source>ERR_STATE_CANNOT_BE_RESTORED</source>
         <translation>The state can&apos;t be restored.</translation>
     </message>
+    <message>
+        <source>MEN_DESK_CATALYST</source>
+        <translation>Catalyst</translation>
+    </message>
 </context>
 </TS>

diff --git a/src/PVGUI/resources/PARAVIS_msg_fr.ts b/src/PVGUI/resources/PARAVIS_msg_fr.ts
index 3574e2ae4cd736af041ebd21ead70d04e3935655..61837797bdfae4a05b0e8b9320502559be9cf557 100644 (file)
--- a/src/PVGUI/resources/PARAVIS_msg_fr.ts
+++ b/src/PVGUI/resources/PARAVIS_msg_fr.ts
@@ -1257,5 +1257,9 @@
         <source>ERR_STATE_CANNOT_BE_RESTORED</source>
         <translation>Impossible de restaurer l&apos;état.</translation>
     </message>
+    <message>
+        <source>MEN_DESK_CATALYST</source>
+        <translation>Catalyst</translation>
+    </message>
 </context>
 </TS>