Salome HOME
Draft of transparency
[modules/shaper.git] / src / XGUI / XGUI_ContextMenuMgr.cpp
index 8557a43f972489ffbb5c490282131b11e69f11b6..1a986b377ff86155065408fccb672b9f0b999a34 100644 (file)
@@ -1,4 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "XGUI_ContextMenuMgr.h"
 #include "XGUI_Workshop.h"
@@ -8,8 +26,14 @@
 #include "XGUI_ViewerProxy.h"
 #include "XGUI_Selection.h"
 #include "XGUI_SalomeConnector.h"
+#include "XGUI_DataModel.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_Tools.h"
+#include "XGUI_ActionsMgr.h"
 
+#ifndef HAVE_SALOME
 #include <AppElements_MainWindow.h>
+#endif
 
 //#include "PartSetPlugin_Part.h"
 
 #include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_ResultConstruction.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultField.h>
+
+#include <Config_DataModelReader.h>
 
 #include <ModuleBase_IModule.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_OperationAction.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <QAction>
+#include <QActionGroup>
 #include <QContextMenuEvent>
 #include <QMenu>
 #include <QMdiArea>
-
+#include <QMainWindow>
+#include <QModelIndex>
 
 XGUI_ContextMenuMgr::XGUI_ContextMenuMgr(XGUI_Workshop* theParent)
     : QObject(theParent),
@@ -44,47 +76,109 @@ XGUI_ContextMenuMgr::~XGUI_ContextMenuMgr()
 
 void XGUI_ContextMenuMgr::createActions()
 {
-  QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
+#ifdef HAVE_SALOME
+  QMainWindow* aDesktop = myWorkshop->salomeConnector()->desktop();
+#else
   QMainWindow* aDesktop = myWorkshop->mainWindow();
-  if (!aDesktop)
-    aDesktop = myWorkshop->salomeConnector()->desktop();
+#endif
+
+  QAction* aAction = ModuleBase_Tools::createAction(QIcon(":pictures/delete.png"), tr("Delete"),
+                                                    aDesktop);
   aDesktop->addAction(aAction);
 
   addAction("DELETE_CMD", aAction);
-  aAction->setShortcut(Qt::Key_Delete);
   aAction->setShortcutContext(Qt::ApplicationShortcut);
 
-  aAction = new QAction(QIcon(":pictures/rename_edit.png"), tr("Rename"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/rename_edit.png"), tr("Rename"),
+                                           aDesktop, this, SLOT(onRename()));
   addAction("RENAME_CMD", aAction);
-  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRename()));
 
-  aAction = new QAction(QIcon(":pictures/move.png"), tr("Move..."), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/move.png"),
+                                           XGUI_Workshop::MOVE_TO_END_COMMAND, this);
   addAction("MOVE_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/color.png"), tr("Color..."), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/clean_history.png"),
+                                           tr("Clean history"), aDesktop);
+  addAction("CLEAN_HISTORY_CMD", aAction);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/color.png"), tr("Color..."), aDesktop);
   addAction("COLOR_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(""), tr("Deflection..."), aDesktop);
+  addAction("DEFLECTION_CMD", aAction);
+
+#ifdef USE_TRANSPARENCY
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/transparency.png"),
+                                           tr("Transparency..."), aDesktop);
+  addAction("TRANSPARENCY_CMD", aAction);
+#endif
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show"), aDesktop);
   addAction("SHOW_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/eye_pencil.png"), tr("Show only"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil.png"), tr("Show only"),
+                                           aDesktop);
   addAction("SHOW_ONLY_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide"),
+                                           aDesktop);
   addAction("HIDE_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide all"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/eye_pencil_closed.png"), tr("Hide all"),
+                                           aDesktop);
   addAction("HIDEALL_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/shading.png"), tr("Shading"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/shading.png"), tr("Shading"), aDesktop);
   addAction("SHADING_CMD", aAction);
 
-  aAction = new QAction(QIcon(":pictures/wireframe.png"), tr("Wireframe"), this);
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/wireframe.png"), tr("Wireframe"),
+                                           aDesktop);
   addAction("WIREFRAME_CMD", aAction);
 
