Integrated to V7_main: 0022366: EDF SMESH: Create Mesh dialog box improvement: create...

diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index c9020d81a154bdcd47b607de824ed1e30d84d87b..96a6c2647b9f0ae740ea30d81a8794598fcc01f2 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -141,13 +141,6 @@ bool SMESHGUI_MeshOp::onApply()
       SUIT_MessageBox::warning( myDlg, tr( "SMESH_WRN_WARNING" ), aMess );
     return false;
   }
-/*  else if ( aMess == tr( "GEOMETRY_OBJECT_IS_NOT_DEFINED" ) || aMess == tr( "GEOMETRY_OBJECT_IS_NULL" ) )
-  {
-       dlg()->show();
-       if ( SUIT_MessageBox::warning( myDlg, tr( "SMESH_WRN_WARNING" ), aMess,
-                SUIT_MessageBox::Yes, SUIT_MessageBox::No ) == SUIT_MessageBox::No )
-         return false;
-  }*/
 
   bool aResult = false;
   aMess = "";

diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts
index afca8a694dffbe90b329cba8fdaa4d98755cdcf3..0006aef16eb207ba9d6f10c719a95037599c4d39 100644 (file)
--- a/src/SMESHGUI/SMESH_msg_en.ts
+++ b/src/SMESHGUI/SMESH_msg_en.ts
@@ -6000,11 +6000,14 @@ Please specify them and try again</translation>
     <message>
         <source>GEOMETRY_OBJECT_IS_NOT_DEFINED</source>
         <translation>Geometry object is not defined
-Please specify it and try again</translation>
+Do you want to create empty mesh 
+without algorithm&apos;s and hypothesis? </translation>
     </message>
     <message>
         <source>GEOMETRY_OBJECT_IS_NULL</source>
-        <translation>Geometry object is null</translation>
+        <translation>Geometry object is null
+Do you want to create empty mesh 
+without algorithm&apos;s and hypothesis? </translation>
     </message>
     <message>
         <source>HYPOTHESES_AND_ALGORITHMS_ARE_NOT_DEFINED</source>

diff --git a/src/SMESHGUI/SMESH_msg_fr.ts b/src/SMESHGUI/SMESH_msg_fr.ts
index d22cd18f839f26cd14da723de170d874f0605138..55f520f51228a1d831dd94bba4e8947f0396c087 100755 (executable)
--- a/src/SMESHGUI/SMESH_msg_fr.ts
+++ b/src/SMESHGUI/SMESH_msg_fr.ts
@@ -5993,12 +5993,15 @@ Voulez-vous éditer ce sous-maillage?</translation>
     </message>
     <message>
         <source>GEOMETRY_OBJECT_IS_NOT_DEFINED</source>
-        <translation>L&apos;objet géométrique n&apos;est pas défini
-Indiquez-le et essayez de nouveau</translation>
+        <translation type="unfinished">Geometry object is not defined
+Do you want to create empty mesh 
+without algorithm&apos;s and hypothesis? </translation>
     </message>
     <message>
         <source>GEOMETRY_OBJECT_IS_NULL</source>
-        <translation>L&apos;objet géométrique est nul</translation>
+        <translation type="unfinished">Geometry object is null
+Do you want to create empty mesh 
+without algorithm&apos;s and hypothesis? </translation>
     </message>
     <message>
         <source>HYPOTHESES_AND_ALGORITHMS_ARE_NOT_DEFINED</source>