Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'V9_5_BR'
[modules/geom.git]
/
src
/
GEOMBase
/
GEOMBase_Skeleton.h
diff --git
a/src/GEOMBase/GEOMBase_Skeleton.h
b/src/GEOMBase/GEOMBase_Skeleton.h
index 73bf0d2a20f612319323b0dfeb85c924756a72db..6902f3661b67f3b59a2e9c38facd87f9d1d0d7d3 100644
(file)
--- a/
src/GEOMBase/GEOMBase_Skeleton.h
+++ b/
src/GEOMBase/GEOMBase_Skeleton.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
@@
-18,6
+18,7
@@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
// GEOM GEOMGUI : GUI for Geometry component
// File : GEOMBase_Skeleton.h
// GEOM GEOMGUI : GUI for Geometry component
// File : GEOMBase_Skeleton.h
@@
-27,13
+28,14
@@
#define GEOMBASE_SKELETON_H
#include "GEOM_GEOMBase.hxx"
#define GEOMBASE_SKELETON_H
#include "GEOM_GEOMBase.hxx"
+#include "GEOMBase_DlgSkeleton.h"
#include "GEOMBase_Helper.h"
#include <QDialog>
class SalomeApp_DoubleSpinBox;
class GeometryGUI;
#include "GEOMBase_Helper.h"
#include <QDialog>
class SalomeApp_DoubleSpinBox;
class GeometryGUI;
-class
DlgRef_
Skeleton;
+class
GEOMBase_Dlg
Skeleton;
class QSpinBox;
class QDoubleSpinBox;
class QLineEdit;
class QSpinBox;
class QDoubleSpinBox;
class QLineEdit;
@@
-89,7
+91,7
@@
protected:
void setHelpFileName( const QString& );
void setHelpFileName( const QString& );
-
DlgRef_Skeleton*
mainFrame();
+
GEOMBase_DlgSkeleton*
mainFrame();
QWidget* centralWidget();
QPushButton* buttonCancel() const;
QPushButton* buttonOk() const;
QWidget* centralWidget();
QPushButton* buttonCancel() const;
QPushButton* buttonOk() const;
@@
-102,7
+104,9
@@
protected:
QString myHelpFileName; //!< Associated HTML help file name
QButtonGroup* myRBGroup; //!< radio button group
QString myHelpFileName; //!< Associated HTML help file name
QButtonGroup* myRBGroup; //!< radio button group
- DlgRef_Skeleton* myMainFrame; //!< dialog box's mainframe widgetx
+ GEOMBase_DlgSkeleton* myMainFrame; //!< dialog box's mainframe widget
+ QString myHelpContext; //!< Help context, needed for the customization
+ //!< path where located plugins help HTML pages
protected slots:
virtual void ClickOnCancel();
protected slots:
virtual void ClickOnCancel();
@@
-110,7
+114,7
@@
protected slots:
void LineEditReturnPressed();
void DeactivateActiveDialog();
void ActivateThisDialog();
void LineEditReturnPressed();
void DeactivateActiveDialog();
void ActivateThisDialog();
- v
oid
ClickOnHelp();
+ v
irtual void
ClickOnHelp();
signals:
void constructorsClicked( int );
signals:
void constructorsClicked( int );