From: rnv <rnv@opencascade.com>
Date: Tue, 29 May 2018 13:47:07 +0000 (+0300)
Subject: Fix for '23552: Unable to use the contextual menu of Object Browser window' issue... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Frnv%2F23552;p=modules%2Fgeom.git

Fix for '23552: Unable to use the contextual menu of Object Browser window' issue: do not show 'Materials' submenu forcibly
---

diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 27284a215..7dd7a7eb3 100755
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -2266,7 +2266,11 @@ void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString&
   getApp()->selectionMgr()->selectedObjects( lst );
 
   //Add submenu for predefined materials
-  bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" );
+  // RNV: '#23552: Unable to use the contextual menu of Object Browser window' issue: 
+  //      Temporary solution: do not show 'Materials' submenu forcibly
+  //bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" );
+  bool isPredefMat = false;
+  
   if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() > 0 ) {
     QtxPopupMgr* mgr = popupMgr();
     //get parrent for submenu
@@ -2386,7 +2390,7 @@ void GeometryGUI::createPreferences()
   int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup,
                             LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" );
 
-  // Temporary hide this preference, because of the '#23552: Unable to use the contextual menu of Object Browser window' issue
+  // RNV: Temporary hide this preference, because of the '#23552: Unable to use the contextual menu of Object Browser window' issue
   //addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
   //               LightApp_Preferences::Bool, "Geometry", "predef_materials" );