Index: trunk/kdebase/kcontrol/keys/app-kde4.kksrc =================================================================== --- trunk/kdebase/kcontrol/keys/app-kde4.kksrc (nonexistent) +++ trunk/kdebase/kcontrol/keys/app-kde4.kksrc (revision 103067) @@ -0,0 +1,43 @@ +[Standard Key Scheme ] +SchemeName=KDE Default for 4 Modifiers (Alt/Ctrl/Shift) +AddBookmark=Ctrl+B +Back=Alt+Left +Close=Ctrl+Escape +Copy=Ctrl+C +Cut=Ctrl+X +DeleteWordBack=Ctrl+Backspace +DeleteWordForward=Ctrl+Delete +End=Ctrl+End +Find=Ctrl+F +FindNext=F3 +FindPrev=Shift+F3 +Forward=Alt+Right +GotoLine=Ctrl+G +Help=F1 +Home=Ctrl+Home +Insert=Ctrl+Insert +New=Ctrl+N +Next=Next +NextCompletion=Ctrl+Down +Open=Ctrl+O +Paste=Ctrl+V +PopupMenuContext=Menu +PrevCompletion=Ctrl+Up +Print=Ctrl+P +Prior=Prior +Quit=Ctrl+Q +Redo=Ctrl+Shift+Z +Reload=F5 +Replace=Ctrl+R +RotateDown=Down +RotateUp=Up +Save=Ctrl+S +SelectAll=Ctrl+A +ShowMenubar=Ctrl+M +TextCompletion=Ctrl+E +Undo=Ctrl+Z +Up=Alt+Up +WhatThis=Shift+F1 +ZoomIn=Ctrl+Plus +ZoomOut=Ctrl+Minus + Property changes on: trunk/kdebase/kcontrol/keys/app-kde4.kksrc ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Index: trunk/kdebase/kcontrol/keys/keyconfig.cpp =================================================================== --- trunk/kdebase/kcontrol/keys/keyconfig.cpp (revision 103066) +++ trunk/kdebase/kcontrol/keys/keyconfig.cpp (revision 103067) @@ -1,544 +1,545 @@ // // KDE Shortcut config module // // Copyright (c) Mark Donohoe 1998 // Copyright (c) Matthias Ettrich 1998 // Converted to generic key configuration module, Duncan Haldane 1998. // Layout fixes copyright (c) 2000 Preston Brown #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include // Used in KKeyModule::init() #include "keyconfig.h" #include "keyconfig.moc" //---------------------------------------------------------------------------- KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, bool bSeriesOnly, bool bSeriesNone, const char *name ) : KCModule( parent, name ) { init( isGlobal, bSeriesOnly, bSeriesNone ); } KKeyModule::KKeyModule( QWidget *parent, bool isGlobal, const char *name ) : KCModule( parent, name ) { init( isGlobal, false, false ); } void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone ) { QString wtstr; KeyType = isGlobal ? "global" : "standard"; keys = new KAccel( this ); bSeriesOnly = _bSeriesOnly; if ( KeyType == "global" ) { // see also KKeyModule::init() below !!! #define WITH_LABELS #include "../../kwin/kwinbindings.cpp" #include "../../kicker/core/kickerbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" #include "../../klipper/klipperbindings.cpp" #include "../../kxkb/kxkbbindings.cpp" #undef WITH_LABELS KeyScheme = "Global Key Scheme " ; KeySet = "Global Keys" ; // Sorting Hack: I'll re-write the module once feature-adding begins again. if( bSeriesOnly || bSeriesNone ) { KKeyMapOrder *pMapOrder = &keys->keyInsertOrder(); int j = 0; for( int i = 0; i < (int)pMapOrder->count(); i++ ) { QString sConfigKey = (*pMapOrder)[i]; kdDebug(125) << "sConfigKey: " << sConfigKey << endl; int iLastSpace = sConfigKey.findRev( ' ' ); bool bIsNum = false; if( iLastSpace >= 0 ) sConfigKey.mid( iLastSpace+1 ).toInt( &bIsNum ); if( (bSeriesOnly && bIsNum) || (bSeriesNone && !bIsNum) || sConfigKey.contains( ':' ) ) mapOrder[j++] = sConfigKey; } } } if ( KeyType == "standard" ) { for(uint i=0; iinsertItem( KStdAccel::description(id), KStdAccel::action(id), KStdAccel::defaultKey3(id), KStdAccel::defaultKey4(id), true ); } KeyScheme = "Standard Key Scheme " ; KeySet = "Keys" ; } keys->setConfigGlobal( true ); keys->setConfigGroup( KeySet ); keys->readSettings(); sFileList = new QStringList(); sList = new QListBox( this ); sList->clear(); sFileList->clear(); sList->insertItem( i18n("Current Scheme"), 0 ); 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 ) ), SLOT( slotPreviewScheme( int ) ) ); QLabel *label = new QLabel( sList, i18n("&Key Scheme"), this ); wtstr = i18n("Here you can see a list of the existing key binding schemes with 'Current scheme'" " referring to the settings you are using right now. Select a scheme to use, remove or" " change it."); QWhatsThis::add( label, wtstr ); QWhatsThis::add( sList, wtstr ); addBt = new QPushButton( i18n("&Save Scheme..."), this ); connect( addBt, SIGNAL( clicked() ), SLOT( slotAdd() ) ); QWhatsThis::add(addBt, i18n("Click here to add a new key bindings scheme. You will be prompted for a name.")); removeBt = new QPushButton( i18n("&Remove Scheme"), this ); removeBt->setEnabled(FALSE); connect( removeBt, SIGNAL( clicked() ), SLOT( slotRemove() ) ); QWhatsThis::add( removeBt, i18n("Click here to remove the selected key bindings scheme. You can not" " remove the standard system wide schemes, 'Current scheme' and 'KDE default'.") ); // Hack to get this setting only displayed once. It belongs in main.cpp instead. // That move will take a lot of UI redesigning, though, so i'll do it once CVS // opens up for feature commits again. -- ellis // If this is the "Global Keys" section of the KDE Control Center: if( isGlobal && !bSeriesOnly ) { preferMetaBt = new QCheckBox( i18n("Prefer 4-Modifier Defaults"), this ); if( !KAccel::keyboardHasMetaKey() ) preferMetaBt->setEnabled( false ); preferMetaBt->setChecked( KAccel::useFourModifierKeys() ); connect( preferMetaBt, SIGNAL(clicked()), SLOT(slotPreferMeta()) ); QWhatsThis::add( preferMetaBt, i18n("If your keyboard has a Meta key, but you would " "like KDE to prefer the 3-modifier configuration defaults, then this option " "should be unchecked.") ); } else preferMetaBt = 0; KSeparator* line = new KSeparator( KSeparator::HLine, this ); dict = keys->keyDict(); if ( KeyType == "global" ) kc = new KeyChooserSpec( &dict, mapOrder.count() ? &mapOrder : &keys->keyInsertOrder(), this, isGlobal ); else kc = new KeyChooserSpec( &dict, this, isGlobal ); connect( kc, SIGNAL( keyChange() ), this, SLOT( slotChanged() ) ); readScheme(); QGridLayout *topLayout = new QGridLayout( this, 6, 2, KDialog::marginHint(), KDialog::spacingHint()); topLayout->addWidget(label, 0, 0); topLayout->addMultiCellWidget(sList, 1, 2, 0, 0); topLayout->addWidget(addBt, 1, 1); topLayout->addWidget(removeBt, 2, 1); if( preferMetaBt ) topLayout->addWidget(preferMetaBt, 3, 0); topLayout->addMultiCellWidget(line, 4, 4, 0, 1); topLayout->addRowSpacing(3, 15); topLayout->addMultiCellWidget(kc, 5, 5, 0, 1); setMinimumSize(topLayout->sizeHint()); } KKeyModule::~KKeyModule (){ //kdDebug() << "KKeyModule destructor" << endl; delete keys; } void KKeyModule::load() { for (KKeyEntryMap::Iterator it = dict.begin(); it != dict.end(); ++it) { (*it).aConfigKeyCode = (*it).aCurrentKeyCode; } kc->listSync(); } void KKeyModule::save() { if( preferMetaBt ) KAccel::useFourModifierKeys( preferMetaBt->isChecked() ); keys->setKeyDict( dict ); keys->writeSettings(); if ( KeyType == "global" ) { if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); kapp->dcopClient()->send("kwin", "", "reconfigure()", ""); kapp->dcopClient()->send("kdesktop", "", "configure()", ""); kapp->dcopClient()->send("kicker", "Panel", "configure()", ""); } } void KKeyModule::defaults() { if( preferMetaBt ) preferMetaBt->setChecked( false ); KAccel::useFourModifierKeys( false ); kc->allDefault(); } void KKeyModule::slotRemove() { QString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/" + KeyType); QDir d( kksPath ); if (!d.exists()) // what can we do? return; d.setFilter( QDir::Files ); d.setSorting( QDir::Name ); d.setNameFilter("*.kksrc"); uint ind = sList->currentItem(); if ( !d.remove( *sFileList->at( ind ) ) ) { KMessageBox::sorry( 0, i18n("This key scheme could not be removed.\n" "Perhaps you do not have permission to alter the file\n" "system where the key scheme is stored." )); return; } sList->removeItem( ind ); sFileList->remove( sFileList->at(ind) ); } void KKeyModule::slotChanged( ) { emit changed(true); emit keysChanged( &dict ); } void KKeyModule::slotSave( ) { KSimpleConfig config(*sFileList->at( sList->currentItem() ) ); // If this is a series only scheme, then let 'global=true' in // the writeKeyMap(). This is necessary in order to // let both 'Global Shortcuts' and 'Shortcut Sequences' be // written to the same scheme file, because 'Global Shortcuts' in // written first. KAccel::writeKeyMap( dict, KeyScheme, &config, bSeriesOnly ); } void KKeyModule::slotPreferMeta() { kc->setPreferFourModifierKeys( preferMetaBt->isChecked() ); } 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" ); else config = new KSimpleConfig( *sFileList->at( index ), true ); KAccel::readKeyMap( dict, index == 0 ? KeySet : KeyScheme, config ); kc->listSync(); delete config; } } void KKeyModule::slotAdd() { QString sName; if ( sList->currentItem() >= nSysSchemes ) sName = sList->currentText(); SaveScm ss( 0, "save scheme", sName ); bool nameValid; QString sFile; int exists = -1; do { nameValid = TRUE; if ( ss.exec() ) { sName = ss.nameLine->text(); if ( sName.stripWhiteSpace().isEmpty() ) return; sName = sName.simplifyWhiteSpace(); sFile = sName; int ind = 0; while ( ind < (int) sFile.length() ) { // parse the string for first white space ind = sFile.find(" "); if (ind == -1) { ind = sFile.length(); break; } // remove from string sFile.remove( ind, 1); // Make the next letter upper case QString s = sFile.mid( ind, 1 ); s = s.upper(); sFile.replace( ind, 1, s ); } exists = -1; for ( int i = 0; i < (int) sList->count(); i++ ) { if ( sName.lower() == (sList->text(i)).lower() ) { exists = i; int result = KMessageBox::warningContinueCancel( 0, i18n("A key scheme with the name '%1' already exists.\n" "Do you want to overwrite it?\n").arg(sName), i18n("Save key scheme"), i18n("Overwrite")); if (result == KMessageBox::Continue) nameValid = true; else nameValid = false; } } } else return; } while ( nameValid == FALSE ); disconnect( sList, SIGNAL( highlighted( int ) ), this, SLOT( slotPreviewScheme( int ) ) ); QString kksPath = KGlobal::dirs()->saveLocation("data", "kcmkeys/"); QDir d( kksPath ); if ( !d.exists() ) if ( !d.mkdir( kksPath ) ) { qWarning("KKeyModule: Could not make directory to store user info."); return; } kksPath += KeyType ; kksPath += "/"; d.setPath( kksPath ); if ( !d.exists() ) if ( !d.mkdir( kksPath ) ) { qWarning("KKeyModule: Could not make directory to store user info."); return; } sFile.prepend( kksPath ); sFile += ".kksrc"; if (exists == -1) { sList->insertItem( sName ); sList->setFocus(); sList->setCurrentItem( sList->count()-1 ); sFileList->append( sFile ); } else { sList->setFocus(); sList->setCurrentItem( exists ); } KSimpleConfig *config = new KSimpleConfig( sFile ); config->setGroup( KeyScheme ); config->writeEntry( "SchemeName", sName ); delete config; slotSave(); connect( sList, SIGNAL( highlighted( int ) ), this, SLOT( slotPreviewScheme( int ) ) ); slotPreviewScheme( sList->currentItem() ); } void KKeyModule::slotPreviewScheme( int indx ) { readScheme( indx ); // Set various appropriate for the scheme if ( indx < nSysSchemes || (*sFileList->at(indx)).contains( "/global-" ) || (*sFileList->at(indx)).contains( "/app-" ) ) { removeBt->setEnabled( FALSE ); } else { removeBt->setEnabled( TRUE ); } } 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++) { // KPersonalizer relies on .kksrc files containing all the keyboard shortcut // schemes for various setups. It also requires the KDE defaults to be in // a .kksrc file. The KDE defaults shouldn't be listed here. if( r.match( *it ) != -1 ) continue; KSimpleConfig config( *it, true ); config.setGroup( KeyScheme ); QString str = config.readEntry( "SchemeName" ); sList->insertItem( str ); sFileList->append( *it ); } } void KKeyModule::updateKeys( const KKeyEntryMap* map_P ) { kc->updateKeys( map_P ); } // write all the global keys to kdeglobals // this is needed to be able to check for conflicts with global keys in app's keyconfig // dialogs, kdeglobals is empty as long as you don't apply any change in controlcenter/keys void KKeyModule::init() { kdDebug(125) << "KKeyModule::init()\n"; { KSimpleConfig cfg( "kdeglobals" ); cfg.deleteGroup( "Global Keys" ); } /*kdDebug(125) << "KKeyModule::init() - Initialize # Modifier Keys Settings\n"; KConfigGroupSaver cgs( KGlobal::config(), "Keyboard" ); QString fourMods = KGlobal::config()->readEntry( "Use Four Modifier Keys", KAccel::keyboardHasMetaKey() ? "true" : "false" ); KAccel::useFourModifierKeys( fourMods == "true" ); bool bUseFourModifierKeys = KAccel::useFourModifierKeys(); KGlobal::config()->writeEntry( "User Four Modifier Keys", bUseFourModifierKeys ? "true" : "false", true, true ); */ QWidget workaround; KAccel* keys = new KAccel( &workaround ); kdDebug(125) << "KKeyModule::init() - Load Included Bindings\n"; // this should match the included files above #include "../../klipper/klipperbindings.cpp" #include "../../kwin/kwinbindings.cpp" #include "../../kicker/core/kickerbindings.cpp" #include "../../kdesktop/kdesktopbindings.cpp" #include "../../kxkb/kxkbbindings.cpp" kdDebug(125) << "KKeyModule::init() - Read Modifier Mapping\n"; KAccel::readModifierMapping(); kdDebug(125) << "KKeyModule::init() - Read Config Bindings\n"; keys->setConfigGlobal( true ); keys->setConfigGroup( "Global Keys" ); keys->readSettings(); kdDebug(125) << "KKeyModule::init() - Write Config Bindings\n"; keys->writeSettings(); } //----------------------------------------------------------------- // KeyChooserSpec //----------------------------------------------------------------- KeyChooserSpec::KeyChooserSpec( KKeyEntryMap *aKeyDict, KKeyMapOrder *pKeyOrder, QWidget* parent, bool global_P ) : KKeyChooser( aKeyDict, pKeyOrder, parent, global_P, false, true ), global( global_P ) { if( global ) globalDict()->clear(); // don't check against global keys twice } KeyChooserSpec::KeyChooserSpec( KKeyEntryMap *aKeyDict, QWidget* parent, bool global_P ) : KKeyChooser( aKeyDict, parent, global_P, false, true ), global( global_P ) { if( global ) globalDict()->clear(); // don't check against global keys twice } void KeyChooserSpec::updateKeys( const KKeyEntryMap* map_P ) { if( global ) { stdDict()->clear(); for( KKeyEntryMap::ConstIterator gIt( map_P->begin()); gIt != map_P->end(); ++gIt ) { int* keyCode = new int; *keyCode = ( *gIt ).aConfigKeyCode; stdDict()->insert( gIt.key(), keyCode); } } else { globalDict()->clear(); for( KKeyEntryMap::ConstIterator gIt( map_P->begin()); gIt != map_P->end(); ++gIt ) { int* keyCode = new int; *keyCode = ( *gIt ).aConfigKeyCode; globalDict()->insert( gIt.key(), keyCode); } } } Index: trunk/kdebase/kcontrol/keys/global-kde3.kksrc =================================================================== --- trunk/kdebase/kcontrol/keys/global-kde3.kksrc (revision 103066) +++ trunk/kdebase/kcontrol/keys/global-kde3.kksrc (revision 103067) @@ -1,75 +1,75 @@ [Global Key Scheme ] SchemeName=KDE Default for 3 Modifiers (Alt/Ctrl/Shift) Execute command=Alt+F2 Kill Window=Alt+Ctrl+Escape Lock screen=Alt+Ctrl+L Logout=Alt+Ctrl+Delete Logout without Confirmation=Alt+Ctrl+Shift+Delete Mouse emulation=Alt+F12 Next keyboard layout=Alt+Ctrl+K Pop-up window operations menu=Alt+F3 Popup Launch Menu=Alt+F1 Show taskmanager=Ctrl+Escape Show window list=Alt+F5 Switch desktop down=none Switch desktop left=none Switch desktop next=none Switch desktop previous=none Switch desktop right=none Switch desktop up=none Switch to desktop 1=Ctrl+F1 Switch to desktop 10=Ctrl+F10 Switch to desktop 11=Ctrl+F11 Switch to desktop 12=Ctrl+F12 Switch to desktop 13=Ctrl+Shift+F1 Switch to desktop 14=Ctrl+Shift+F2 Switch to desktop 15=Ctrl+Shift+F3 Switch to desktop 16=Ctrl+Shift+F4 Switch to desktop 2=Ctrl+F2 Switch to desktop 3=Ctrl+F3 Switch to desktop 4=Ctrl+F4 Switch to desktop 5=Ctrl+F5 Switch to desktop 6=Ctrl+F6 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 Window iconify=none Window iconify all=none Window lower=none Window maximize=none Window maximize horizontal=none Window maximize vertical=none Window move=none Window raise=none Window resize=none Window shade=none Window to Desktop 1=none Window to Desktop 10=none Window to Desktop 11=none Window to Desktop 12=none Window to Desktop 13=none Window to Desktop 14=none Window to Desktop 15=none Window to Desktop 16=none Window to Desktop 2=none Window to Desktop 3=none Window to Desktop 4=none Window to Desktop 5=none Window to Desktop 6=none Window to Desktop 7=none Window to Desktop 8=none Window to Desktop 9=none Window to next desktop=none Window to previous desktop=none repeat-last-klipper-action=Alt+Ctrl+R show-klipper-popupmenu=Alt+Ctrl+V toggle-clipboard-actions=Alt+Ctrl+X Index: trunk/kdebase/kcontrol/keys/global-kde4.kksrc =================================================================== --- trunk/kdebase/kcontrol/keys/global-kde4.kksrc (nonexistent) +++ trunk/kdebase/kcontrol/keys/global-kde4.kksrc (revision 103067) @@ -0,0 +1,75 @@ +[Global Key Scheme ] +SchemeName=KDE Default for 4 Modifiers (Meta/Alt/Ctrl/Shift) +Execute command=Meta+Return +Kill Window=Meta+Ctrl+Delete +Lock screen=Meta+ScrollLock +Logout=Meta+Escape +Logout without Confirmation=Meta+Ctrl+Escape +Mouse emulation=none +Next keyboard layout=Meta+Ctrl+K +Pop-up window operations menu=Alt+Space +Popup Launch Menu=Meta+Space +Show taskmanager=Meta+Backspace +Show window list=Meta+0 +Switch desktop down=none +Switch desktop left=none +Switch desktop next=none +Switch desktop previous=none +Switch desktop right=none +Switch desktop up=none +Switch to desktop 1=Meta+F1 +Switch to desktop 10=Meta+F10 +Switch to desktop 11=none +Switch to desktop 12=none +Switch to desktop 13=none +Switch to desktop 14=none +Switch to desktop 15=none +Switch to desktop 16=none +Switch to desktop 2=Meta+F2 +Switch to desktop 3=Meta+F3 +Switch to desktop 4=Meta+F4 +Switch to desktop 5=Meta+F5 +Switch to desktop 6=Meta+F6 +Switch to desktop 7=Meta+F7 +Switch to desktop 8=Meta+F8 +Switch to desktop 9=Meta+F9 +Toggle raise and lower=none +Walk back through desktop list=none +Walk back through desktops=Meta+Shift+Tab +Walk back through windows=Alt+Shift+Tab +Walk through desktop list=none +Walk through desktops=Meta+Tab +Walk through windows=Alt+Tab +Window close=Alt+Escape +Window close all=Alt+Shift+Escape +Window iconify=Meta+Minus +Window iconify all=Meta+Ctrl+Minus +Window lower=none +Window maximize=Meta+Plus +Window maximize horizontal=Meta+Equal +Window maximize vertical=Meta+Bar +Window move=none +Window raise=none +Window resize=none +Window shade=Meta+Underscore +Window to Desktop 1=Meta+Alt+F1 +Window to Desktop 10=Meta+Alt+F10 +Window to Desktop 11=none +Window to Desktop 12=none +Window to Desktop 13=none +Window to Desktop 14=none +Window to Desktop 15=none +Window to Desktop 16=none +Window to Desktop 2=Meta+Alt+F2 +Window to Desktop 3=Meta+Alt+F3 +Window to Desktop 4=Meta+Alt+F4 +Window to Desktop 5=Meta+Alt+F5 +Window to Desktop 6=Meta+Alt+F6 +Window to Desktop 7=Meta+Alt+F7 +Window to Desktop 8=Meta+Alt+F8 +Window to Desktop 9=Meta+Alt+F9 +Window to next desktop=none +Window to previous desktop=none +repeat-last-klipper-action=Meta+Ctrl+R +show-klipper-popupmenu=Meta+Ctrl+V +toggle-clipboard-actions=Meta+Ctrl+X Property changes on: trunk/kdebase/kcontrol/keys/global-kde4.kksrc ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Index: trunk/kdebase/kcontrol/keys/Makefile.am =================================================================== --- trunk/kdebase/kcontrol/keys/Makefile.am (revision 103066) +++ trunk/kdebase/kcontrol/keys/Makefile.am (revision 103067) @@ -1,22 +1,22 @@ kde_module_LTLIBRARIES = libkcm_keys.la libkcm_keys_la_SOURCES = keyconfig.cpp savescm.cpp main.cpp libkcm_keys_la_LIBADD = -lkdeui libkcm_keys_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined INCLUDES= $(all_includes) libkcm_keys_la_METASOURCES = AUTO messages: customkeys=`grep "^.include .\.\." keyconfig.cpp | sed -e "s#.*\"\(.*\)\"#\1#"` ;\ $(XGETTEXT) $(libkcm_keys_la_SOURCES) $$customkeys -o $(podir)/kcmkeys.pot 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