[Knode-devel] KDE_3_2_BRANCH: kdepim/knode

[Lukáš Tinkl]

CVS commit by lukas: 

backport CVS commit by vkrause: 

Move configure shortcut action from the main widget to the main window.
Fixes bug #79000 (multiple configure shortcut actions in kontact).


  M +0 -13     knmainwidget.cpp   1.20.2.2
  M +0 -1      knmainwidget.h   1.10.2.1
  M +7 -0      knode.cpp   1.127.2.1
  M +1 -0      knode.h   1.52.2.1


--- kdepim/knode/knmainwidget.cpp  #1.20.2.1:1.20.2.2
@@ -22,5 +22,4 @@
 #include <kconfig.h>
 #include <kmessagebox.h>
-#include <kkeydialog.h>
 #include <kedittoolbar.h>
 #include <kstdaction.h>
@@ -663,8 +662,4 @@ void KNMainWidget::initActions()
                        SLOT(slotSettings()), actionCollection(),
                        "knode_configure_knode" );
-   (void) new KAction( i18n("Configure S&hortcuts..."),
-                       "configure_shortcuts", 0, this,
-                       SLOT(slotConfKeys()), actionCollection(),
-                       "knode_configure_shortcuts" );
 
   //collection-view - folder
@@ -2268,12 +2263,4 @@ void KNMainWidget::slotSwitchToArticleVi
 
 
-void KNMainWidget::slotConfKeys()
-{
-  //KKeyDialog::configureKeys(actionCollection(), xmlFile(), true, this);
-  KKeyDialog::configure( actionCollection(),
-                         true /*allow one-letter shortcuts*/
-    );
-}
-
 void KNMainWidget::slotSettings()
 {

--- kdepim/knode/knmainwidget.h  #1.10:1.10.2.1
@@ -397,5 +397,4 @@ protected slots:
   void slotSwitchToHeaderView();
   void slotSwitchToArticleViewer();
-  void slotConfKeys();
   void slotSettings();
 

--- kdepim/knode/knode.cpp  #1.127:1.127.2.1
@@ -46,4 +46,6 @@ KNMainWindow::KNMainWindow( QWidget* pWi
   KStdAction::configureToolbars(this, SLOT(slotConfToolbar()),
                                 actionCollection(), "knode_configure_toolbars" );
+  KStdAction::keyBindings(this, SLOT(slotConfKeys()), 
+                          actionCollection(), "knode_configure_shortcuts");
 
   m_mainWidget = new KNMainWidget( this, true, this, 0 );
@@ -83,4 +85,9 @@ void KNMainWindow::slotNewToolbarConfig(
 }
 
+void KNMainWindow::slotConfKeys()
+{
+  KKeyDialog::configure(actionCollection(), true);
+}
+
 bool KNMainWindow::queryClose()
 {

--- kdepim/knode/knode.h  #1.52:1.52.2.1
@@ -47,4 +47,5 @@ public slots:
   void slotConfToolbar();
   void slotNewToolbarConfig();
+  void slotConfKeys();
 protected:
   bool queryClose();