[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesdk/kbabel/catalogmanager
From:       Michael Pyne <pynm0001 () comcast ! net>
Date:       2004-05-23 2:36:59
Message-ID: 20040523023659.B33A89079 () office ! kde ! org
[Download RAW message or body]

CVS commit by mpyne: 

Remove custom key configuration dialog.  The custom slot it used will have
to wait until KDE 4.0 to be removed.  Also, there seems to be a bug with
duplicate actions in the dialog, but that occurred under both the new and
the old code.


  M +5 -3      catalogmanager.cpp   1.105
  M +1 -1      catalogmanager.h   1.38


--- kdesdk/kbabel/catalogmanager/catalogmanager.cpp  #1.104:1.105
@@ -52,5 +52,4 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kkeydialog.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
@@ -443,5 +442,5 @@ void CatalogManager::setupActions()
     // settings menu
     // FIXME: KStdAction::preferences(this, SLOT( optionsPreferences()), actionCollection());
-    KStdAction::keyBindings(this, SLOT( optionsKeys() ), actionCollection());
+    KStdAction::keyBindings(guiFactory(), SLOT ( configureShortcuts() ), actionCollection());
     KStdAction::configureToolbars(this,SLOT(optionsEditToolbars()), actionCollection() );
 
@@ -1047,5 +1046,8 @@ void CatalogManager::optionsPreferences(
 void CatalogManager::optionsKeys()
 {
-    KKeyDialog::configure(actionCollection());
+    // Remove for KDE 4.0.  KMainWindow includes a slot configureShortcuts()
+    // that serves the purpose of this function.  This function must remain
+    // for BC purposes.
+    //KKeyDialog::configure(actionCollection());
 }
 

--- kdesdk/kbabel/catalogmanager/catalogmanager.h  #1.37:1.38
@@ -93,5 +93,5 @@ public slots:
    virtual void stopSearching();
    virtual void optionsPreferences();
-   virtual void optionsKeys();
+   virtual void optionsKeys(); // BC: Remove for KDE 4.0.
    virtual void optionsEditToolbars();
    virtual void optionsShowStatusbar(bool on);


[prev in list] [next in list] [prev in thread] [next in thread]