yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Remove obsolete slots

Browse source 
- Add detection of shortcut configuration changes

svn path=/trunk/kdebase/kwin/; revision=124812
This commit is contained in:
Ellis Whitehead 2001-11-30 08:04:17 +00:00
parent 8c5a34d322
commit 7960d9b776
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
workspace.cpp
View file

@ -18,7 +18,7 @@ Copyright (C) 1999, 2000 Matthias Ettrich <ettrich@kde.org>
#include <qdatastream.h> #include <qdatastream.h>
#include <qregexp.h> #include <qregexp.h>
#include <qclipboard.h> #include <qclipboard.h>
#include <kapp.h> #include <kapplication.h>
#include <dcopclient.h> #include <dcopclient.h>
#include <kprocess.h> #include <kprocess.h>
#include <kiconloader.h> #include <kiconloader.h>
@ -420,6 +420,8 @@ void Workspace::init()
SLOT(slotResetAllClients())); SLOT(slotResetAllClients()));
connect(kapp, SIGNAL(appearanceChanged()), this, connect(kapp, SIGNAL(appearanceChanged()), this,
SLOT(slotResetAllClientsDelayed())); SLOT(slotResetAllClientsDelayed()));
connect(kapp, SIGNAL(settingsChanged(int)), this,
SLOT(slotSettingsChanged(int)));
connect(&focusEnsuranceTimer, SIGNAL(timeout()), this, connect(&focusEnsuranceTimer, SIGNAL(timeout()), this,
SLOT(focusEnsurance())); SLOT(focusEnsurance()));
@ -1080,33 +1082,30 @@ bool Workspace::keyPress(XKeyEvent key)
return FALSE; return FALSE;
uint keyCombQt = KKeyX11::keyEventXToKeyQt( (XEvent*)&key ); uint keyCombQt = KKeyX11::keyEventXToKeyQt( (XEvent*)&key );
kdDebug() << "Workspace::keyPress( " << KKeySequence(keyCombQt).toString() << " )" << endl;
if (d->movingClient) if (d->movingClient)
{ {
d->movingClient->keyPressEvent(keyCombQt); d->movingClient->keyPressEvent(keyCombQt);
return TRUE; return TRUE;
} }
if (!control_grab){ if (tab_grab){
if( keyCombQt == walkThroughWindowsKeycode if( keyCombQt == walkThroughWindowsKeycode
|| keyCombQt == walkBackThroughWindowsKeycode ) { || keyCombQt == walkBackThroughWindowsKeycode ) {
if (!tab_grab) kdDebug() << "== " << KKeySequence(walkThroughWindowsKeycode).toString()
return FALSE; << " or " << KKeySequence(walkBackThroughWindowsKeycode).toString() << endl;
KDEWalkThroughWindows( keyCombQt == walkThroughWindowsKeycode ); KDEWalkThroughWindows( keyCombQt == walkThroughWindowsKeycode );
} }
} }
if (!tab_grab){ if (control_grab){
if( keyCombQt == walkThroughDesktopsKeycode if( keyCombQt == walkThroughDesktopsKeycode
|| keyCombQt == walkBackThroughDesktopsKeycode ) { || keyCombQt == walkBackThroughDesktopsKeycode ) {
if (!control_grab)
return FALSE;
walkThroughDesktops( keyCombQt == walkThroughDesktopsKeycode ); walkThroughDesktops( keyCombQt == walkThroughDesktopsKeycode );
} }
else if( keyCombQt == walkThroughDesktopListKeycode else if( keyCombQt == walkThroughDesktopListKeycode
|| keyCombQt == walkBackThroughDesktopListKeycode ) { || keyCombQt == walkBackThroughDesktopListKeycode ) {
if (!control_grab)
return FALSE;
walkThroughDesktops( keyCombQt == walkThroughDesktopListKeycode ); walkThroughDesktops( keyCombQt == walkThroughDesktopListKeycode );
} }
} }
@ -2716,6 +2715,8 @@ void Workspace::createKeybindings(){
//keys->setItemRawModeEnabled( "Walk back through windows", TRUE ); //keys->setItemRawModeEnabled( "Walk back through windows", TRUE );
} }
// Remove these -- ellis
/*
void Workspace::slotSwitchDesktop1(){ void Workspace::slotSwitchDesktop1(){
setCurrentDesktop(1); setCurrentDesktop(1);
} }
@ -2764,6 +2765,7 @@ void Workspace::slotSwitchDesktop15(){
void Workspace::slotSwitchDesktop16(){ void Workspace::slotSwitchDesktop16(){
setCurrentDesktop(16); setCurrentDesktop(16);
} }
*/
void Workspace::slotSwitchDesktopNext(){ void Workspace::slotSwitchDesktopNext(){
int d = currentDesktop() + 1; int d = currentDesktop() + 1;
@ -3612,6 +3614,14 @@ void Workspace::slotResetAllClients()
kapp->dcopClient()->emitDCOPSignal("dcopResetAllClients()", QByteArray() ); 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 * Legacy session management

5
workspace.h
View file

@ -232,7 +232,7 @@ public:
public slots: public slots:
void refresh(); void refresh();
// keybindings // keybindings
void slotSwitchDesktop1(); /*void slotSwitchDesktop1(); // remove these -- ellis
void slotSwitchDesktop2(); void slotSwitchDesktop2();
void slotSwitchDesktop3(); void slotSwitchDesktop3();
void slotSwitchDesktop4(); void slotSwitchDesktop4();
@ -247,7 +247,7 @@ public slots:
void slotSwitchDesktop13(); void slotSwitchDesktop13();
void slotSwitchDesktop14(); void slotSwitchDesktop14();
void slotSwitchDesktop15(); void slotSwitchDesktop15();
void slotSwitchDesktop16(); void slotSwitchDesktop16();*/
void slotSwitchDesktopNext(); void slotSwitchDesktopNext();
void slotSwitchDesktopPrevious(); void slotSwitchDesktopPrevious();
void slotSwitchDesktopRight(); void slotSwitchDesktopRight();
@ -290,6 +290,7 @@ public slots:
void slotResetAllClientsDelayed(); void slotResetAllClientsDelayed();
void slotResetAllClients(); void slotResetAllClients();
void slotSettingsChanged( int category );
void slotReconfigure(); void slotReconfigure();