PAL10125 - by double click on reference original object becomes selected

[modules/gui.git] / src / SUIT / SUIT_Accel.cxx

diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index 0b8534404dbeeb8f30104dcd200d186467062935..5e94b549726ce952b5308dd0831203e7e7646401 100644 (file)
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -31,30 +31,29 @@ SUIT_Accel::~SUIT_Accel()
 /*! setActionKey  assign a ceratain action for a key accelerator */
 void SUIT_Accel::setActionKey( const int action, const int key, const QString& type )
 {    
-  if ( myKeyActionMap.contains( key ) )
-    myAccel->removeItem( action );
-
-  myKeyActionMap[key] = action;
-  QStringList vTypes;
-  if ( myActionViewerTypesMap.contains( action ) )
-    vTypes = myActionViewerTypesMap[action];
-  if ( !vTypes.contains( type ) )
-    vTypes.append( type );
-  myActionViewerTypesMap[action] = vTypes;
-
-  myAccel->insertItem( key, action );
+  // 1. get or generate interal "id" of action
+  int id = myAccel->findKey( key );
+  if ( id == -1 )
+    id = myAccel->insertItem( key );
+
+  IdActionMap idActionMap;
+  if ( myMap.contains( type ) )
+    idActionMap = myMap[type];
+
+  idActionMap[id] = action;
+  myMap[type] = idActionMap;
 }
 
 /*! onActivated  slot called when a registered key accelerator was activated */
-void SUIT_Accel::onActivated( int action )
+void SUIT_Accel::onActivated( int id )
 {
   if ( myDesktop ) {
     if ( SUIT_ViewWindow* vw = myDesktop->activeWindow() ) {
       QString type = vw->getViewManager()->getViewModel()->getType();
-      if (  myActionViewerTypesMap.contains( action ) ) {
-       QStringList vTypes = myActionViewerTypesMap[action];
-       if ( vTypes.contains( type ) ) {
-         vw->onAccelAction( action );
+      if (  myMap.contains( type ) ) {
+       IdActionMap idActionMap = myMap[type];
+       if ( idActionMap.contains( id ) ) {
+         vw->onAccelAction( idActionMap[id] );
        }
       }
     }