Bug 67935

Summary:	Kontact "Settings" menu has duplicate "Configure shortcut..." items
Product:	[Applications] kontact	Reporter:	klee
Component:	general	Assignee:	kdepim bugs <kdepim-bugs>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	NOR
Version:	unspecified
Target Milestone:	---
Platform:	unspecified
OS:	Linux
Latest Commit:		Version Fixed In:

Description klee 2003-11-11 22:48:19 UTC

Version:           1.5.93 (using KDE 3.1.93 (CVS >= 20031028), yes)
Compiler:          gcc version 3.2
OS:          Linux (i686) release 2.4.21-1up.1

Kontact's "Settings" menu has two instances of the "Configure shortcuts..." menu item when I'm in the KMail module.  This problem does not occur with other Kontact modules.

I'm running kdepim CVS of yesterday (11 Nov 2003).

Comment 1 Cornelius Schumacher 2003-11-16 11:20:17 UTC

When running as KPart KMainWidget shouldn't create the KAction for "Configure Shortcuts" or it has to use a different XMLGUI file when running as a KPart.

Comment 2 Tobias Koenig 2003-11-23 22:09:58 UTC

Subject: kdepim/kmail

CVS commit by tokoe: 

Use only one 'Configure Shortcuts...' action when embedded in Kontact.
That fixes #67935.

CCMAIL:67935-done@bugs.kde.org


  M +0 -6      kmmainwidget.cpp   1.119
  M +3 -0      kmmainwin.cpp   1.575
  M +1 -1      kmmainwin.rc   1.64


--- kdepim/kmail/kmmainwidget.cpp  #1.118:1.119
@@ -2597,10 +2597,4 @@ void KMMainWidget::setupActions()
 
   // ----- Standard Actions
-//  KStdAction::keyBindings(this, SLOT(slotEditKeys()), actionCollection());
-  (void) new KAction( i18n("Configure S&hortcuts..."),
-                      "configure_shortcuts", 0, this,
-                      SLOT(slotEditKeys()), actionCollection(),
-                      "kmail_configure_shortcuts" );
-
 //  KStdAction::configureNotifications(this, SLOT(slotEditNotifications()), actionCollection());
   (void) new KAction( i18n("Configure &Notifications..."),

--- kdepim/kmail/kmmainwin.cpp  #1.574:1.575
@@ -30,4 +30,7 @@ KMMainWin::KMMainWin(QWidget *)
                                 actionCollection(), "kmail_configure_toolbars" );
 
+  KStdAction::keyBindings(mKMMainWidget, SLOT(slotEditKeys()),
+                          actionCollection());
+
 #if !KDE_IS_VERSION( 3, 1, 90 )
   mToolbarAction = KStdAction::showToolbar(this,

--- kdepim/kmail/kmmainwin.rc  #1.63:1.64
@@ -123,5 +123,5 @@
    <Action name="popFilter" append="save_merge"/>
    <Separator/>
-   <Action name="kmail_configure_shortcuts" />
+   <Action name="options_configure_keybinding"/>
    <Action name="kmail_configure_notifications" />
    <Action name="kmail_configure_toolbars" />