From: vsv <vitaly.smetannikov@opencascade.com>
Date: Tue, 30 Jun 2015 14:15:15 +0000 (+0300)
Subject: Restore Delete menu
X-Git-Tag: V_1.3.0~146
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9ce7c711842c30d7c95d3a43e4190c7d98fb9952;p=modules%2Fshaper.git

Restore Delete menu
---

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index e3cae01c2..a91cf9def 100644
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -207,11 +207,6 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
   foreach(QAction* aAction, myActions)
     aAction->setEnabled(false);
 
-  //bool aIsDone = false;
-  //ModuleBase_IModule* aModule = myWorkshop->module();
-  //if (aModule) 
-  //  aIsDone = aModule->addViewerMenu(theMenu, myActions);
-
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
   QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
   if (aObjects.size() > 0) {
@@ -332,8 +327,9 @@ QMenu* XGUI_ContextMenuMgr::objBrowserMenu() const
   QActionsList aActions;
   if (aSelected == 1) {
     ObjectPtr aObject = aObjects.first();
-    if (myViewerMenu.contains(aObject->groupName()))
-      aActions = myObjBrowserMenus[aObject->groupName()];
+    std::string aName = aObject->groupName();
+    if (myObjBrowserMenus.contains(aName))
+      aActions = myObjBrowserMenus[aName];
   } else if (aSelected > 1) {
       aActions.append(action("HIDE_CMD"));
       aActions.append(action("SHOW_ONLY_CMD"));
@@ -345,9 +341,10 @@ QMenu* XGUI_ContextMenuMgr::objBrowserMenu() const
 
   ModuleBase_IModule* aModule = myWorkshop->module();
   if (aModule) {
-    aModule->addObjectBrowserMenu(aMenu);
     aMenu->addSeparator();
+    aModule->addObjectBrowserMenu(aMenu);
   }
+  aMenu->addSeparator();
   aMenu->addActions(myWorkshop->objectBrowser()->actions());
 
   return aMenu;
@@ -366,8 +363,9 @@ QMenu* XGUI_ContextMenuMgr::viewerMenu() const
   QActionsList aActions;
   if (aSelected == 1) {
     ObjectPtr aObject = aObjects.first();
-    if (myViewerMenu.contains(aObject->groupName()))
-      aActions = myViewerMenu[aObject->groupName()];
+    std::string aName = aObject->groupName();
+    if (myViewerMenu.contains(aName))
+      aActions = myViewerMenu[aName];
   } else if (aSelected > 1) {
     aActions.append(action("HIDE_CMD"));
   }