From: rnv <rnv@opencascade.com>
Date: Tue, 29 May 2018 13:00:15 +0000 (+0300)
Subject: Temporary fix for '23552: Unable to use the contextual menu of Object Browser window... 
X-Git-Tag: V8_5_0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=60aded5b03a173f55cdcddec3dab7afc4ea4801d;p=modules%2Fgeom.git

Temporary fix for '23552: Unable to use the contextual menu of Object Browser window' issue.
---

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 1c6c9f377..94972c6d5 100755
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -69,7 +69,7 @@
     <parameter name="geom_preview"        value="true"  />
     <parameter name="hide_input_object"   value="true"  />
     <parameter name="material"            value="[ Default ]" />
-    <parameter name="predef_materials"    value="true" />
+    <parameter name="predef_materials"    value="false" />
     <parameter name="edge_width"          value="1" />
     <parameter name="isolines_width"      value="1" />
     <parameter name="preview_edge_width"  value="1" />
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 4a21919d8..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,8 +2390,9 @@ void GeometryGUI::createPreferences()
   int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup,
                             LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" );
 
-  addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
-                 LightApp_Preferences::Bool, "Geometry", "predef_materials" );
+  // 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" );
 
   int material = addPreference( tr( "PREF_MATERIAL" ), genGroup,
                                 LightApp_Preferences::Selector,