CVS commit by mlaurent: 

Fix "configure shortcut"


  M +70 -81    kmidframe.cpp   1.61
  M +4 -3      kmidframe.h   1.24
  M +2 -4      kmidui.rc   1.5


--- kdemultimedia/kmid/kmidframe.cpp  #1.60:1.61
@@ -169,7 +169,5 @@ kmidFrame::kmidFrame(const char *name)
                 "change_font");
 
-    (void)new KAction(i18n("Configure &Keys..."), 0, this,
-                SLOT(options_KeyConfig()), actionCollection(),
-                "configure_keys");
+    KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() );
 
     (void)new KAction(i18n("MIDI &Setup..."), 0, this,
@@ -628,17 +626,7 @@ void kmidFrame::options_ChannelViewOptio
 }
 
-void kmidFrame::options_KeyConfig()
+void kmidFrame::slotConfigureKeys()
 {
-  /*    if ( KKeyDialog::configureKeys( kKeysAccel ) )
-        {
-        kKeysAccel->changeMenuAccel(m_song,0,"Play/Pause");
-        kKeysAccel->changeMenuAccel(m_song,2,"Stop");
-        kKeysAccel->changeMenuAccel(m_song,4,"Previous Song");
-        kKeysAccel->changeMenuAccel(m_song,5,"Next Song");
-        kKeysAccel->changeMenuAccel(m_options,3,"See Text events");
-        kKeysAccel->changeMenuAccel(m_options,4,"See Lyrics events");
-
-        }
-   */
+    KKeyDialog::configure( actionCollection(), this );
 }
 

--- kdemultimedia/kmid/kmidframe.h  #1.23:1.24
@@ -95,5 +95,6 @@ public slots:
     void options_ChannelViewOptions();
     void options_FontChange();
-    void options_KeyConfig();
+    void slotConfigureKeys();
+
     void options_MidiSetup();
     void spacePressed();

--- kdemultimedia/kmid/kmidui.rc  #1.4:1.5
@@ -1,4 +1,4 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kmid" version="1">
+<kpartgui name="kmid" version="2">
 <MenuBar>
   <Menu name="file"><text>&amp;File</text>
@@ -18,5 +18,5 @@
     <Action name="collect_autoadd"/>
  </Menu>
- <Menu name="options"><text>&amp;Settings</text>
+ <Menu name="settings">
     <Action name="toggle_volumebar"/>
     <Action name="toggle_channelview"/>
@@ -29,6 +29,4 @@
     <Action name="change_font"/>
     <Action name="midi_setup"/>
-    <Separator/>
-    <Action name="configure_keys"/>
  </Menu>
 </MenuBar>