Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_InputPanel.h
diff --git
a/src/HYDROGUI/HYDROGUI_InputPanel.h
b/src/HYDROGUI/HYDROGUI_InputPanel.h
index b9dadee6b6b5a91d09b97894bd66f8274c59442f..414c13f91c222dd692964d1b7fcf9a5db07e75c8 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_InputPanel.h
+++ b/
src/HYDROGUI/HYDROGUI_InputPanel.h
@@
-1,8
+1,4
@@
-// 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
-//
+// Copyright (C) 2014-2015 EDF-R&D
// 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
@@
-53,11
+49,13
@@
public:
void setApplyEnabled( bool );
signals:
void setApplyEnabled( bool );
signals:
+ void panelApplyAndClose();
void panelApply();
void panelCancel();
void panelHelp();
protected slots:
void panelApply();
void panelCancel();
void panelHelp();
protected slots:
+ void onApplyAndClose();
void onApply();
void onCancel();
void onHelp();
void onApply();
void onCancel();
void onHelp();
@@
-74,6
+72,7
@@
private:
HYDROGUI_Module* myModule;
QFrame* myMainFrame;
QFrame* myBtnFrame;
HYDROGUI_Module* myModule;
QFrame* myMainFrame;
QFrame* myBtnFrame;
+ QPushButton* myApplyAndClose;
QPushButton* myApply;
};
QPushButton* myApply;
};