Add Application folder (patch by Bertrand Dekoninck)

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@39627 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rmottola 2016-04-06 01:01:58 +00:00
parent 80cb58005a
commit 2bac439a5b
4 changed files with 15 additions and 0 deletions

View file

@ -1,3 +1,9 @@
2016-04-06 Riccardo Mottola <rm@gnu.org>
* Source/NSWorkspace.m
* Images/GNUMakefile
Add Application folder (patch by Bertrand Dekoninck)
2016-03-22 Riccardo Mottola <rm@gnu.org> 2016-03-22 Riccardo Mottola <rm@gnu.org>
* Headers/AppKit/NSWorkspace.h * Headers/AppKit/NSWorkspace.h

View file

@ -49,6 +49,7 @@ Images_RESOURCE_FILES = \
common_3DArrowRight.tiff \ common_3DArrowRight.tiff \
common_3DArrowRightH.tiff \ common_3DArrowRightH.tiff \
common_3DArrowUp.tiff \ common_3DArrowUp.tiff \
common_ApplicationFolder.tiff \
common_ArrowDown.tiff \ common_ArrowDown.tiff \
common_ArrowDownH.tiff \ common_ArrowDownH.tiff \
common_ArrowLeft.tiff \ common_ArrowLeft.tiff \

Binary file not shown.

View file

@ -671,6 +671,7 @@ static NSDictionary *urlPreferences = nil;
NSArray *documentDir; NSArray *documentDir;
NSArray *libraryDirs; NSArray *libraryDirs;
NSArray *sysAppDir; NSArray *sysAppDir;
NSArray *appDirs;
NSArray *downloadDir; NSArray *downloadDir;
NSArray *desktopDir; NSArray *desktopDir;
NSArray *imgDir; NSArray *imgDir;
@ -726,6 +727,8 @@ static NSDictionary *urlPreferences = nil;
NSAllDomainsMask, YES); NSAllDomainsMask, YES);
sysAppDir = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, sysAppDir = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory,
NSSystemDomainMask, YES); NSSystemDomainMask, YES);
appDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory,
NSAllDomainsMask, YES);
imgDir = NSSearchPathForDirectoriesInDomains(NSPicturesDirectory, imgDir = NSSearchPathForDirectoriesInDomains(NSPicturesDirectory,
NSUserDomainMask, YES); NSUserDomainMask, YES);
musicDir = NSSearchPathForDirectoriesInDomains(NSMusicDirectory, musicDir = NSSearchPathForDirectoriesInDomains(NSMusicDirectory,
@ -756,6 +759,11 @@ static NSDictionary *urlPreferences = nil;
[folderPathIconDict setObject: @"LibraryFolder" [folderPathIconDict setObject: @"LibraryFolder"
forKey: [libraryDirs objectAtIndex: i]]; forKey: [libraryDirs objectAtIndex: i]];
} }
for (i = 0; i < [appDirs count]; i++)
{
[folderPathIconDict setObject: @"ApplicationFolder"
forKey: [appDirs objectAtIndex: i]];
}
for (i = 0; i < [documentDir count]; i++) for (i = 0; i < [documentDir count]; i++)
{ {
[folderPathIconDict setObject: @"DocsFolder" [folderPathIconDict setObject: @"DocsFolder"