gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-05-31 21:00:47 +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

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-05-01 20:02 Alexander Malmberg <alexander@malmberg.org>
* Source/NSInputManager.m (-loadBindingsWithName:): Update for file
system layout changes.
* Source/NSTextView.m (-drawRect:): Draw the background correctly.
2003-04-30 Richard Frith-Macdonald <rfm@gnu.org> 2003-04-30 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSScrollView.m: ([scrollWheel:]) enable horizontal scrolling * Source/NSScrollView.m: ([scrollWheel:]) enable horizontal scrolling

30
Source/NSInputManager.m
View file

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