From c38fb4629600c6049970ab68e8fab382c7094043 Mon Sep 17 00:00:00 2001 From: rnv Date: Fri, 4 Aug 2017 16:27:18 +0300 Subject: [PATCH] Add 'Catalyst' menu into ParaVis module. --- src/PVGUI/PVGUI_Module.cxx | 3 +++ src/PVGUI/PVGUI_Module.h | 1 + src/PVGUI/PVGUI_Module_actions.cxx | 4 ++++ src/PVGUI/resources/PARAVIS_msg_en.ts | 4 ++++ src/PVGUI/resources/PARAVIS_msg_fr.ts | 4 ++++ 5 files changed, 16 insertions(+) diff --git a/src/PVGUI/PVGUI_Module.cxx b/src/PVGUI/PVGUI_Module.cxx index 60a1635c..8b99bb82 100644 --- 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 bbeed82b..f7646aad 100644 --- 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 WgMap; WgMap myDockWidgets; diff --git a/src/PVGUI/PVGUI_Module_actions.cxx b/src/PVGUI/PVGUI_Module_actions.cxx index cc927f25..463ce6cf 100644 --- 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 fc5cc66f..2a71722c 100644 --- a/src/PVGUI/resources/PARAVIS_msg_en.ts +++ b/src/PVGUI/resources/PARAVIS_msg_en.ts @@ -1257,5 +1257,9 @@ ERR_STATE_CANNOT_BE_RESTORED The state can't be restored. + + MEN_DESK_CATALYST + Catalyst + diff --git a/src/PVGUI/resources/PARAVIS_msg_fr.ts b/src/PVGUI/resources/PARAVIS_msg_fr.ts index 3574e2ae..61837797 100644 --- a/src/PVGUI/resources/PARAVIS_msg_fr.ts +++ b/src/PVGUI/resources/PARAVIS_msg_fr.ts @@ -1257,5 +1257,9 @@ ERR_STATE_CANNOT_BE_RESTORED Impossible de restaurer l'état. + + MEN_DESK_CATALYST + Catalyst + -- 2.39.2