Author: rmottola
Date: Thu Mar 10 00:11:29 2016
New Revision: 39511
URL: http://svn.gna.org/viewcvs/gnustep?rev=39511&view=rev
Log:
cleaner way of retrieving Images and Music paths
Modified:
libs/gui/trunk/Source/NSWorkspace.m
Modified: libs/gui/trunk/Source/NSWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSWorkspace.m?rev=39511&r1=39510&r2=39511&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSWorkspace.m (original)
+++ libs/gui/trunk/Source/NSWorkspace.m Thu Mar 10 00:11:29 2016
@@ -675,8 +675,10 @@
NSArray *sysAppDir;
NSArray *downloadDir;
NSArray *desktopDir;
+ NSArray *imgDir;
+ NSArray *musicDir;
NSString *sysDir;
- int i;
+ NSUInteger i;
if (sharedWorkspace != self)
{
@@ -725,6 +727,10 @@
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 @@
[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];
@@ -766,6 +769,16 @@
{
[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];
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
