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 of messages
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_Preferences_ScalarBarDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
index 05dea0f597033bc0a5ab2333b435ca67dabd5a05..d286d2c411f36ecfc74e260bb50f4a9bc8c76efd 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
@@
-64,17
+64,18
@@
public:
static void ScalarBarProperties( SMESHGUI* );
static void ScalarBarProperties( SMESHGUI* );
- void closeEvent( QCloseEvent* );
void setOriginAndSize( const double,
const double,
const double,
const double );
void initScalarBarFromResources();
void setOriginAndSize( const double,
const double,
const double,
const double );
void initScalarBarFromResources();
+protected slots:
+ virtual void reject();
+
protected slots:
void onOk();
bool onApply();
protected slots:
void onOk();
bool onApply();
- void onCancel();
void onHelp();
void onSelectionChanged();
void onXYChanged();
void onHelp();
void onSelectionChanged();
void onXYChanged();