X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ContextMenuMgr.cpp;h=ad3ce3ea8e4b537be2190ecc55ed9e7c06654b3b;hb=3975324fb3e40fc0c18eac0de7f50251d2eac9f8;hp=8557a43f972489ffbb5c490282131b11e69f11b6;hpb=2005e7ee527c15e0aaa70d5f0c76a0cf8b89fccf;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_ContextMenuMgr.cpp b/src/XGUI/XGUI_ContextMenuMgr.cpp
index 8557a43f9..ad3ce3ea8 100644
--- a/src/XGUI/XGUI_ContextMenuMgr.cpp
+++ b/src/XGUI/XGUI_ContextMenuMgr.cpp
@@ -8,6 +8,7 @@
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Selection.h"
 #include "XGUI_SalomeConnector.h"
+#include "XGUI_DataModel.h"
 
 #include <AppElements_MainWindow.h>
 
@@ -21,6 +22,7 @@
 #include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_Tools.h>
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_Tools.h>
@@ -58,7 +60,7 @@ void XGUI_ContextMenuMgr::createActions()
   addAction("RENAME_CMD", aAction);
   connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRename()));
 
-  aAction = new QAction(QIcon(":pictures/move.png"), tr("Move..."), this);
+  aAction = new QAction(QIcon(":pictures/move.png"), tr("Move to the end"), this);
   addAction("MOVE_CMD", aAction);
 
   aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this);
@@ -174,17 +176,24 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     if (aSelected == 1) {
       ObjectPtr aObject = aObjects.first();
       if (aObject) {
+        if (hasResult && myWorkshop->canBeShaded(aObject)) {
+          action("WIREFRAME_CMD")->setEnabled(true);
+          action("SHADING_CMD")->setEnabled(true);
+        }
         if (!hasFeature) {
-          if (aObject->isDisplayed()) {
-            if (aDisplayer->canBeShaded(aObject)) {
-              action("WIREFRAME_CMD")->setEnabled(true);
-              action("SHADING_CMD")->setEnabled(true);
-            }
+          bool aHasSubResults = ModelAPI_Tools::hasSubResults(
+                                            std::dynamic_pointer_cast<ModelAPI_Result>(aObject));
+          if (aHasSubResults) {
             action("HIDE_CMD")->setEnabled(true);
-          } else if (hasResult && (!hasParameter)) {
             action("SHOW_CMD")->setEnabled(true);
           }
-
+          else {
+            if (aObject->isDisplayed()) {
+              action("HIDE_CMD")->setEnabled(true);
+            } else if (hasResult && (!hasParameter)) {
+              action("SHOW_CMD")->setEnabled(true);
+            }
+          }
           if (!(hasParameter || hasFeature))
             action("SHOW_ONLY_CMD")->setEnabled(true);
         }
@@ -198,7 +207,8 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
         }
       }
     } else {
-      if (hasResult && (!hasParameter)) {
+      // parameter is commented because the actions are not in the list of result parameter actions
+      if (hasResult /*&& (!hasParameter)*/) {
         action("SHOW_CMD")->setEnabled(true);
         action("HIDE_CMD")->setEnabled(true);
         action("SHOW_ONLY_CMD")->setEnabled(true);
@@ -208,8 +218,7 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     }
     bool allActive = true;
     foreach( ObjectPtr aObject, aObjects )
-      if( aMgr->activeDocument() != aObject->document() )
-      {
+      if( aMgr->activeDocument() != aObject->document() )  {
         allActive = false;
         break;
       }
@@ -218,6 +227,25 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
         action("DELETE_CMD")->setEnabled(true);
     }
   }
+
+  // Show/Hide command has to be disabled for objects from non active document
+  bool aDeactivate = false;
+  foreach (ObjectPtr aObj, aObjects) {
+    if (!aObj->document()->isActive()) {
+      if ((aObj->document() != ModelAPI_Session::get()->moduleDocument()) ||
+           aObj->groupName() == ModelAPI_ResultPart::group()) {
+        aDeactivate = true;
+        break;
+      }
+    }
+  }
+  if (aDeactivate) {
+    // If at leas a one objec can not be edited then Show/Hide has to be disabled
+    action("SHOW_CMD")->setEnabled(false);
+    action("HIDE_CMD")->setEnabled(false);
+    action("SHOW_ONLY_CMD")->setEnabled(false);
+  }
+
   if (myWorkshop->canChangeColor())
     action("COLOR_CMD")->setEnabled(true);