PR: synchro V6_main tag mergeto_V7_main_11Feb13

[modules/geom.git] / src / GEOMToolsGUI / GEOMToolsGUI.cxx

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index 01f2c182f63289704f0f28c68f863313d689af99..95b4507e85f386c97388fd38b1058d62c2db2591 100644 (file)
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -325,7 +325,7 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   case GEOMOp::OpColor:          // POPUP - COLOR
     OnColor();
     break;
-  case GEOMOp::OpSetTexture:        // POPUP - TEXTURE
+  case GEOMOp::OpSetTexture:     // POPUP - TEXTURE
     OnTexture();
     break;
   case GEOMOp::OpTransparency:   // POPUP - TRANSPARENCY
@@ -349,6 +349,12 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   case GEOMOp::OpMaterialProperties: // POPUP - MATERIAL PROPERTIES
     OnMaterialProperties();
     break;
+  case GEOMOp::OpPredefMaterCustom:  // POPUP  - MATERIAL PROPERTIES - CUSTOM...
+    OnMaterialProperties();
+    break;
+  case GEOMOp::OpMaterialsLibrary:    // POPUP MENU - MATERIAL PROPERTIES
+    OnMaterialsLibrary();
+    break;
   case GEOMOp::OpAutoColor:      // POPUP - AUTO COLOR
     OnAutoColor();
     break;
@@ -387,6 +393,25 @@ bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   return true;
 }
 
+//=======================================================================
+// function : OnGUIEvent()
+// purpose  :
+//=======================================================================
+bool GEOMToolsGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent, const QVariant& theParam )
+{
+  getGeometryGUI()->EmitSignalDeactivateDialog();
+
+  switch ( theCommandID ) {
+  case GEOMOp::OpPredefMaterial:         // POPUP MENU - MATERIAL PROPERTIES - <SOME MATERIAL>
+    OnSetMaterial( theParam );
+    break;
+  default:
+    SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID));
+    break;
+  }
+  return true;
+}
+
 //===============================================================================
 // function : OnEditDelete()
 // purpose  :