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 master branch into V9_dev
[modules/gui.git]
/
src
/
Qtx
/
QtxWorkstackAction.cxx
diff --git
a/src/Qtx/QtxWorkstackAction.cxx
b/src/Qtx/QtxWorkstackAction.cxx
index bce4e418d918504592cd3754913dfb7aef17a364..668bd4f58734a852ca103194f0f7c54f0f8403ae 100644
(file)
--- a/
src/Qtx/QtxWorkstackAction.cxx
+++ b/
src/Qtx/QtxWorkstackAction.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
@@
-203,7
+203,7
@@
int QtxWorkstackAction::accel( const int id ) const
{
int a = 0;
if ( action( id ) )
{
int a = 0;
if ( action( id ) )
- a = action( id )->shortcut();
+ a = action( id )->shortcut()
[0]
;
return a;
}
return a;
}
@@
-524,12
+524,12
@@
QtxSplitDlg::QtxSplitDlg( QWidget* parent, QtxWorkstack* workstack, QtxSplitDlgM
// Buttons for possibility of switching the variants of split
myButtonPrevious = new QPushButton( this );
// Buttons for possibility of switching the variants of split
myButtonPrevious = new QPushButton( this );
- myButtonPrevious->setIcon( Q
Icon
( prev_xpm ) );
+ myButtonPrevious->setIcon( Q
Pixmap
( prev_xpm ) );
myButtonPrevious->setAutoDefault(true);
myButtonPrevious->setEnabled( false );
myButtonNext = new QPushButton( this );
myButtonPrevious->setAutoDefault(true);
myButtonPrevious->setEnabled( false );
myButtonNext = new QPushButton( this );
- myButtonNext->setIcon( Q
Icon
( next_xpm ) );
+ myButtonNext->setIcon( Q
Pixmap
( next_xpm ) );
myButtonNext->setAutoDefault(true);
myButtonNext->setEnabled( false );
myButtonNext->setAutoDefault(true);
myButtonNext->setEnabled( false );