Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V7_dev' into V8_0_0_BR
[modules/gui.git]
/
src
/
Plot2d
/
Plot2d_ViewWindow.cxx
diff --git
a/src/Plot2d/Plot2d_ViewWindow.cxx
b/src/Plot2d/Plot2d_ViewWindow.cxx
index 8fe81acb02f554a65b22ccf28990b9e323de6da0..69e1310e15704c24a376144a90389911aca9404d 100755
(executable)
--- a/
src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/
src/Plot2d/Plot2d_ViewWindow.cxx
@@
-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
@@
-433,7
+433,6
@@
void Plot2d_ViewWindow::createActions()
mgr->registerAction( aAction, CurvSettingsId );
// 9. Analytical curves
mgr->registerAction( aAction, CurvSettingsId );
// 9. Analytical curves
-#ifndef DISABLE_PYCONSOLE
aAction = new QtxAction( tr( "TOT_PLOT2D_ANALYTICAL_CURVES" ),
aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_ANALYTICAL_CURVES" ) ),
tr( "MEN_PLOT2D_ANALYTICAL_CURVES" ),
aAction = new QtxAction( tr( "TOT_PLOT2D_ANALYTICAL_CURVES" ),
aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_ANALYTICAL_CURVES" ) ),
tr( "MEN_PLOT2D_ANALYTICAL_CURVES" ),
@@
-442,7
+441,6
@@
void Plot2d_ViewWindow::createActions()
aAction->setStatusTip( tr( "PRP_PLOT2D_ANALYTICAL_CURVES" ) );
connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onAnalyticalCurve() ) );
mgr->registerAction( aAction, AnalyticalCurveId );
aAction->setStatusTip( tr( "PRP_PLOT2D_ANALYTICAL_CURVES" ) );
connect( aAction, SIGNAL( triggered( bool ) ), myViewFrame, SLOT( onAnalyticalCurve() ) );
mgr->registerAction( aAction, AnalyticalCurveId );
-#endif
// 10. Clone
aAction = new QtxAction( tr( "MNU_CLONE_VIEW" ),
// 10. Clone
aAction = new QtxAction( tr( "MNU_CLONE_VIEW" ),
@@
-477,7
+475,9
@@
void Plot2d_ViewWindow::createActions()
void Plot2d_ViewWindow::createToolBar()
{
QtxActionToolMgr* mgr = toolMgr();
void Plot2d_ViewWindow::createToolBar()
{
QtxActionToolMgr* mgr = toolMgr();
- myToolBar = mgr->createToolBar( tr( "LBL_TOOLBAR_LABEL" ), false );
+ myToolBar = mgr->createToolBar( tr( "LBL_TOOLBAR_LABEL" ), // title (language-dependant)
+ QString( "Plot2dViewOperations" ), // name (language-independant)
+ false ); // disable floatable toolbar
mgr->append( DumpId, myToolBar );
mgr->append( ScaleOpId, myToolBar );
mgr->append( MoveOpId, myToolBar );
mgr->append( DumpId, myToolBar );
mgr->append( ScaleOpId, myToolBar );
mgr->append( MoveOpId, myToolBar );