in the groups menu, show the "blank group" image; resize the images in the groups...

diff --git a/macosx/GroupsController.m b/macosx/GroupsController.m
index cf1706bf1219b677debb8e16a39962f7ad166605..ff857586fc538818768f22839cbb6ab6b1514e1e 100644 (file)
--- a/macosx/GroupsController.m
+++ b/macosx/GroupsController.m
@@ -27,6 +27,7 @@
 #import "NSBezierPathAdditions.h"
 
 #define ICON_WIDTH 16.0
+#define ICON_WIDTH_SMALL 12.0
 
 @interface GroupsController (Private)
 
@@ -251,6 +252,16 @@ GroupsController * fGroupsInstance = nil;
                             keyEquivalent: @""];
     [item setTarget: target];
     [item setTag: -1];
+    
+    NSImage * icon = [[NSImage imageNamed: @"GroupsNoneTemplate.png"] copy];
+    if (small)
+    {
+        [icon setScalesWhenResized: YES];
+        [icon setSize: NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL)];
+    }
+    [item setImage: icon];
+    [icon release];
+    
     [menu addItem: item];
     [item release];
     
@@ -261,10 +272,17 @@ GroupsController * fGroupsInstance = nil;
         item = [[NSMenuItem alloc] initWithTitle: [dict objectForKey: @"Name"] action: action keyEquivalent: @""];
         [item setTarget: target];
         
-        #warning factor in size
-        [item setImage: [self imageForGroup: dict]];
         [item setTag: [[dict objectForKey: @"Index"] intValue]];
         
+        NSImage * icon = [[self imageForGroup: dict] copy];
+        if (small)
+        {
+            [icon setScalesWhenResized: YES];
+            [icon setSize: NSMakeSize(ICON_WIDTH_SMALL, ICON_WIDTH_SMALL)];
+        }
+        [item setImage: icon];
+        [icon release];
+        
         [menu addItem: item];
         [item release];
     }

diff --git a/macosx/Images/GroupsNoneTemplate.png b/macosx/Images/GroupsNoneTemplate.png
index 8357d5a05e49aefdc15aae090a6adb8eb0d5b95f..c8d7b838b9b2399916384c1c74a02616b3820b1e 100644 (file)
Binary files a/macosx/Images/GroupsNoneTemplate.png and b/macosx/Images/GroupsNoneTemplate.png differ