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

List:       kde-commits
Subject:    kdebase/ksysguard/gui
From:       Benjamin Meyer <benjamin () csh ! rit ! edu>
Date:       2004-05-23 1:51:45
Message-ID: 20040523015145.A46A19192 () office ! kde ! org
[Download RAW message or body]

CVS commit by bmeyer: 

remove custom key configure dialog


  M +2 -10     ksysguard.cc   1.78
  M +0 -2      ksysguard.h   1.25


--- kdebase/ksysguard/gui/ksysguard.cc  #1.77:1.78
@@ -52,5 +52,4 @@
 #include <kwin.h>
 #include <kwinmodule.h>
-#include <kkeydialog.h>
 
 #include "../version.h"
@@ -128,5 +127,6 @@ TopLevel::TopLevel( const char *name )
 
   KStdAction::configureToolbars( this, SLOT( editToolbars() ), actionCollection() );
-  KStdAction::keyBindings( this, SLOT( slotConfigureKeys() ), actionCollection() );
+  KStdAction::keyBindings(guiFactory(), SLOT(configureShortcuts()), 
+actionCollection());
 
   new KAction( i18n( "Configure &Style..." ), "colorize", 0, this,
@@ -138,12 +138,4 @@ TopLevel::TopLevel( const char *name )
 }
 
-TopLevel::~TopLevel()
-{
-}
-
-void TopLevel::slotConfigureKeys()
-{
-  KKeyDialog::configure( actionCollection(), this );
-}
 
 /*

--- kdebase/ksysguard/gui/ksysguard.h  #1.24:1.25
@@ -48,5 +48,4 @@ class TopLevel : public KMainWindow, pub
   public:
     TopLevel( const char *name = 0 );
-    ~TopLevel();
 
   virtual void saveProperties( KConfig* );
@@ -86,5 +85,4 @@ class TopLevel : public KMainWindow, pub
     void editStyle();
     void slotNewToolbarConfig();
-    void slotConfigureKeys();
 
   private:


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