-  mySeparator = new QAction(this);
+  mySeparator = ModuleBase_Tools::createAction(QIcon(), "", aDesktop);
   mySeparator->setSeparator(true);
 
+  //mySelectActions = new QActionGroup(this);
+  //mySelectActions->setExclusive(true);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/vertex.png"), tr("Vertices"), aDesktop,
+                                           this, SLOT(onShapeSelection(bool)));
+  aAction->setCheckable(true);
+  addAction("SELECT_VERTEX_CMD", aAction);
+  //mySelectActions->addAction(aAction);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/edge.png"), tr("Edges"), aDesktop,
+                                           this, SLOT(onShapeSelection(bool)));
+  aAction->setCheckable(true);
+  addAction("SELECT_EDGE_CMD", aAction);
+  //mySelectActions->addAction(aAction);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/face.png"), tr("Faces"), aDesktop,
+                                           this, SLOT(onShapeSelection(bool)));
+  aAction->setCheckable(true);
+  addAction("SELECT_FACE_CMD", aAction);
+  //mySelectActions->addAction(aAction);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/result.png"), tr("Results"), aDesktop,
+                                           this, SLOT(onResultSelection(bool)));
+  aAction->setCheckable(true);
+  addAction("SELECT_RESULT_CMD", aAction);
+  //mySelectActions->addAction(aAction);
+
+  aAction->setChecked(true);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
+                                           tr("Select results"), aDesktop);
+  addAction("SHOW_RESULTS_CMD", aAction);
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":pictures/find_result.png"),
+                                           tr("Select parent feature"), aDesktop);
+  addAction("SHOW_FEATURE_CMD", aAction);
+
+#ifdef TINSPECTOR
+  aAction = ModuleBase_Tools::createAction(QIcon(), tr("TInspector"), aDesktop);
+  addAction("TINSPECTOR_VIEW", aAction);
+#endif
 
   buildObjBrowserMenu();
   buildViewerMenu();
@@ -153,7 +247,7 @@ void XGUI_ContextMenuMgr::onContextMenuRequest(QContextMenuEvent* theEvent)
   }
 }
 
-void XGUI_ContextMenuMgr::updateObjectBrowserMenu() 
+void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
 {
   foreach(QAction* aAction, myActions)
     aAction->setEnabled(false);
@@ -167,24 +261,38 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     bool hasResult = false;
     bool hasFeature = false;
     bool hasParameter = false;
-    bool hasSubFeature = false;
-    ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature);
-
+    bool hasCompositeOwner = false;
+    bool hasResultInHistory = false;
+    ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
+                                   hasCompositeOwner, hasResultInHistory);
     //Process Feature
     if (aSelected == 1) {
       ObjectPtr aObject = aObjects.first();
       if (aObject) {
+        if (hasResult && myWorkshop->canBeShaded(aObject)) {
+          XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject);
+          if (aMode != XGUI_Displayer::NoMode) {
+            action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading);
+            action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe);
+          } else {
+            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);
         }
@@ -194,11 +302,14 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
         if( aMgr->activeDocument() == aObject->document() )
         {
           action("RENAME_CMD")->setEnabled(true);
-          action("DELETE_CMD")->setEnabled(true);
+          action("DELETE_CMD")->setEnabled(!hasCompositeOwner);
+          action("CLEAN_HISTORY_CMD")->setEnabled(!hasCompositeOwner &&
+                                                  (hasFeature || hasParameter));
         }
       }
     } 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,18 +319,50 @@ void XGUI_ContextMenuMgr::updateObjectBrowserMenu()
     }
     bool allActive = true;
     foreach( ObjectPtr aObject, aObjects )
