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
Merge branch 'master' of ssh://git.salome-platform.org/modules/hydro
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_InputPanel.h
diff --git
a/src/HYDROGUI/HYDROGUI_InputPanel.h
b/src/HYDROGUI/HYDROGUI_InputPanel.h
index 24603ea42393a7f0054fcbb20654a1cac6c5ea60..2c53aaefb71352d0df13efd36619cbbd43757332 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_InputPanel.h
+++ b/
src/HYDROGUI/HYDROGUI_InputPanel.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-27,6
+27,8
@@
class QFrame;
class QPushButton;
class QFrame;
class QPushButton;
+class QLayout;
+class QCloseEvent;
class HYDROGUI_Module;
class HYDROGUI_Module;
@@
-38,32
+40,38
@@
class HYDROGUI_InputPanel : public QDockWidget
Q_OBJECT
public:
Q_OBJECT
public:
- HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle );
+ HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle
, bool doInitLayout = true
);
virtual ~HYDROGUI_InputPanel();
virtual ~HYDROGUI_InputPanel();
- void addWidget( const QString& theLabel, QWidget* theWidget );
- void addWidget( QWidget* theWidget, const int theRow, const int theColumn );
- void addSeparator();
- void setRowStretch();
+ void addWidget( QWidget* theWidget, int theStretch = 0 );
+ void addLayout( QLayout* theLayout );
+ void addStretch();
HYDROGUI_Module* module() const;
signals:
void panelApply();
void panelCancel();
HYDROGUI_Module* module() const;
signals:
void panelApply();
void panelCancel();
+ void panelHelp();
protected slots:
protected slots:
- void OnApply();
- void OnCancel();
- void OnHelp();
+ void onApply();
+ void onCancel();
+ void onHelp();
+
+protected:
+ QFrame* mainFrame() const;
+ QFrame* buttonFrame() const;
+ virtual void closeEvent ( QCloseEvent * event );
+
+ QPushButton* myCancel;
+ QPushButton* myHelp;
private:
HYDROGUI_Module* myModule;
QFrame* myMainFrame;
QFrame* myBtnFrame;
QPushButton* myApply;
private:
HYDROGUI_Module* myModule;
QFrame* myMainFrame;
QFrame* myBtnFrame;
QPushButton* myApply;
- QPushButton* myCancel;
- QPushButton* myHelp;
};
#endif
};
#endif