gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 20:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleaner way of retrieving Images and Music paths

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39511 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Riccardo Mottola 2016-03-09 23:11:29 +00:00
parent cb076ad8ed
commit fe8bcb804b
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Source/NSWorkspace.m
View file

@ -675,8 +675,10 @@ static NSString *_rootPath = @"/";
NSArray *sysAppDir;
NSArray *downloadDir;
NSArray *desktopDir;
NSArray *imgDir;
NSArray *musicDir;
NSString *sysDir;
int i;
NSUInteger i;
if (sharedWorkspace != self)
{
@ -725,6 +727,10 @@ static NSString *_rootPath = @"/";
NSAllDomainsMask, YES);
sysAppDir = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory,
NSSystemDomainMask, YES);
imgDir = NSSearchPathForDirectoriesInDomains(NSPicturesDirectory,
NSUserDomainMask, YES);
musicDir = NSSearchPathForDirectoriesInDomains(NSMusicDirectory,
NSUserDomainMask, YES);
/* we try to guess a System directory and check if looks like one */
sysDir = nil;
@ -740,10 +746,7 @@ static NSString *_rootPath = @"/";
[folderPathIconDict setObject: @"HomeDirectory"
forKey: NSHomeDirectory()];
[folderPathIconDict setObject: @"ImageFolder"
forKey: [NSHomeDirectory () stringByAppendingPathComponent: @"Images"]];
[folderPathIconDict setObject: @"MusicFolder"
forKey: [NSHomeDirectory () stringByAppendingPathComponent: @"Music"]];
/* it would be nice to use different root icons... */
[folderPathIconDict setObject: @"Root_PC" forKey: _rootPath];
@ -767,6 +770,16 @@ static NSString *_rootPath = @"/";
[folderPathIconDict setObject: @"Desktop"
forKey: [desktopDir objectAtIndex: i]];
}
for (i = 0; i < [imgDir count]; i++)
{
[folderPathIconDict setObject: @"ImageFolder"
forKey: [imgDir objectAtIndex: i]];
}
for (i = 0; i < [musicDir count]; i++)
{
[folderPathIconDict setObject: @"MusicFolder"
forKey: [musicDir objectAtIndex: i]];
}
folderIconCache = [[NSMutableDictionary alloc] init];
return self;