From: kga <kga@opencascade.com>
Date: Wed, 4 Dec 2013 05:42:05 +0000 (+0000)
Subject: IPAL0052199: TC7.3.0: "Display mode" menu is not identical in two cases
X-Git-Tag: V7_3_0b1~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ea7637619b3c7dfcd30c2e7d2d41d5bff02bad50;p=modules%2Fgeom.git

IPAL0052199: TC7.3.0: "Display mode" menu is not identical in two cases
---

diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx
index c4432718c..230c751a3 100644
--- a/src/DisplayGUI/DisplayGUI.cxx
+++ b/src/DisplayGUI/DisplayGUI.cxx
@@ -105,6 +105,9 @@ bool DisplayGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent)
   case GEOMOp::OpDMShadingWithEdges:  // MENU VIEW - DISPLAY MODE - SHADING WITH EDGES
     SetDisplayMode( 2 );
     break;
+  case GEOMOp::OpDMTexture:           // MENU VIEW - DISPLAY MODE - TEXTURE
+    SetDisplayMode( 3 );
+    break;
   case GEOMOp::OpShowAll:        // MENU VIEW - SHOW ALL
     getGeometryGUI()->EmitSignalDeactivateDialog();
     DisplayAll();
diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index a56f0efd8..11148b58b 100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -3004,6 +3004,10 @@ Please, select face, shell or solid and try again</translation>
         <source>MEN_MATERIALS_LIBRARY</source>
         <translation>Materials library</translation>
     </message>
+    <message>
+        <source>MEN_TEXTURE</source>
+        <translation>Texture</translation>
+    </message>
     <message>
         <source>MEN_TORUS</source>
         <translation>Torus</translation>
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index bdf31b968..ee74a0503 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -503,6 +503,7 @@ void GeometryGUI::OnGUIEvent( int id, const QVariant& theParam )
   case GEOMOp::OpDMWireframe:        // MENU VIEW - WIREFRAME
   case GEOMOp::OpDMShading:          // MENU VIEW - SHADING
   case GEOMOp::OpDMShadingWithEdges: // MENU VIEW - SHADING
+  case GEOMOp::OpDMTexture:          // MENU VIEW - TEXTURE
   case GEOMOp::OpShowAll:            // MENU VIEW - SHOW ALL
   case GEOMOp::OpShowOnly:           // MENU VIEW - DISPLAY ONLY
   case GEOMOp::OpShowOnlyChildren:   // MENU VIEW - SHOW ONLY CHILDREN
@@ -1019,6 +1020,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createGeomAction( GEOMOp::OpDMWireframe,        "WIREFRAME" );
   createGeomAction( GEOMOp::OpDMShading,          "SHADING" );
   createGeomAction( GEOMOp::OpDMShadingWithEdges, "SHADING_WITH_EDGES" );
+  createGeomAction( GEOMOp::OpDMTexture,          "TEXTURE" );
   createGeomAction( GEOMOp::OpShowAll,          "DISPLAY_ALL" );
   createGeomAction( GEOMOp::OpHideAll,          "ERASE_ALL" );
   createGeomAction( GEOMOp::OpShow,             "DISPLAY" );
@@ -1291,6 +1293,7 @@ void GeometryGUI::initialize( CAM_Application* app )
   createMenu( GEOMOp::OpDMWireframe,        dispmodeId, -1 );
   createMenu( GEOMOp::OpDMShading,          dispmodeId, -1 );
   createMenu( GEOMOp::OpDMShadingWithEdges, dispmodeId, -1 );
+  createMenu( GEOMOp::OpDMTexture,          dispmodeId, -1 );
   createMenu( separator(),                  dispmodeId, -1 );
   createMenu( GEOMOp::OpSwitchVectors,      dispmodeId, -1 );
 
diff --git a/src/GEOMGUI/GeometryGUI_Operations.h b/src/GEOMGUI/GeometryGUI_Operations.h
index 965e9e445..304220b0b 100644
--- a/src/GEOMGUI/GeometryGUI_Operations.h
+++ b/src/GEOMGUI/GeometryGUI_Operations.h
@@ -68,6 +68,7 @@ namespace GEOMOp {
     OpDMWireframe         = 2010,   // MENU VIEW  - DISPLAY MODE - WIREFRAME
     OpDMShading           = 2011,   // MENU VIEW  - DISPLAY MODE - SHADING
     OpDMShadingWithEdges  = 2012,   // MENU VIEW  - DISPLAY MODE - SHADING WITH EDGES
+    OpDMTexture           = 2013,   // MENU VIEW  - DISPLAY MODE - TEXTURE
     OpShow                = 2100,   // POPUP MENU - SHOW
     OpShowOnly            = 2101,   // POPUP MENU - SHOW ONLY
     OpHide                = 2102,   // POPUP MENU - HIDE