Cancel button renamed in Close and moved to the right position

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
index 04ccdf4ee5d9cd91beb44ee9d98998d624327d3f..1e1df649ca0cfa9a3b89ee5ae19f7e75c51df25c 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Dialog.cxx
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -43,6 +43,8 @@ SMESHGUI_Dialog::SMESHGUI_Dialog( QWidget* parent, const bool modal,
   typeName( pr + MESH ) = tr( "DLG_MESH" );
   typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" );
   typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" );
   typeName( pr + MESH ) = tr( "DLG_MESH" );
   typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" );
   typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" );

+  if ( flags & Close )
+    setButtonPosition( Right, Close );

 }
 
 //=================================================================================
 }
 
 //=================================================================================

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h
index cfc69adb14fab0b030c966f9ae97d9660fbdb9f8..66f61c6d38727e14d0c47efd7ac2b1ba7c82f816 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_Dialog.h
+++ b/src/SMESHGUI/SMESHGUI_Dialog.h
@@ -44,7 +44,7 @@ class SMESHGUI_Dialog : public SalomeApp_Dialog
   Q_OBJECT
   
 public:
   Q_OBJECT
   
 public:

-  SMESHGUI_Dialog( QWidget* = 0, const bool = false, const bool = false, const int = OK | Cancel | Apply );
+  SMESHGUI_Dialog( QWidget* = 0, const bool = false, const bool = false, const int = OK | Close | Apply );

   virtual ~SMESHGUI_Dialog();
 
   virtual void show();
   virtual ~SMESHGUI_Dialog();
 
   virtual void show();