Changeset 14632

Timestamp:

12/26/2005 08:20:33 PM (3 years ago)

Author:

evands

Message:

• Added -[AIEmoticonPack menuPreviewImage] which returns the image to use for a menu preview of the emoticon pack, preferring an emoticon whose text equivalent is :) or :-) and falling back on the first emoticon if necessary.
  
• Used a two prong approach to fix #2522:
  
  • Made use of the new method for the appearance preferences to make the emoticon menu much happier.
    
  • Used the prescription privileges I don't have yet to write a Fluoxetine prescription for the menu.
    

Fixes #2522. :)

Files:

• trunk/Plugins/Emoticons/AIEmoticonPack.h (modified) (1 diff)
• trunk/Plugins/Emoticons/AIEmoticonPack.m (modified) (2 diffs)
• trunk/Source/AIAppearancePreferences.m (modified) (2 diffs)

trunk/Plugins/Emoticons/AIEmoticonPack.h

@@ -27 +27 @@
-- (void)setDisabledEmoticons:(NSArray *)inArray;
-- (NSArray *)emoticons;
+- (NSImage *)menuPreviewImage;
-- (NSString *)name;
-- (NSString *)path;

trunk/Plugins/Emoticons/AIEmoticonPack.m

@@ -19 +19 @@
-#import "AIEmoticonController.h"
-#import <AIUtilities/AIFileManagerAdditions.h>
+#import <AIUtilities/AIImageAdditions.h>
-
-#define EMOTICON_PATH_EXTENSION                 @"emoticon"
@@ -112 +113 @@
-        if (!emoticonArray) [self loadEmoticons];
-        return emoticonArray;
+}
+
+/*
+ * @brief Return the preview image to use within a menu for this emoticon
+ *
+ * It tries to be the emoticon for text equivalent :) or :-). Failing that, any emoticon will do.
+ */
+- (NSImage *)menuPreviewImage
+{
+        NSArray          *myEmoticons = [self emoticons];
+        NSEnumerator *enumerator;
+        AIEmoticon       *emoticon;
+
+        enumerator = [myEmoticons objectEnumerator];
+        while ((emoticon = [enumerator nextObject])) {
+                NSArray *equivalents = [emoticon textEquivalents];
+                if ([equivalents containsObject:@":)"] || [equivalents containsObject:@":-)"]) {
+                        break;
+                }
+        }
+
+        //If we didn't find a happy emoticon, use the first one in the array
+        if (!emoticon && [myEmoticons count]) {
+                emoticon = [myEmoticons objectAtIndex:0];
+        }
+
+        return [[emoticon image] imageByScalingToSize:NSMakeSize(16,16)];
-}
-

trunk/Source/AIAppearancePreferences.m

@@ -386 +386 @@
-        //Divider
-        [menu addItem:[NSMenuItem separatorItem]];
-
+
-        //Emoticon Packs
-        while ((pack = [enumerator nextObject])) {
@@ -394 +394 @@
-                                                                                                                                  keyEquivalent:@""] autorelease];
-                [menuItem setRepresentedObject:pack];
-[[[pack emoticons] objectAtIndex:0] image] imageByScalingToSize:NSMakeSize(16,16)
+pack menuPreviewImage
-                [menu addItem:menuItem];
-        }
-
-
+
-        return [menu autorelease];
-}