Adding a shortcut for deleting jobs

diff --git a/src/genericgui/BL_GenericGui.cxx b/src/genericgui/BL_GenericGui.cxx
index f626d381a3921fe2f9b88e2cd45f78ef591a6747..e8c34ff07a272848fd573bee0dc4fdba0f4740fb 100644 (file)
--- a/src/genericgui/BL_GenericGui.cxx
+++ b/src/genericgui/BL_GenericGui.cxx
@@ -184,7 +184,7 @@ BL::GenericGui::createActions()
   _edit_clone_job_action = _wrapper->createAction("Edit/Clone a Job", QIcon(), "Edit/Clone a Job", "Edit/Clone a Job", 0, _dock_parent, false, this, SLOT(edit_clone_job()));
   _start_job_action = _wrapper->createAction("Start a Job", QIcon(), "Start a Job", "Start a Job", 0, _dock_parent, false, this, SLOT(start_job()));
   _restart_job_action = _wrapper->createAction("Restart a Job", QIcon(), "Restart a Job", "Restart a Job", 0, _dock_parent, false, this, SLOT(restart_job()));
-  _delete_job_action = _wrapper->createAction("Delete a Job", QIcon(), "Delete a Job", "Delete a Job", 0, _dock_parent, false, this, SLOT(delete_job()));
+  _delete_job_action = _wrapper->createAction("Delete a Job", QIcon(), "Delete a Job", "Delete a Job", Qt::Key_Delete, _dock_parent, false, this, SLOT(delete_job()));
   _refresh_job_action = _wrapper->createAction("Refresh Jobs", QIcon(), "Refresh Jobs", "Refresh Jobs", 0, _dock_parent, false, this, SLOT(refresh_job()));
   _get_results_job_action = _wrapper->createAction("Get Job Results", QIcon(), "Get Job Results", "Get Job Results", 0, _dock_parent, false, this, SLOT(refresh_job()));
   _stop_job_action = _wrapper->createAction("Stop a Job", QIcon(), "Stop a Job", "Stop a Job", 0, _dock_parent, false, this, SLOT(stop_job()));

diff --git a/src/wrappers/BL_MainWindows_Qt.cxx b/src/wrappers/BL_MainWindows_Qt.cxx
index cda3f49c4df10fa97ae4b9ff41abef3d98fa7f53..e77895689d90af1781ca5b84a16cbb0ae95fe718 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.cxx
+++ b/src/wrappers/BL_MainWindows_Qt.cxx
@@ -49,11 +49,12 @@ BL::MainWindows_Qt::createAction(const QString& toolTip,
                                 const QIcon& icon,
                                 const QString& menu,
                                 const QString& status,
-                                const int shortCut,
+                                const int accel,
                                 QObject* parent,
                                 bool checkable,
                                 QObject* receiver,
-                                const char* member)
+                                const char* member,
+                                 const QString& shortCut)
 {
   QAction * action = new QAction(icon, menu, parent);
   action->setStatusTip(status);

diff --git a/src/wrappers/BL_MainWindows_Qt.hxx b/src/wrappers/BL_MainWindows_Qt.hxx
index 993c9a51c170cb5817d4cad211c53d5b98b25201..a84e0f0599f4c28ffd775628ec7de11f38b426ea 100644 (file)
--- a/src/wrappers/BL_MainWindows_Qt.hxx
+++ b/src/wrappers/BL_MainWindows_Qt.hxx
@@ -39,11 +39,12 @@ namespace BL
                                    const QIcon& icon,
                                    const QString& menu,
                                    const QString& status,
-                                   const int shortCut,
+                                   const int accel,
                                    QObject* parent =0,
                                    bool checkable = false,
                                    QObject* receiver =0,
-                                   const char* member =0);
+                                   const char* member =0,
+                                    const QString& shortCut=QString());
 
       virtual int createTopMenu(const QString & menu_name);
       virtual void addActionToMenu(QAction * action, int menu_id);

diff --git a/src/wrappers/BL_MainWindows_SALOME.cxx b/src/wrappers/BL_MainWindows_SALOME.cxx
index 3c6d9701e45866e425b1af5a834b010a3c475161..58277512b5effcd92ecef8118d20149828125ef5 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.cxx
+++ b/src/wrappers/BL_MainWindows_SALOME.cxx
@@ -121,13 +121,14 @@ BL::MainWindows_SALOME::createAction(const QString& toolTip,
                                     const QIcon& icon,
                                     const QString& menu,
                                     const QString& status,
-                                    const int shortCut,
+                                    const int accel,
                                     QObject* parent,
                                     bool checkable,
                                     QObject* receiver,
-                                    const char* member)
+                                    const char* member,
+                                     const QString & shortCut)
 {
-  return SalomeApp_Module::createAction(getActionId(), toolTip, icon, menu, status, shortCut, parent, checkable, receiver, member);
+  return SalomeApp_Module::createAction(getActionId(), toolTip, icon, menu, status, accel, parent, checkable, receiver, member, shortCut);
 }
 
 int

diff --git a/src/wrappers/BL_MainWindows_SALOME.hxx b/src/wrappers/BL_MainWindows_SALOME.hxx
index 96a96ee66e2293af04cd5cfa28a413106bd0269e..32c6f14de73fe9fa0925e43dbf00aff9bd9b7df4 100644 (file)
--- a/src/wrappers/BL_MainWindows_SALOME.hxx
+++ b/src/wrappers/BL_MainWindows_SALOME.hxx
@@ -54,11 +54,12 @@ namespace BL
                                     const QIcon& icon,
                                     const QString& menu,
                                     const QString& status,
-                                    const int shortCut,
+                                    const int accel,
                                     QObject* parent =0,
                                     bool checkable = false,
                                     QObject* receiver =0,
-                                    const char* member =0);
+                                    const char* member =0,
+                                    const QString& shortCut=QString());
 
       virtual int createTopMenu(const QString & menu_name);
       virtual void addActionToMenu(QAction * action, int menu_id);

diff --git a/src/wrappers/BL_MainWindows_Wrap.hxx b/src/wrappers/BL_MainWindows_Wrap.hxx
index 454b675e891687d3e0e54e740a0907a063b1aa4b..de336b9a701072af7b5b1ce82461b5620c6c63ed 100644 (file)
--- a/src/wrappers/BL_MainWindows_Wrap.hxx
+++ b/src/wrappers/BL_MainWindows_Wrap.hxx
@@ -40,11 +40,12 @@ namespace BL
                                    const QIcon& icon,
                                    const QString& menu,
                                    const QString& status,
-                                   const int shortCut,
+                                   const int accel,
                                    QObject* parent =0,
                                    bool checkable = false,
                                    QObject* receiver =0,
-                                   const char* member =0) = 0;
+                                   const char* member =0,
+                                    const QString& shortCut=QString()) = 0;
 
       virtual int createTopMenu(const QString & menu_name) = 0;
       virtual void addActionToMenu(QAction * action, int menu_id) = 0;