-      if( aMgr->activeDocument() != aObject->document() )
-      {
+      if( aMgr->activeDocument() != aObject->document() )  {
         allActive = false;
         break;
       }
-    if (!hasSubFeature && allActive ) {
+    if (!hasCompositeOwner && allActive ) {
       if (hasFeature || hasParameter)
         action("DELETE_CMD")->setEnabled(true);
     }
+    if (!hasCompositeOwner && allActive && (hasFeature|| hasParameter))
+      action("CLEAN_HISTORY_CMD")->setEnabled(true);
+
+    action("SHOW_RESULTS_CMD")->setEnabled(hasFeature);
+    action("SHOW_FEATURE_CMD")->setEnabled(hasResult && hasResultInHistory);
   }
-  if (myWorkshop->canChangeColor())
-    action("COLOR_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);
+  }
+
+  action("COLOR_CMD")->setEnabled(myWorkshop->canChangeProperty("COLOR_CMD"));
+  action("DEFLECTION_CMD")->setEnabled(myWorkshop->canChangeProperty("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  action("TRANSPARENCY_CMD")->setEnabled(myWorkshop->canChangeProperty("TRANSPARENCY_CMD"));
+#endif
+  #ifdef _DEBUG
+    #ifdef TINSPECTOR
+      action("TINSPECTOR_VIEW")->setEnabled(true);
+    #endif
+  #endif
+
 
   ModuleBase_IModule* aModule = myWorkshop->module();
   if (aModule)
@@ -232,42 +375,97 @@ void XGUI_ContextMenuMgr::updateViewerMenu()
     aAction->setEnabled(false);
 
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  QList<ModuleBase_ViewerPrs> aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
+  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+  QList<ModuleBase_ViewerPrsPtr> aPrsList =
+    aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
   if (aPrsList.size() > 0) {
     bool isVisible = false;
     bool isShading = false;
     bool canBeShaded = false;
     ObjectPtr aObject;
-    foreach(ModuleBase_ViewerPrs aPrs, aPrsList) {
-      aObject = aPrs.object();
+    foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) {
+      aObject = aPrs->object();
       ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
       if (aRes && aRes->isDisplayed()) {
         isVisible = true;
         canBeShaded = myWorkshop->displayer()->canBeShaded(aObject);
-        isShading = (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);      
+        isShading =
+          (myWorkshop->displayer()->displayMode(aObject) == XGUI_Displayer::Shading);
         break;
       }
     }
     if (isVisible) {
       if (canBeShaded) {
-        action("WIREFRAME_CMD")->setEnabled(true);
-        action("SHADING_CMD")->setEnabled(true);
+        XGUI_Displayer::DisplayMode aMode = aDisplayer->displayMode(aObject);
+        if (aMode != XGUI_Displayer::NoMode) {
+          action("WIREFRAME_CMD")->setEnabled(aMode == XGUI_Displayer::Shading);
+          action("SHADING_CMD")->setEnabled(aMode == XGUI_Displayer::Wireframe);
+        } else {
+          action("WIREFRAME_CMD")->setEnabled(true);
+          action("SHADING_CMD")->setEnabled(true);
+        }
       }
       action("SHOW_ONLY_CMD")->setEnabled(true);
       action("HIDE_CMD")->setEnabled(true);
     } else
       action("SHOW_CMD")->setEnabled(true);
   }
+  //issue #2159 Hide all incomplete behavior
+#ifdef HAVE_SALOME
+    action("HIDEALL_CMD")->setEnabled(true);
+#else
   if (myWorkshop->displayer()->objectsCount() > 0)
     action("HIDEALL_CMD")->setEnabled(true);
-  if (myWorkshop->canChangeColor())
-    action("COLOR_CMD")->setEnabled(true);
-
-  action("DELETE_CMD")->setEnabled(true);
+#endif
+
+  // Update selection menu
+  QIntList aModes = aDisplayer->activeSelectionModes();
+  action("SELECT_VERTEX_CMD")->setEnabled(true);
+  action("SELECT_EDGE_CMD")->setEnabled(true);
+  action("SELECT_FACE_CMD")->setEnabled(true);
+  action("SELECT_RESULT_CMD")->setEnabled(true);
+
+  action("SELECT_RESULT_CMD")->setChecked(false);
+  action("SELECT_VERTEX_CMD")->setChecked(false);
+  action("SELECT_EDGE_CMD")->setChecked(false);
+  action("SELECT_FACE_CMD")->setChecked(false);
+  action("SELECT_RESULT_CMD")->setChecked(false);
+  if (aModes.count() == 0) {
+    action("SELECT_RESULT_CMD")->setChecked(true);
+  } else {
+    foreach(int aMode, aModes) {
+      switch (aMode) {
+      case TopAbs_VERTEX:
+        action("SELECT_VERTEX_CMD")->setChecked(true);
+        break;
+      case TopAbs_EDGE:
+        action("SELECT_EDGE_CMD")->setChecked(true);
+        break;
+      case TopAbs_FACE:
+        action("SELECT_FACE_CMD")->setChecked(true);
+        break;
+      default:
+        action("SELECT_RESULT_CMD")->setChecked(true);
+      }
+    }
+  }
 
   ModuleBase_IModule* aModule = myWorkshop->module();
   if (aModule)
     aModule->updateViewerMenu(myActions);
+
+  if (myWorkshop->canChangeProperty("COLOR_CMD"))
+    action("COLOR_CMD")->setEnabled(true);
+
+  if (myWorkshop->canChangeProperty("DEFLECTION_CMD"))
+    action("DEFLECTION_CMD")->setEnabled(true);
+
+#ifdef USE_TRANSPARENCY
+  if (myWorkshop->canChangeProperty("TRANSPARENCY_CMD"))
+    action("TRANSPARENCY_CMD")->setEnabled(true);
+#endif
+
+  action("DELETE_CMD")->setEnabled(true);
 }
 
 void XGUI_ContextMenuMgr::connectObjectBrowser()
@@ -285,49 +483,65 @@ void XGUI_ContextMenuMgr::connectViewer()
 
 void XGUI_ContextMenuMgr::buildObjBrowserMenu()
 {
-  QAction* aSeparator = new QAction(this);
+  QAction* aSeparator = ModuleBase_Tools::createAction(QIcon(), "", myWorkshop->desktop());
   aSeparator->setSeparator(true);
 
   QActionsList aList;
-  
+
   // Result construction menu
   aList.append(action("SHOW_CMD"));
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
-  aList.append(action("COLOR_CMD"));
   aList.append(mySeparator);
   aList.append(action("RENAME_CMD"));
+  aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  aList.append(action("TRANSPARENCY_CMD"));
+#endif
+  aList.append(action("SHOW_FEATURE_CMD"));
   myObjBrowserMenus[ModelAPI_ResultConstruction::group()] = aList;
+
   //-------------------------------------
   // Result body menu
   aList.clear();
   aList.append(action("WIREFRAME_CMD"));
   aList.append(action("SHADING_CMD"));
-  aList.append(action("COLOR_CMD"));
-  aList.append(mySeparator);
+  aList.append(mySeparator); // this separator is not shown as this action is added after show only
+  // qt list container contains only one instance of the same action
   aList.append(action("SHOW_CMD"));
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
   aList.append(mySeparator);
   aList.append(action("RENAME_CMD"));
+  aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  aList.append(action("TRANSPARENCY_CMD"));
+#endif
+  aList.append(action("SHOW_FEATURE_CMD"));
   myObjBrowserMenus[ModelAPI_ResultBody::group()] = aList;
   // Group menu
   myObjBrowserMenus[ModelAPI_ResultGroup::group()] = aList;
+  myObjBrowserMenus[ModelAPI_ResultField::group()] = aList;
   // Result part menu
   myObjBrowserMenus[ModelAPI_ResultPart::group()] = aList;
   //-------------------------------------
   // Feature menu
   aList.clear();
-  aList.append(action("DELETE_CMD"));
+  aList.append(action("RENAME_CMD"));
+  aList.append(action("SHOW_RESULTS_CMD"));
   aList.append(action("MOVE_CMD"));
   aList.append(mySeparator);
-  aList.append(action("RENAME_CMD"));
+  aList.append(action("CLEAN_HISTORY_CMD"));
+  aList.append(action("DELETE_CMD"));
   myObjBrowserMenus[ModelAPI_Feature::group()] = aList;
 
   aList.clear();
-  aList.append(action("DELETE_CMD"));
-  aList.append(mySeparator);
   aList.append(action("RENAME_CMD"));
+  aList.append(mySeparator);
+  aList.append(action("CLEAN_HISTORY_CMD"));
+  aList.append(action("DELETE_CMD"));
   myObjBrowserMenus[ModelAPI_ResultParameter::group()] = aList;
   //-------------------------------------
 }
@@ -338,8 +552,12 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   // Result construction menu
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
-  aList.append(action("HIDEALL_CMD"));
+  aList.append(mySeparator);
   aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  aList.append(action("TRANSPARENCY_CMD"));
+#endif
   myViewerMenu[ModelAPI_ResultConstruction::group()] = aList;
   // Result part menu
   myViewerMenu[ModelAPI_ResultPart::group()] = aList;
@@ -348,21 +566,31 @@ void XGUI_ContextMenuMgr::buildViewerMenu()
   aList.clear();
   aList.append(action("WIREFRAME_CMD"));
   aList.append(action("SHADING_CMD"));
-  aList.append(action("COLOR_CMD"));
   aList.append(mySeparator);
   aList.append(action("HIDE_CMD"));
   aList.append(action("SHOW_ONLY_CMD"));
-  aList.append(action("HIDEALL_CMD"));
+  aList.append(mySeparator);
+  aList.append(action("COLOR_CMD"));
+  aList.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  aList.append(action("TRANSPARENCY_CMD"));
+#endif
   myViewerMenu[ModelAPI_ResultBody::group()] = aList;
   // Group menu
   myViewerMenu[ModelAPI_ResultGroup::group()] = aList;
+  myViewerMenu[ModelAPI_ResultField::group()] = aList;
   //-------------------------------------
-
 }
 
 
 void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const
 {
+  ModuleBase_IModule* aModule = myWorkshop->module();
+  if (aModule) {
+    theMenu->addSeparator();
+    aModule->addObjectBrowserMenu(theMenu);
+  }
+
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
   QObjectPtrList aObjects = aSelMgr->selection()->selectedObjects();
   int aSelected = aObjects.size();
@@ -373,56 +601,107 @@ void XGUI_ContextMenuMgr::addObjBrowserMenu(QMenu* theMenu) const
     if (myObjBrowserMenus.contains(aName))
       aActions = myObjBrowserMenus[aName];
   } else if (aSelected > 1) {
-      aActions.append(action("SHADING_CMD"));
       aActions.append(action("WIREFRAME_CMD"));
+      aActions.append(action("SHADING_CMD"));
       aActions.append(mySeparator);
       aActions.append(action("SHOW_CMD"));
       aActions.append(action("HIDE_CMD"));
       aActions.append(action("SHOW_ONLY_CMD"));
       aActions.append(mySeparator);
-      aActions.append(action("DELETE_CMD"));
       //aActions.append(action("MOVE_CMD"));
+      aActions.append(action("COLOR_CMD"));
+      aActions.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+      aActions.append(action("TRANSPARENCY_CMD"));
+#endif
+      aActions.append(action("CLEAN_HISTORY_CMD"));
+      aActions.append(action("DELETE_CMD"));
+  }
+#ifdef _DEBUG
+  if (aSelected == 0) {
+    #ifdef TINSPECTOR
+    aActions.append(action("TINSPECTOR_VIEW"));
+    #endif
   }
+#endif
   theMenu->addActions(aActions);
+  addFeatures(theMenu);
 
-  ModuleBase_IModule* aModule = myWorkshop->module();
-  if (aModule) {
-    theMenu->addSeparator();
-    aModule->addObjectBrowserMenu(theMenu);
-  }
-  theMenu->addSeparator();
-  theMenu->addActions(myWorkshop->objectBrowser()->actions());
+  // It is commented out because Object Browser does not have actions
+  //theMenu->addSeparator();
+  //theMenu->addActions(myWorkshop->objectBrowser()->actions());
 }
 
 void XGUI_ContextMenuMgr::addViewerMenu(QMenu* theMenu) const
 {
-  ModuleBase_IModule* aModule = myWorkshop->module();
-  if (aModule) {
-    if (aModule->addViewerMenu(theMenu, myActions))
-      theMenu->addSeparator();
-  }
   XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
-  QList<ModuleBase_ViewerPrs> aPrsList = aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
+  QList<ModuleBase_ViewerPrsPtr> aPrsList =
+    aSelMgr->selection()->getSelected(ModuleBase_ISelection::Viewer);
   int aSelected = aPrsList.size();
   QActionsList aActions;
+
+  // Create selection menu
+  XGUI_OperationMgr* aOpMgr = myWorkshop->operationMgr();
+  QIntList aModes;
+  myWorkshop->module()->activeSelectionModes(aModes);
+  if ((!aOpMgr->hasOperation()) && aModes.isEmpty()) {
+    QMenu* aSelMenu = new QMenu(tr("Selection mode"), theMenu);
+    aSelMenu->addAction(action("SELECT_VERTEX_CMD"));
+    aSelMenu->addAction(action("SELECT_EDGE_CMD"));
+    aSelMenu->addAction(action("SELECT_FACE_CMD"));
+    //IMP: an attempt to use result selection with other selection modes
+    //aSelMenu->addSeparator();
+    aSelMenu->addAction(action("SELECT_RESULT_CMD"));
+    theMenu->addMenu(aSelMenu);
+    theMenu->addSeparator();
+  }
   if (aSelected == 1) {
-    ObjectPtr aObject = aPrsList.first().object();
-    std::string aName = aObject->groupName();
-    if (myViewerMenu.contains(aName))
-      aActions = myViewerMenu[aName];
+    ObjectPtr aObject = aPrsList.first()->object();
+    if (aObject.get() != NULL) {
+      std::string aName = aObject->groupName();
+      if (myViewerMenu.contains(aName))
+        aActions = myViewerMenu[aName];
+    }
   } else if (aSelected > 1) {
     aActions.append(action("HIDE_CMD"));
   }
+  // hide all is shown always even if selection in the viewer is empty
+  aActions.append(action("HIDEALL_CMD"));
+  aActions.append(action("COLOR_CMD"));
+  aActions.append(action("DEFLECTION_CMD"));
+#ifdef USE_TRANSPARENCY
+  aActions.append(action("TRANSPARENCY_CMD"));
+#endif
   theMenu->addActions(aActions);
 
-  if (!myWorkshop->isSalomeMode()) {
-    theMenu->addSeparator();
-    QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea();
-    if (aMDI->actions().size() > 0) {
-      QMenu* aSubMenu = theMenu->addMenu(tr("Windows"));
-      aSubMenu->addActions(aMDI->actions());
-    }
+  QMap<int, QAction*> aMenuActions;
+  ModuleBase_IModule* aModule = myWorkshop->module();
+  if (aModule) {
+    if (aModule->addViewerMenu(myActions, theMenu, aMenuActions))
+      theMenu->addSeparator();
+  }
+
+  // insert the module menu items on specific positions in the popup menu: some actions should be
+  // in the begin of the list, Delete action should be the last by #1343 issue
+  QList<QAction*> anActions = theMenu->actions();
+  int anActionsSize = anActions.size();
+  QAction* aFirstAction = anActions[0];
+  QMap<int, QAction*>::const_iterator anIt = aMenuActions.begin(), aLast = aMenuActions.end();
+  for (; anIt != aLast; anIt++) {
+    if (anIt.key() > anActionsSize)
+      theMenu->addAction(anIt.value());
+    else
+      theMenu->insertAction(aFirstAction, *anIt);
+  }
+
+#ifndef HAVE_SALOME
+  theMenu->addSeparator();
+  QMdiArea* aMDI = myWorkshop->mainWindow()->mdiArea();
+  if (aMDI->actions().size() > 0) {
+    QMenu* aSubMenu = theMenu->addMenu(tr("Windows"));
+    aSubMenu->addActions(aMDI->actions());
   }
+#endif
 }
 
 QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName)
