Merge from V6_main_20120808 08Aug12

[modules/gui.git] / src / SalomeApp / SalomeApp_StudyPropertiesDlg.h

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index ce56f996e97eee3c2a73579355233976316a950b..8ff0500d9d12fd0ee04e04cc5d4a10e1b9e98f8b 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -1,26 +1,27 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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.
 //
-//  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
+// 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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SalomeApp_StudyPropertiesDlg.h
-//  Author : Sergey ANIKIN
+//  Author : Roman NIKOLAEV
 //  Module : SALOME
 //
 #ifndef SALOMEAPP_STUDY_PROPERTIES_DLG_H
@@ -35,45 +36,41 @@
 
 #include <SALOMEDSClient_Study.hxx>
 
-class SalomeApp_ListView;
+class QLineEdit;
+class QLabel;
+class QCheckBox;
+class QComboBox;
+class QTextEdit;
+class QTreeWidget;
 class QPushButton;
 
 class SALOMEAPP_EXPORT SalomeApp_StudyPropertiesDlg : public QDialog
 { 
   Q_OBJECT
-
-public:
-  enum {
-    prpAuthorId,
-    prpModeId,
-    prpDateId,
-    prpSavedId,
-    prpLockedId,
-    prpModificationsId,
-    prpLastId
-  };
-
 public:
   SalomeApp_StudyPropertiesDlg( QWidget* parent = 0 );
   ~SalomeApp_StudyPropertiesDlg();
 
-  bool isChanged() { return myChanged; } 
-
+  bool isChanged() { return myIsChanged; }
+  
 public slots:
-  void onOK();
-
+  void clickOnOk();
+ 
 private:
-  void initData(); 
-  bool acceptData(); 
-  bool propChanged(); 
+ void initData();
   
 private:
-  SalomeApp_ListView* myPropList;
-  QPushButton*        myOKBtn;
-  QPushButton*        myCancelBtn;
-  bool                myChanged;  
-
-  _PTR(Study)         myStudyDoc;
+ _PTR(Study)          myStudyDoc;
+ bool                 myIsChanged;
+ QLineEdit*           myAuthor;
+ QLabel*              myDate;
+ QCheckBox*           myLocked;
+ QLabel*              myModification;
+ QComboBox*           myUnits;
+ QTextEdit*           myComment;
+ QTreeWidget*         myModifications;
+ QPushButton*         myOkButton;
+ QPushButton*         myCancelButton;
 };
  
 #endif // SALOMEAPP_STUDY_PROPERTIES_DLG_H