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
INT PAL 0052660: Plot2D Viewer: Plot2d_Curve can't be selected
[modules/gui.git]
/
src
/
CAM
/
CAM_Module.h
diff --git
a/src/CAM/CAM_Module.h
b/src/CAM/CAM_Module.h
index a49447a9fec22f1c74c98a7800aef478247ac353..74a2b6e75cfcc2ba1fbb26d6ed853a6ccad89746 100755
(executable)
--- a/
src/CAM/CAM_Module.h
+++ b/
src/CAM/CAM_Module.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-29,6
+29,8
@@
#include <QPixmap>
#include <QString>
#include <QMap>
#include <QPixmap>
#include <QString>
#include <QMap>
+#include <QPair>
+#include <QKeySequence>
class QAction;
class QMenu;
class QAction;
class QMenu;
@@
-139,6
+141,9
@@
protected:
int registerAction( const int, QAction* );
bool unregisterAction( const int );
bool unregisterAction( QAction* );
int registerAction( const int, QAction* );
bool unregisterAction( const int );
bool unregisterAction( QAction* );
+ // IMN 05/03/2015: we copied myActionMap for reset/unset actions accelerator keys
+ // after activate/deactivate modules
+ QMap<QPair<int, QAction*>, QKeySequence> myActionShortcutMap; //!< copy actions shortcut map
private:
CAM_Application* myApp; //!< parent application object
private:
CAM_Application* myApp; //!< parent application object