X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_Dialog.cxx;h=384b887cc85bbe919c98156cb0f393bd22efe0c4;hp=04ccdf4ee5d9cd91beb44ee9d98998d624327d3f;hb=20d9e162bd67182cbfa841bbfc9319919f4703e3;hpb=0d232fb7040d63d364bcea108c001deabe561225

diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
index 04ccdf4ee..384b887cc 100644
--- a/src/SMESHGUI/SMESHGUI_Dialog.cxx
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -1,48 +1,58 @@
-//  SMESH SMESHGUI : GUI for SMESH component
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_Dialog.cxx
+// Author : Alexander SOLOVYOV, Open CASCADE S.A.S.
+// SMESH includes
 //
-//  File   : SMESHGUI_Dialog.cxx
-//  Author : Alexander SOLOVYOV
-//  Module : SMESH
-//  $Header$
+#include "SMESHGUI_Dialog.h"
 
-#include <SMESHGUI_Dialog.h>
 #include <SMESH_Type.h>
+
+// SALOME GUI includes
+#include <SUIT_Desktop.h>
 #include <SUIT_Session.h>
 #include <SalomeApp_Application.h>
 
+// Qt includes
+#include <QFrame>
+
 //=================================================================================
 // function : SMESHGUI_Dialog
 // purpose  : Constructor
 //=================================================================================
 SMESHGUI_Dialog::SMESHGUI_Dialog( QWidget* parent, const bool modal,
                                   const bool allowResize, const int flags )
-: SalomeApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags )
+: LightApp_Dialog( parent == 0 ? desktop() : parent, "", modal, allowResize, flags )
 {
   int pr = prefix( "SMESH" );
-  typeName( pr + MESH ) = tr( "DLG_MESH" );
-  typeName( pr + HYPOTHESIS ) = tr( "DLG_HYPO" );
-  typeName( pr + ALGORITHM ) = tr( "DLG_ALGO" );
+  typeName( pr + SMESH::MESH       ) = tr( "DLG_MESH" );
+  typeName( pr + SMESH::HYPOTHESIS ) = tr( "DLG_HYPO" );
+  typeName( pr + SMESH::ALGORITHM  ) = tr( "DLG_ALGO" );
+  typeName( prefix( "GEOM" )       ) = tr( "DLG_GEOM" );
+  setButtonText(1, tr("SMESH_BUT_APPLY_AND_CLOSE")); //rename OK to Apply and Close
+  if ( flags & Close )
+    setButtonPosition( Right, Close );
 }
 
 //=================================================================================
@@ -60,20 +70,21 @@ SMESHGUI_Dialog::~SMESHGUI_Dialog()
 void SMESHGUI_Dialog::show()
 {
   adjustSize();
-  SUIT_Desktop *PP = desktop();
-  int x = abs( PP->x() + PP->size().width() - size().width() - 10 ),
-      y = abs( PP->y() + PP->size().height() - size().height() - 10 );
-  move(x, y);
-  SalomeApp_Dialog::show();
+  LightApp_Dialog::show();
 }
 
 //=================================================================================
 // function : setContentActive
 // purpose  :
 //=================================================================================
-void SMESHGUI_Dialog::setContentActive( const bool active ) const
+void SMESHGUI_Dialog::setContentActive( const bool active )
 {
   mainFrame()->setEnabled( active );
+  setButtonEnabled( active, OK );
+  setButtonEnabled( active, Apply );
+  setButtonEnabled( active, Cancel );
+  setButtonEnabled( active, Close );
+  setButtonEnabled( active, Help );
 }
 
 //=================================================================================
@@ -113,25 +124,7 @@ int SMESHGUI_Dialog::prefix( const QString& name )
 // name    : resourceMgr
 // Purpose : Gets resource manager
 //=======================================================================
-SUIT_ResourceMgr* resourceMgr()
+SUIT_ResourceMgr* SMESHGUI_Dialog::resourceMgr() const
 {
   return SUIT_Session::session()->resourceMgr();
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-