Author: rmottola
Date: Thu Mar 10 00:39:52 2016
New Revision: 39513
URL: http://svn.gna.org/viewcvs/gnustep?rev=39513&view=rev
Log:
Add fall-back that if a folder image is not found, the generic folde ricon is
picked up. Also add Movies special folders
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSWorkspace.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=39513&r1=39512&r2=39513&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Thu Mar 10 00:39:52 2016
@@ -1,3 +1,8 @@
+2016-03-10 Riccardo Mottola <[email protected]>
+
+ * Source/NSWorkspace.m
+ Add fall-back that if a folder image is not found, the generic folde
ricon is picked up. Also add Movies special folders.
+
2016-03-09 Riccardo Mottola <[email protected]>
* Headers/AppKit/NSImage.h
Modified: libs/gui/trunk/Source/NSWorkspace.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSWorkspace.m?rev=39513&r1=39512&r2=39513&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSWorkspace.m (original)
+++ libs/gui/trunk/Source/NSWorkspace.m Thu Mar 10 00:39:52 2016
@@ -675,6 +675,7 @@
NSArray *desktopDir;
NSArray *imgDir;
NSArray *musicDir;
+ NSArray *videoDir;
NSString *sysDir;
NSUInteger i;
@@ -729,7 +730,9 @@
NSUserDomainMask, YES);
musicDir = NSSearchPathForDirectoriesInDomains(NSMusicDirectory,
NSUserDomainMask, YES);
-
+ videoDir = NSSearchPathForDirectoriesInDomains(NSMoviesDirectory,
+ NSUserDomainMask, YES);
+
/* we try to guess a System directory and check if looks like one */
sysDir = nil;
if ([sysAppDir count] > 0)
@@ -777,6 +780,11 @@
{
[folderPathIconDict setObject: @"MusicFolder"
forKey: [musicDir objectAtIndex: i]];
+ }
+ for (i = 0; i < [videoDir count]; i++)
+ {
+ [folderPathIconDict setObject: @"VideoFolder"
+ forKey: [videoDir objectAtIndex: i]];
}
folderIconCache = [[NSMutableDictionary alloc] init];
@@ -1457,8 +1465,14 @@
if (iconImage == nil)
{
iconImage = [NSImage _standardImageWithName: iconName];
- /* the dictionary retains the image */
- [folderIconCache setObject: iconImage forKey: iconName];
+ if (!iconImage)
+ {
+ /* no specific image found in theme, fall-back to
folder */
+ NSLog(@"no image found for %@", iconName);
+ iconImage = [NSImage _standardImageWithName:
@"Folder"];
+ }
+ /* the dictionary retains the image */
+ [folderIconCache setObject: iconImage forKey: iconName];
}
image = iconImage;
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
