Author: rmottola
Date: Thu Nov 19 00:13:39 2015
New Revision: 39184

URL: http://svn.gna.org/viewcvs/gnustep?rev=39184&view=rev
Log:
Use constants for common images from GNUstep, do not provide those icons.

Removed:
    apps/gworkspace/trunk/FSNode/Resources/Images/MultipleSelection.tiff
    apps/gworkspace/trunk/FSNode/Resources/Images/Recycler.tiff
    apps/gworkspace/trunk/FSNode/Resources/Images/RecyclerFull.tiff
    apps/gworkspace/trunk/GWorkspace/Resources/Icons/MultipleSelection.tiff
    apps/gworkspace/trunk/GWorkspace/Resources/Icons/Recycler.tiff
    apps/gworkspace/trunk/GWorkspace/Resources/Icons/RecyclerFull.tiff
    apps/gworkspace/trunk/Inspector/Resources/Images/MultipleSelection.tiff
    apps/gworkspace/trunk/Recycler/Resources/Images/Recycler.tiff
Modified:
    apps/gworkspace/trunk/ChangeLog
    apps/gworkspace/trunk/FSNode/FSNodeRep.m

Modified: apps/gworkspace/trunk/ChangeLog
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39184&r1=39183&r2=39184&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog     (original)
+++ apps/gworkspace/trunk/ChangeLog     Thu Nov 19 00:13:39 2015
@@ -1,3 +1,8 @@
+2015-11-19  Riccardo Mottola <[email protected]>
+
+       * FSNode/FSNodeRep.m
+       Use constants for common images from GNUstep, do not provide those 
icons.
+
 2015-11-18  Riccardo Mottola <[email protected]>
 
        * FSNode/FSNodeRep.m

Modified: apps/gworkspace/trunk/FSNode/FSNodeRep.m
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/FSNodeRep.m?rev=39184&r1=39183&r2=39184&view=diff
==============================================================================
--- apps/gworkspace/trunk/FSNode/FSNodeRep.m    (original)
+++ apps/gworkspace/trunk/FSNode/FSNodeRep.m    Thu Nov 19 00:13:39 2015
@@ -106,9 +106,8 @@
     labelWFactor = LABEL_W_FACT;
     
     oldresize = [[NSUserDefaults standardUserDefaults] boolForKey: 
@"old_resize"];
-    
-    imagepath = [bundle pathForImageResource: @"MultipleSelection"];
-    multipleSelIcon = [[NSImage alloc] initWithContentsOfFile: imagepath]; 
+
+    multipleSelIcon = [[NSImage imageNamed:NSImageNameMultipleDocuments] 
retain];
     imagepath = [bundle pathForImageResource: @"FolderOpen"];
     openFolderIcon = [[NSImage alloc] initWithContentsOfFile: imagepath]; 
     imagepath = [bundle pathForImageResource: @"HardDisk"];
@@ -117,10 +116,8 @@
     openHardDiskIcon = [[NSImage alloc] initWithContentsOfFile: imagepath]; 
     imagepath = [bundle pathForImageResource: @"Workspace"];
     workspaceIcon = [[NSImage alloc] initWithContentsOfFile: imagepath];
-    imagepath = [bundle pathForImageResource: @"Recycler"];
-    trashIcon = [[NSImage alloc] initWithContentsOfFile: imagepath]; 
-    imagepath = [bundle pathForImageResource: @"RecyclerFull"];
-    trashFullIcon = [[NSImage alloc] initWithContentsOfFile: imagepath];
+    trashIcon = [[NSImage imageNamed:NSImageNameTrashEmpty] retain];
+    trashFullIcon = [[NSImage imageNamed:NSImageNameTrashFull] retain];
     
     iconsCache = [NSMutableDictionary new];
     rootPath = path_separator();

Removed: apps/gworkspace/trunk/FSNode/Resources/Images/MultipleSelection.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/Resources/Images/MultipleSelection.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/FSNode/Resources/Images/Recycler.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/Resources/Images/Recycler.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/FSNode/Resources/Images/RecyclerFull.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/FSNode/Resources/Images/RecyclerFull.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/GWorkspace/Resources/Icons/MultipleSelection.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Resources/Icons/MultipleSelection.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/GWorkspace/Resources/Icons/Recycler.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Resources/Icons/Recycler.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/GWorkspace/Resources/Icons/RecyclerFull.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Resources/Icons/RecyclerFull.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/Inspector/Resources/Images/MultipleSelection.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Inspector/Resources/Images/MultipleSelection.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.

Removed: apps/gworkspace/trunk/Recycler/Resources/Images/Recycler.tiff
URL: 
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/Recycler/Resources/Images/Recycler.tiff?rev=39183&view=auto
==============================================================================
Binary file - no diff available.


_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs

Reply via email to