@@ -448,5 +727,75 @@ QStringList XGUI_ContextMenuMgr::actionObjectGroups(const QString& theName)
 
 void XGUI_ContextMenuMgr::onRename()
 {
+  QObjectPtrList anObjects = myWorkshop->selector()->selection()->selectedObjects();
+  if (!myWorkshop->abortAllOperations())
+    return;
+  // restore selection in case if dialog box was shown
+  myWorkshop->objectBrowser()->setObjectsSelected(anObjects);
   myWorkshop->objectBrowser()->onEditItem();
 }
+
+void XGUI_ContextMenuMgr::addFeatures(QMenu* theMenu) const
+{
+  SessionPtr aMgr = ModelAPI_Session::get();
+  DocumentPtr aActiveDoc = aMgr->activeDocument();
+
+  XGUI_SelectionMgr* aSelMgr = myWorkshop->selector();
+  XGUI_ActionsMgr* aActionMgr = myWorkshop->actionsMgr();
+  const Config_DataModelReader* aDataModelXML = myWorkshop->dataModelXMLReader();
+  QModelIndexList aSelectedIndexes = aSelMgr->selection()->selectedIndexes();
+
+  QString aName;
+  int aLen = 0;
+  bool aIsRoot = false;
+  foreach(QModelIndex aIdx, aSelectedIndexes) {
+    // Process only first column
+    if (aIdx.column() == 1) {
+      aIsRoot = !aIdx.parent().isValid();
+      // Exit if the selected index belongs to non active document
+      if (aIsRoot && (aActiveDoc != aMgr->moduleDocument()))
+        return;
+      if ((!aIsRoot) && (aIdx.internalPointer() != aActiveDoc.get()))
+        return;
+
+      // Get name of the selected index
+      aName = aIdx.data().toString();
+      aLen = aName.indexOf('(');
+      if (aLen != -1) {
+        aName = aName.left(--aLen);
+      }
+      std::string aFeaturesStr = aIsRoot?
+        aDataModelXML->rootFolderFeatures(aName.toStdString()) :
+        aDataModelXML->subFolderFeatures(aName.toStdString());
+        if (aFeaturesStr.length() > 0) {
+          QStringList aFeturesList =
+            QString(aFeaturesStr.c_str()).split(",", QString::SkipEmptyParts);
+          foreach(QString aFea, aFeturesList) {
+            QAction* aAction = aActionMgr->action(aFea);
+            if (aAction)
+              theMenu->addAction(aAction);
+          }
+        }
+    }
+  }
+}
+
+#define UNCHECK_ACTION(NAME) \
+{ QAction* aAction = action(NAME); \
+bool isBlock = aAction->signalsBlocked(); \
+aAction->blockSignals(true); \
+aAction->setChecked(false); \
+  aAction->blockSignals(isBlock); }
+
+
+void XGUI_ContextMenuMgr::onResultSelection(bool theChecked)
+{
+  UNCHECK_ACTION("SELECT_VERTEX_CMD");
+  UNCHECK_ACTION("SELECT_EDGE_CMD");
+  UNCHECK_ACTION("SELECT_FACE_CMD");
+}
+
+void XGUI_ContextMenuMgr::onShapeSelection(bool theChecked)
+{
+  UNCHECK_ACTION("SHOW_RESULTS_CMD");
+}