gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-30 13:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update for file system layout changes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@16596 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2003-05-01 18:06:11 +00:00
parent bbe694fe43
commit 7ae187e7b4
2 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/NSInputManager.m
View file

@ -314,22 +314,24 @@ static NSInputManager *currentInputManager = nil;
{
NSArray *paths;
NSEnumerator *enumerator;
NSString *bundlePath;
paths = NSSearchPathForDirectoriesInDomains (GSLibrariesDirectory,
NSString *libraryPath;
NSFileManager *fileManager = [NSFileManager defaultManager];
paths = NSSearchPathForDirectoriesInDomains (NSLibraryDirectory,
NSAllDomainsMask, YES);
/* paths are in the order - user, network, local, root. Instead we
want to load keybindings in the order root, local, network, user
- so that user can override root - for this reason we use a
reverseObjectEnumerator. */
enumerator = [paths reverseObjectEnumerator];
while ((bundlePath = [enumerator nextObject]) != nil)
while ((libraryPath = [enumerator nextObject]) != nil)
{
NSBundle *bundle = [NSBundle bundleWithPath: bundlePath];
NSString *fullPath = [bundle pathForResource: fileName
ofType: @"dict"
inDirectory: @"KeyBindings"];
if (fullPath != nil)
NSString *fullPath;
fullPath =
[[[libraryPath stringByAppendingPathComponent: @"KeyBindings"]
stringByAppendingPathComponent: fileName]
stringByAppendingPathExtension: @"dict"];
if ([fileManager fileExistsAtPath: fullPath])
{
[self loadBindingsFromFile: fullPath];
}
@ -391,11 +393,11 @@ static NSInputManager *currentInputManager = nil;
/* Normally, when we start up, we load all the keybindings we find
in the following files, in this order:
$GNUSTEP_SYSTEM_ROOT/Libraries/Resources/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_LOCAL_ROOT/Libraries/Resources/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_NETWORK_ROOT/Libraries/Resources/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_USER_ROOT/Libraries/Resources/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_SYSTEM_ROOT/Library/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_LOCAL_ROOT/Library/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_NETWORK_ROOT/Library/KeyBindings/DefaultKeyBindings.dict
$GNUSTEP_USER_ROOT/Library/KeyBindings/DefaultKeyBindings.dict
This gives you a first way of adding your customized keybindings
- adding a DefaultKeyBindings.dict to your GNUSTEP_USER_ROOT, and