Changeset 2128

Timestamp:

11/20/04 23:33:35 (4 years ago)

Author:

timothy

Message:

Same as r2127. AppleScripts? can pass a color list or HTML hex color as the icon value for menu items.

Files:

• branches/overhaul/MVApplicationController.m (modified) (5 diffs)

branches/overhaul/MVApplicationController.m

@@ -4 +4 @@
-#import <ChatCore/NSMethodSignatureAdditions.h>
-#import <ChatCore/MVChatScriptPlugin.h>
+#import <ChatCore/NSColorAdditions.h>
-#import "NSURLAdditions.h"
-#import "MVColorPanel.h"
@@ -413 +414 @@
-                                NSNumber *indent = [item objectForKey:@"indent"];
-                                NSNumber *alternate = [item objectForKey:@"alternate"];
-NSString *
+id 
-                                id iconSize = [item objectForKey:@"iconsize"];
-                                NSString *tooltip = [item objectForKey:@"tooltip"];
@@ -424 +425 @@
-                                if( ! [indent isKindOfClass:[NSNumber class]] ) indent = nil;
-                                if( ! [alternate isKindOfClass:[NSNumber class]] ) alternate = nil;
-
+&& ! [iconPath isKindOfClass:[NSArray class]] 
-                                if( ! [iconSize isKindOfClass:[NSArray class]] && ! [iconSize isKindOfClass:[NSNumber class]] ) iconSize = nil;
-                                if( ! [sub isKindOfClass:[NSArray class]] && ! [sub isKindOfClass:[NSDictionary class]] ) sub = nil;
-
+
-                                NSMenuItem *mitem = [[[NSMenuItem alloc] initWithTitle:title action:@selector( performContextualMenuItemAction: ) keyEquivalent:@""] autorelease];
-                                if( context ) [mitem setRepresentedObject:context];
@@ -448 +449 @@
-                                }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                // NSImage *icon = [[[NSImage allocWithZone:[self zone]] initByReferencingURL:[NSURL URLWithString:iconPath]] autorelease];
-                                                // Lets download the icon with a 1-second timeout
@@ -479 +498 @@
-                                                [[mitem image] setSize:size];
-                                        }
+                                } else if( [iconPath isKindOfClass:[NSArray class]] && [(NSArray *)iconPath count] == 3 ) {
+                                        NSSize size = NSZeroSize;
+                                        if( [iconSize isKindOfClass:[NSArray class]] && [(NSArray *)iconSize count] == 2 ) {
+                                                size = NSMakeSize( [[iconSize objectAtIndex:0] unsignedIntValue], [[iconSize objectAtIndex:1] unsignedIntValue] );
+                                        } else if( [iconSize isKindOfClass:[NSNumber class]] ) {
+                                                size = NSMakeSize( [iconSize unsignedIntValue], [iconSize unsignedIntValue] );
+                                        } else size = NSMakeSize( 24., 12. );
+
+                                        NSColor *color = [NSColor colorWithCalibratedRed:( [[iconPath objectAtIndex:0] unsignedIntValue] / 65535. ) green:( [[iconPath objectAtIndex:1] unsignedIntValue] / 65535. ) blue:( [[iconPath objectAtIndex:2] unsignedIntValue] / 65535. ) alpha:1.];
+                                        NSImage *icon = [[[NSImage alloc] initWithSize:size] autorelease];
+
+                                        [icon lockFocus];
+                                        [[color shadowWithLevel:0.1] set];
+                                        [NSBezierPath fillRect:NSMakeRect( 0., 0., size.width, size.height )];
+                                        [color drawSwatchInRect:NSMakeRect( 1., 1., size.width - 2., size.height - 2. )];
+                                        [icon unlockFocus];
+
+                                        [mitem setImage:icon];
-                                }
-