Minor theming updates.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@24268 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,10 @@
+2006-12-27  Richard Frith-Macdoanld <rfm@gnu.org>
+
+	* Headers/Additions/GNUstepGUI/GSTheme.h: Store images in dictionary.
+	* Source/GSTheme.m: Improve handling of named images.
+	* Source/NSButtonImageSource.[hm]: Partial implementation of classes
+	to handle standard images in buttons (support theming etc).
+
 2006-12-21  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSWindow.h

Headers/Additions/GNUstepGUI/GSTheme.h

@@ -223,7 +223,7 @@ APPKIT_EXPORT	NSString	*GSThemeDidDeactivateNotification;
 {
 @private
   NSBundle		*_bundle;
-  NSMutableArray	*_images;
+  NSMutableDictionary	*_images;
   NSMutableDictionary	*_tiles;
   NSImage		*_icon;
 }

Source/GSTheme.m

@@ -383,17 +383,38 @@ static NSNull			*null = nil;
       if (ext != nil && [imageTypes containsObject: ext] == YES)
         {
 	  NSImage	*image;
+	  NSString	*imageName;
 
-	  image = [[NSImage alloc] initWithContentsOfFile: imagePath];
-	  if (image != nil)
+	  imageName = [imagePath lastPathComponent];
+	  imageName = [imageName stringByDeletingPathExtension];
+
+	  image = [_images objectForKey: imageName];
+	  if (image == nil)
 	    {
-	      NSString	*imageName;
+	      image = [[NSImage alloc] initWithContentsOfFile: imagePath];
+	      if (image != nil)
+		{
+		  [_images setObject: image forKey: imageName];
+		  RELEASE(image);
+		}
+	    }
 
-	      imageName = [imagePath lastPathComponent];
-	      imageName = [imageName stringByDeletingPathExtension];
-	      [_images addObject: image];
-	      [image setName: imageName];
-	      RELEASE(image);
+	  /* We try to ensure that our new image can be found by name.
+	   */
+	  if (image != nil && [[image name] isEqualToString: imageName] == NO)
+	    {
+	      if ([image setName: imageName] == NO)
+	        {
+		  NSImage	*old;
+
+		  /* Couldn't set image name ... presumably already
+		   * in use ... so we remove the name from the old
+		   * image and try again.
+		   */
+		  old = [NSImage imageNamed: imageName];
+		  [old setName: nil];
+	          [image setName: imageName];
+		}
 	    }
 	}
     }
@@ -488,7 +509,9 @@ static NSNull			*null = nil;
 
   /*
    * Remove all cached bundle images from both NSImage's name dictionary
-   * and our cache array.
+   * and our cache dictionary, so that we can be sure we reload afresh
+   * when re-activated (in case the images on disk changed ... eg by a
+   * theme editor modifying the theme).
    */
   enumerator = [_images objectEnumerator];
   while ((image = [enumerator nextObject]) != nil)
@@ -543,7 +566,7 @@ static NSNull			*null = nil;
 - (id) initWithBundle: (NSBundle*)bundle
 {
   ASSIGN(_bundle, bundle);
-  _images = [NSMutableArray new];
+  _images = [NSMutableDictionary new];
   _tiles = [NSMutableDictionary new];
   return self;
 }

Source/NSButtonImageSource.h

@@ -0,0 +1,58 @@
+/* 
+   NSButtonImageSource.h
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+   Author:  Richard Frith-Macdonald <rfm@gnu.org>
+   Date: 2006
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
+*/ 
+
+#ifndef _GNUstep_H_NSImageSource
+#define _GNUstep_H_NSImageSource
+
+#include <Foundation/NSObject.h>
+#include <AppKit/NSImage.h>
+#include <AppKit/NSButton.h>
+#include <GNUstepGUI/GSTheme.h>
+
+/**
+ * Handle images for button cell theming.
+ */
+@interface NSButtonImageSource : NSObject <NSCoding, NSCopying>
+{
+  NSString		*imageName;
+  NSMutableDictionary	*images;
+}
++ (BOOL) archiveButtonImageSourceWithName: (NSString*)name
+			      toDirectory: (NSString*)path;
++ (id) buttonImageSourceWithName: (NSString*)name;
+- (id) copyWithZone: (NSZone*)zone;
+- (void) dealloc;
+- (void) encodeWithCode: (NSCoder*)aCoder;
+- (id) imageForState: (struct NSButtonState)state;
+- (id) initWithCoder: (NSCoder*)aCoder;
+@end
+
+@interface	NSButtonCell (NSButtonImageSource)
+- (id) _buttonImageSource;
+- (void) _setButtonImageSource: (id)source;
+@end
+
+#endif /* _GNUstep_H_NSImageSource */

Source/NSButtonImageSource.m

@@ -0,0 +1,110 @@
+/* 
+   NSButtonImageSource.m
+
+   Copyright (C) 2006 Free Software Foundation, Inc.
+
+   Author:  Richard Frith-Macdonald <rfm@gnu.org>
+   Date: 2006
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02111 USA.
+*/ 
+
+#include "NSButtonImageSource.h"
+
+
+@implementation NSButtonImageSource
+
+NSMutableDictionary	*sources = nil;
+
++ (id) buttonImageSourceWithName: (NSString*)name
+{
+  NSButtonImageSource	*source;
+
+  source = [sources objectForKey: name];
+  if (source == nil)
+    {
+      source = [self alloc];
+      source->imageName = [name copy];
+      source->images = [NSMutableDictionary new];
+      [sources setObject: source forKey: sources->imageName];
+      RELEASE(source);
+    }
+  return source;
+}
+
++ (void) initialize
+{
+  if (sources == nil)
+    {
+      sources = [NSMutableDictionary new];
+    }
+}
+
+- (id) copyWithZone: (NSZone*)zone
+{
+  return RETAIN(self);
+}
+
+- (void) dealloc
+{
+  RELEASE(images);
+  RELEASE(imageName);
+  [super dealloc];
+}
+
+- (void) encodeWithCoder: (NSCoder *)coder
+{
+  if ([coder allowsKeyedCoding])
+    {
+      [coder encodeObject: imageName forKey: @"NSImageName"];
+    }
+  else
+    {
+      [NSException raise: NSInvalidArgumentException 
+		  format: @"Can't encode %@ with %@.",
+	NSStringFromClass([self class]), NSStringFromClass([coder class])];
+    }
+}
+
+- (id) imageForState: (struct NSButtonState)state
+{
+}
+
+- (id) initWithCoder: (NSCoder *)coder
+{
+  if ([coder allowsKeyedCoding])
+    {
+      NSString	*name = [coder decodeObjectForKey: @"NSImageName"];
+
+      ASSIGN(self, [[self class] buttonImageSourceWithName: name]);
+    }
+  else
+    {
+      NSString	*className = NSStringFromClass([self class]);
+
+      RELEASE(self);
+      [NSException raise: NSInvalidArgumentException 
+		  format: @"Can't decode %@ with %@.",
+	className, NSStringFromClass([coder class])];
+    }
+
+  return self;
+}
+
+@end
+