Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into gni/adaptation
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_SingleEditDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_SingleEditDlg.h
b/src/SMESHGUI/SMESHGUI_SingleEditDlg.h
old mode 100755
(executable)
new mode 100644
(file)
index
cc04610
..
86cfcde
--- a/
src/SMESHGUI/SMESHGUI_SingleEditDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_SingleEditDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
@@
-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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-62,7
+62,7
@@
public:
protected slots:
void onOk();
virtual bool onApply();
protected slots:
void onOk();
virtual bool onApply();
- v
oid onClose
();
+ v
irtual void reject
();
void onHelp();
void onDeactivate();
void onHelp();
void onDeactivate();
@@
-70,10
+70,13
@@
protected slots:
void onSelectionDone();
void onTextChange( const QString& );
void onSelectionDone();
void onTextChange( const QString& );
+private slots:
+ void onOpenView();
+ void onCloseView();
+
+
protected:
protected:
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* );
void enterEvent( QEvent* );
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget* );
void keyPressEvent( QKeyEvent* );
QWidget* createButtonFrame( QWidget* );
QWidget* createMainFrame( QWidget* );