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
cmake-3.12 ready
[modules/gui.git]
/
src
/
CAM
/
CAM_Module.h
diff --git
a/src/CAM/CAM_Module.h
b/src/CAM/CAM_Module.h
index 32953f63763e77424af31029da18334345f00d32..3cb43c1616f826df5d00b4d12278eb9418bb54b1 100755
(executable)
--- a/
src/CAM/CAM_Module.h
+++ b/
src/CAM/CAM_Module.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
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
@@
-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;
@@
-71,6
+73,10
@@
public:
virtual void putInfo( const QString&, const int = -1 );
virtual void putInfo( const QString&, const int = -1 );
+ int showNotification(const QString& message, const QString& title, int timeout = -1);
+ void hideNotification(const QString& message);
+ void hideNotification(int id);
+
bool isActiveModule() const;
virtual void setMenuShown( const bool );
bool isActiveModule() const;
virtual void setMenuShown( const bool );
@@
-97,6
+103,9
@@
public:
virtual QAction* createAction( const int, const QString&, const QIcon&, const QString&,
const QString&, const int, QObject* = 0,
const bool = false, QObject* = 0, const char* = 0, const QString& = QString() );
virtual QAction* createAction( const int, const QString&, const QIcon&, const QString&,
const QString&, const int, QObject* = 0,
const bool = false, QObject* = 0, const char* = 0, const QString& = QString() );
+ virtual QAction* createAction( const int, const QString&, const QIcon&, const QString&,
+ const QString&, const QKeySequence&, QObject* = 0,
+ const bool = false, QObject* = 0, const char* = 0, const QString& = QString() );
QtxActionGroup* createActionGroup( const int, const bool = true );
int createTool( const QString&, const QString& = QString() );
QtxActionGroup* createActionGroup( const int, const bool = true );
int createTool( const QString&, const QString& = QString() );
@@
-139,6
+148,11
@@
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<QAction*, QKeySequence> myActionShortcutMap; //!< copy actions shortcut map
+
+ virtual bool abortAllOperations();
private:
CAM_Application* myApp; //!< parent application object
private:
CAM_Application* myApp; //!< parent application object