Replace oe by Å\93

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_ConvToQuadDlg.cxx

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
index 5db422cddc058bef5bbf2fd7de800c2dbfbbbdbe..161a5f69628818bfda16d6233e7a24c5dbfeafc8 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // SMESH SMESHGUI : GUI for SMESH component
 // File   : SMESHGUI_ConvToQuadDlg.cxx
 // Author : Open CASCADE S.A.S.
@@ -35,6 +36,7 @@
 #include <QFrame>
 #include <QHBoxLayout>
 #include <QGridLayout>
+#include <QLabel>
 
 #define SPACING 6
 #define MARGIN  11
@@ -69,6 +71,8 @@ SMESHGUI_ConvToQuadDlg::SMESHGUI_ConvToQuadDlg()
   myBG->addButton(myRB2, 1);
   myRB1->setChecked( true );
 
+  myWarning = new QLabel(QString("<b>%1</b>").arg(tr("NON_CONFORM_WARNING")), mainFrame());
+
   // Fill layout
   QGridLayout* aLay = new QGridLayout( mainFrame() );
   aLay->setMargin( 5 );
@@ -79,6 +83,7 @@ SMESHGUI_ConvToQuadDlg::SMESHGUI_ConvToQuadDlg()
   aLay->addWidget( objectWg( 0,  Control ), 0, 2 );
   aLay->addWidget( myMedNdsOnGeom,          1, 0, 1, 3 );
   aLay->addWidget( myBGBox,                 2, 0, 1, 3 );
+  aLay->addWidget( myWarning,               3, 0, 1, 3 );
   
   connect(myBG, SIGNAL( buttonClicked( int ) ), this, SIGNAL( onClicked( int ) ) );
 }
@@ -112,11 +117,26 @@ int SMESHGUI_ConvToQuadDlg::CurrentRB( )
   return myBG->checkedId();
 }
 
+void SMESHGUI_ConvToQuadDlg::ShowWarning(bool toShow)
+{
+  if ( toShow )
+    myWarning->show();
+  else
+    myWarning->hide();
+}
+
+bool SMESHGUI_ConvToQuadDlg::isWarningShown()
+{
+  return myWarning->isVisible();
+}
+
 void SMESHGUI_ConvToQuadDlg::SetEnabledControls( const bool theCheck )
 {
-  myBGBox->setEnabled( theCheck );
+  //myBGBox->setEnabled( theCheck );
+  myRB1->setEnabled( theCheck );
+  myRB2->setEnabled( theCheck );
   myMedNdsOnGeom->setEnabled( theCheck );
-  setButtonEnabled( theCheck, QtxDialog::OK | QtxDialog::Apply );
+  //setButtonEnabled( theCheck, QtxDialog::OK | QtxDialog::Apply );
 }
 
 void SMESHGUI_ConvToQuadDlg::SetEnabledRB( const int idx, const bool theCheck )