merge V7_7_BR

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_AddMeshElementDlg.h

diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
index 72ad06d9308db6cef46c114a8a8e10b3c8ec6884..9b19e3b064b984bb46385c5b78cf678cdd78689e 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // 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.
+// 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
@@ -64,15 +64,12 @@ namespace SMESH
 class SMESHGUI_EXPORT SMESHGUI_AddMeshElementDlg : public QDialog
 { 
   Q_OBJECT
-
 public:
   SMESHGUI_AddMeshElementDlg( SMESHGUI*, SMDSAbs_EntityType = SMDSEntity_Edge );
   ~SMESHGUI_AddMeshElementDlg();
   
 private:
   void                        Init();
-  void                        closeEvent( QCloseEvent* );
-  void                        hideEvent( QHideEvent* );     /* ESC key */
   void                        enterEvent( QEvent* );        /* mouse enter the QWidget */
   void                        keyPressEvent( QKeyEvent* );
   void                        displaySimulation();
@@ -119,9 +116,12 @@ private:
   
   QString                     myHelpFileName;
   
+protected slots:
+  virtual void                reject();
+          void                onDiameterChanged();
+
 private slots:
   void                        ClickOnOk();
-  void                        ClickOnCancel();
   void                        ClickOnApply();
   void                        ClickOnHelp();
   void                        SetEditCurrentArgument();
@@ -130,6 +130,8 @@ private slots:
   void                        ActivateThisDialog();
   void                        CheckBox( int );
   void                        onTextChange( const QString& );
+  void                        onOpenView();
+  void                        onCloseView();
 };
 
 #endif // SMESHGUI_ADDMESHELEMENTDLG_H