Ctrl+Tab setting to old behavior, and changes related to KKeyEntry's return to its previous form.

Index: Makefile.am

RCS file: /home/kde/kdebase/kcontrol/keys/Makefile.am,v
retrieving revision 1.28
diff -u -3 -d -p -r1.28 Makefile.am

• Makefile.am 2001/06/15 19:37:26 1.28

+++ Makefile.am 2001/06/19 19:01:52
@@ -15,8 +15,8 @@ messages:
data_DATA = keys.desktop
datadir = $(kde_appsdir)/Settings/LookNFeel

-app_scheme_DATA = app-kde3.kksrc app-mac3.kksrc app-unix3.kksrc app-win3.kksrc
+app_scheme_DATA = app-kde3.kksrc app-kde4.kksrc app-mac3.kksrc app-unix3.kksrc app-win3.kksrc
app_schemedir = $(kde_datadir)/kcmkeys/standard

-global_scheme_DATA = global-kde3.kksrc global-mac3.kksrc global-unix3.kksrc global-win3.kksrc global-win4.kksrc
+global_scheme_DATA = global-kde3.kksrc global-kde4.kksrc global-mac3.kksrc global-unix3.kksrc global-win3.kksrc global-win4.kksrc
global_schemedir = $(kde_datadir)/kcmkeys/global

Index: global-kde3.kksrc

RCS file: /home/kde/kdebase/kcontrol/keys/global-kde3.kksrc,v
retrieving revision 1.1
diff -u -3 -d -p -r1.1 global-kde3.kksrc

• global-kde3.kksrc 2001/06/15 19:37:26 1.1

+++ global-kde3.kksrc 2001/06/19 19:01:52
@@ -34,11 +34,11 @@ Switch to desktop 7=Ctrl+F7
Switch to desktop 8=Ctrl+F8
Switch to desktop 9=Ctrl+F9
Toggle raise and lower=none
-Walk back through desktop list=none
-Walk back through desktops=Ctrl+Shift+Tab
+Walk back through desktop list=Ctrl+Shift+Tab
+Walk back through desktops=none
Walk back through windows=Alt+Shift+Tab
-Walk through desktop list=none
-Walk through desktops=Ctrl+Tab
+Walk through desktop list=Ctrl+Tab
+Walk through desktops=none
Walk through windows=Alt+Tab
Window close=Alt+F4
Window close all=Alt+Shift+F4

Index: keyconfig.cpp

RCS file: /home/kde/kdebase/kcontrol/keys/keyconfig.cpp,v
retrieving revision 1.54
diff -u -3 -d -p -r1.54 keyconfig.cpp

• keyconfig.cpp 2001/06/15 19:37:26 1.54

+++ keyconfig.cpp 2001/06/19 19:01:54
@@ -117,9 +117,9 @@ void KKeyModule::init( bool isGlobal, bo

sFileList->append( "Not a kcsrc file" );
sList->insertItem( i18n("KDE Default for 3 Modifiers (Alt/Ctrl/Shift)"), 1 );
sFileList->append( "Not a kcsrc file" );

• sList->insertItem( i18n("KDE Default for 4 Modifiers (Meta/Alt/Ctrl/Shift)"), 2 );
• sFileList->append( "Not a kcsrc file" );
• nSysSchemes = 3;

+ sList->insertItem( i18n("KDE Default for 4 Modifiers (Meta/Alt/Ctrl/Shift)"), 2 );
+ sFileList->append( "Not a kcsrc file" );
+ nSysSchemes = 2;

readSchemeNames();
sList->setCurrentItem( 0 );
connect( sList, SIGNAL( highlighted( int ) ),

@@ -279,8 +279,8 @@ void KKeyModule::readScheme( int index )

kdDebug(125) << "readScheme( " << index << " )\n";
if( index == 1 )
  kc->allDefault( false );

• else if( index == 2 )
• kc->allDefault( true );

+ else if( index == 2 )
+ kc->allDefault( true );

else {
  KConfigBase* config;
  if( index == 0 )	config = new KConfig( "kdeglobals" );

@@ -430,7 +430,8 @@ void KKeyModule::slotPreviewScheme( int
void KKeyModule::readSchemeNames( )
{

QStringList schemes = KGlobal::dirs()->findAllResources("data", "kcmkeys/" + KeyType + "/*.kksrc");

• QRegExp r( "-kde[34].kksrc$" );

+ //QRegExp r( "-kde[34].kksrc$" );
+ QRegExp r( "-kde3.kksrc$" );

// This for system files
for ( QStringList::ConstIterator it = schemes.begin(); it != schemes.end(); it++) {

svn path=/trunk/kdebase/kcontrol/; revision=103067