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
Update translation files from Crowdin
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_BuildCompoundDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
index 6230022e82f42e9be2a1cbaa1b75854225942a03..f54e59eda895f5cdb0ac4ade958cdbd1fff73415 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_BuildCompoundDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-56,7
+56,7
@@
class SUIT_SelectionFilter;
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_BuildCompoundDlg : public QDialog
{
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_BuildCompoundDlg : public QDialog
{
- Q_OBJECT
;
+ Q_OBJECT
public:
public:
@@
-68,9
+68,7
@@
public:
private:
void Init();
private:
void Init();
- void closeEvent( QCloseEvent* );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void enterEvent( QEvent* ); /* mouse enter the QWidget */
- void hideEvent( QHideEvent* ); /* ESC key */
void keyPressEvent( QKeyEvent* );
bool isValid();
void keyPressEvent( QKeyEvent* );
bool isValid();
@@
-82,9
+80,9
@@
private:
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
- SMESH::SMESH_
Mesh_var
myMesh;
- SUIT_SelectionFilter* myMeshFilter;
- SMESH::
mesh_array_var
myMeshArray;
+ SMESH::SMESH_
IDSource_var
myMesh;
+ SUIT_SelectionFilter*
myMeshFilter;
+ SMESH::
ListOfIDSources_var
myMeshArray;
// Widgets
QGroupBox* GroupConstructors;
// Widgets
QGroupBox* GroupConstructors;
@@
-115,9
+113,11
@@
private:
bool myIsApplyAndClose;
bool myIsApplyAndClose;
+protected slots:
+ virtual void reject();
+
private slots:
void ClickOnOk();
private slots:
void ClickOnOk();
- void ClickOnCancel();
bool ClickOnApply();
void ClickOnHelp();
void SelectionIntoArgument();
bool ClickOnApply();
void ClickOnHelp();
void SelectionIntoArgument();