[Lmuse-cvs-traffic] muse/muse/widgets shortcutcapturedialog.cpp,1.3,1.4

[Mathias L. <lun...@us...>]

Update of /cvsroot/lmuse/muse/muse/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8749/muse/widgets

Modified Files:
	shortcutcapturedialog.cpp 
Log Message:
removed check for conflicting shortcuts against the shortcut you're currently editing

Index: shortcutcapturedialog.cpp
===================================================================
RCS file: /cvsroot/lmuse/muse/muse/widgets/shortcutcapturedialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** shortcutcapturedialog.cpp	14 Sep 2004 18:17:48 -0000	1.3
--- shortcutcapturedialog.cpp	26 Oct 2004 19:16:06 -0000	1.4
***************
*** 59,66 ****
              // Check against conflicting shortcuts
              for (int i=0; i < SHRT_NUM_OF_ELEMENTS; i++) {
!                   if (shortcuts[i].key == key && (shortcuts[i].type & (shortcuts[shortcutindex].type | GLOBAL_SHRT | INVIS_SHRT))) {
!                         msgString = tr("Shortcut conflicts with ") + QString(shortcuts[i].descr);
!                         conflict = true;
!                         break;
                          }
                    }
--- 59,68 ----
              // Check against conflicting shortcuts
              for (int i=0; i < SHRT_NUM_OF_ELEMENTS; i++) {
!                   if (i != shortcutindex) { //check all other than current shortcut
!                         if (shortcuts[i].key == key && (shortcuts[i].type & (shortcuts[shortcutindex].type | GLOBAL_SHRT | INVIS_SHRT))) {
!                               msgString = tr("Shortcut conflicts with ") + QString(shortcuts[i].descr);
!                               conflict = true;
!                               break;
!                               }
                          }
                    }