From 7960d9b7764e0394a12b297711ae9a76470d5137 Mon Sep 17 00:00:00 2001
From: Ellis Whitehead <kde@ellisw.net>
Date: Fri, 30 Nov 2001 08:04:17 +0000
Subject: [PATCH] - Remove obsolete slots - Add detection of shortcut
 configuration changes

svn path=/trunk/kdebase/kwin/; revision=124812
---
 workspace.cpp | 28 +++++++++++++++++++---------
 workspace.h   |  5 +++--
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index ff5fe647c7..27495417c4 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -18,7 +18,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
 #include <qdatastream.h>
 #include <qregexp.h>
 #include <qclipboard.h>
-#include <kapp.h>
+#include <kapplication.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <kiconloader.h>
@@ -420,6 +420,8 @@ void Workspace::init()
             SLOT(slotResetAllClients()));
     connect(kapp, SIGNAL(appearanceChanged()), this,
             SLOT(slotResetAllClientsDelayed()));
+    connect(kapp, SIGNAL(settingsChanged(int)), this,
+            SLOT(slotSettingsChanged(int)));
 
     connect(&focusEnsuranceTimer, SIGNAL(timeout()), this,
             SLOT(focusEnsurance()));
@@ -1080,33 +1082,30 @@ bool Workspace::keyPress(XKeyEvent key)
         return FALSE;
 
     uint keyCombQt = KKeyX11::keyEventXToKeyQt( (XEvent*)&key );
+    kdDebug() << "Workspace::keyPress( " << KKeySequence(keyCombQt).toString() << " )" << endl;
     if (d->movingClient)
     {
         d->movingClient->keyPressEvent(keyCombQt);
         return TRUE;
     }
 
-    if (!control_grab){
+    if (tab_grab){
         if( keyCombQt == walkThroughWindowsKeycode
            || keyCombQt == walkBackThroughWindowsKeycode ) {
-            if (!tab_grab)
-                return FALSE;
+	    kdDebug() << "== " << KKeySequence(walkThroughWindowsKeycode).toString()
+	    	<< " or " << KKeySequence(walkBackThroughWindowsKeycode).toString() << endl;
             KDEWalkThroughWindows( keyCombQt == walkThroughWindowsKeycode );
         }
     }
 
-    if (!tab_grab){
+    if (control_grab){
 
         if( keyCombQt == walkThroughDesktopsKeycode
            || keyCombQt == walkBackThroughDesktopsKeycode ) {
-            if (!control_grab)
-                return FALSE;
             walkThroughDesktops( keyCombQt == walkThroughDesktopsKeycode );
         }
         else if( keyCombQt == walkThroughDesktopListKeycode
            || keyCombQt == walkBackThroughDesktopListKeycode ) {
-            if (!control_grab)
-                return FALSE;
             walkThroughDesktops( keyCombQt == walkThroughDesktopListKeycode );
         }
     }
@@ -2716,6 +2715,8 @@ void Workspace::createKeybindings(){
     //keys->setItemRawModeEnabled( "Walk back through windows", TRUE  );
 }
 
+// Remove these -- ellis
+/*
 void Workspace::slotSwitchDesktop1(){
     setCurrentDesktop(1);
 }
@@ -2764,6 +2765,7 @@ void Workspace::slotSwitchDesktop15(){
 void Workspace::slotSwitchDesktop16(){
     setCurrentDesktop(16);
 }
+*/
 
 void Workspace::slotSwitchDesktopNext(){
     int d = currentDesktop() + 1;
@@ -3612,6 +3614,14 @@ void Workspace::slotResetAllClients()
     kapp->dcopClient()->emitDCOPSignal("dcopResetAllClients()", QByteArray() );
 }
 
+void Workspace::slotSettingsChanged(int category)
+{
+    kdDebug(1212) << "Workspace::slotSettingsChanged()" << endl;
+    if( category == (int) KApplication::SETTINGS_SHORTCUTS ) {
+        keys->readSettings();
+        keys->updateConnections();
+    }
+}
 
 /*
  * Legacy session management
diff --git a/workspace.h b/workspace.h
index 7af9aafaa6..1a1530d5b1 100644
--- a/workspace.h
+++ b/workspace.h
@@ -232,7 +232,7 @@ public:
 public slots:
     void refresh();
     // keybindings
-    void slotSwitchDesktop1();
+    /*void slotSwitchDesktop1(); // remove these -- ellis
     void slotSwitchDesktop2();
     void slotSwitchDesktop3();
     void slotSwitchDesktop4();
@@ -247,7 +247,7 @@ public slots:
     void slotSwitchDesktop13();
     void slotSwitchDesktop14();
     void slotSwitchDesktop15();
-    void slotSwitchDesktop16();
+    void slotSwitchDesktop16();*/
     void slotSwitchDesktopNext();
     void slotSwitchDesktopPrevious();
     void slotSwitchDesktopRight();
@@ -290,6 +290,7 @@ public slots:
 
     void slotResetAllClientsDelayed();
     void slotResetAllClients();
+    void slotSettingsChanged( int category );
 
     void slotReconfigure();