Changeset 5982

Timestamp:

May 31, 2008, 2:38:44 AM (14 years ago)

Author:

livings124

Message:

potential decrease in memory usage when showing the group dividers

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (2 diffs)
• macosx/Controller.m (modified) (3 diffs)
• macosx/English.lproj/MainMenu.xib (modified) (2 diffs)
• macosx/GroupsController.h (modified) (1 diff)
• macosx/GroupsController.m (modified) (7 diffs)
• macosx/GroupsWindowController.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -2443 +2443 @@
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                 GCC_WARN_UNUSED_FUNCTION = NO;
+                                GCC_WARN_UNUSED_PARAMETER = NO;
                                 GCC_WARN_UNUSED_VARIABLE = NO;
                                 MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -2462 +2463 @@
                                 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
                                 GCC_WARN_UNUSED_FUNCTION = NO;
+                                GCC_WARN_UNUSED_PARAMETER = NO;
                                 GCC_WARN_UNUSED_VARIABLE = NO;
                                 MACOSX_DEPLOYMENT_TARGET = 10.4;

trunk/macosx/Controller.m

@@ -1626 +1626 @@
 }
 
-#warning migrate to Torrent.m
 - (void) torrentFinishedDownloading: (NSNotification *) notification
 {
@@ -2280 +2279 @@
             break;
         default:
-            icon = [[GroupsController groups] imageForIndex: groupIndex isSmall: YES];
+            icon = [[GroupsController groups] imageForIndex: groupIndex];
             toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
                         [[GroupsController groups] nameForIndex: groupIndex]];
@@ -2549 +2548 @@
         {
             int group = [[item objectForKey: @"Group"] intValue];
-            return group != -1 ? [[GroupsController groups] imageForIndex: group isSmall: YES]
+            return group != -1 ? [[GroupsController groups] imageForIndex: group]
                                 : [NSImage imageNamed: @"GroupsNoneTemplate.png"];
         }

trunk/macosx/English.lproj/MainMenu.xib

@@ -3 +3 @@
         <data>
                 <int key="IBDocument.SystemTarget">1050</int>
-                <string key="IBDocument.SystemVersion">9C7010</string>
-                <string key="IBDocument.InterfaceBuilderVersion">658</string>
-                <string key="IBDocument.AppKitVersion">949.26</string>
+                <string key="IBDocument.SystemVersion">9D34</string>
+                <string key="IBDocument.InterfaceBuilderVersion">667</string>
+                <string key="IBDocument.AppKitVersion">949.33</string>
                 <string key="IBDocument.HIToolboxVersion">352.00</string>
                 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                         <bool key="EncodedWithXMLCoder">YES</bool>
-                        <integer value="2"/>
+                        <integer value="3093"/>
                 </object>
                 <object class="NSArray" key="IBDocument.PluginDependencies">
@@ -271 +271 @@
                                                                                                 <object class="NSTableColumn" id="354434380">
                                                                                                         <string key="NSIdentifier">Color</string>
-                                                                                                        <double key="NSWidth">3.200000e+01</double>
+                                                                                                        <double key="NSWidth">2.900000e+01</double>
                                                                                                         <double key="NSMinWidth">1.600000e+01</double>
                                                                                                         <double key="NSMaxWidth">3.000000e+03</double>

trunk/macosx/GroupsController.h

@@ -42 +42 @@
 - (void) setName: (NSString *) name forIndex: (int) index;
 
-- (NSImage *) imageForIndex: (int) index isSmall: (BOOL) small;
+- (NSImage *) imageForIndex: (int) index;
 
 - (NSColor *) colorForIndex: (int) index;

trunk/macosx/GroupsController.m

@@ -28 +28 @@
 
 #define ICON_WIDTH 16.0
-#define ICON_WIDTH_SMALL 12.0
 
 @interface GroupsController (Private)
@@ -34 +33 @@
 - (void) saveGroups;
 
-- (NSImage *) imageForGroup: (NSDictionary *) dict isSmall: (BOOL) small;
+- (NSImage *) imageForGroup: (NSMutableDictionary *) dict;
 
 @end
@@ -144 +143 @@
 }
 
-- (NSImage *) imageForIndex: (int) index isSmall: (BOOL) small
+- (NSImage *) imageForIndex: (int) index
 {
     int orderIndex = [self rowValueForIndex: index];
-    return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex] isSmall: small] : nil;
+    return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]] : nil;
 }
 
@@ -257 +256 @@
     
     NSEnumerator * enumerator = [fGroups objectEnumerator];
-    NSDictionary * dict;
+    NSMutableDictionary * dict;
     while ((dict = [enumerator nextObject]))
     {
@@ -263 +262 @@
         [item setTarget: target];
         
-        [item setImage: [self imageForGroup: dict isSmall: small]];
+        #warning factor in size
+        [item setImage: [self imageForGroup: dict]];
         [item setTag: [[dict objectForKey: @"Index"] intValue]];
         
@@ -282 +282 @@
 }
 
-- (NSImage *) imageForGroup: (NSDictionary *) dict isSmall: (BOOL) small
-{
-    float width = small ? ICON_WIDTH_SMALL : ICON_WIDTH;
-    NSRect rect = NSMakeRect(0.0, 0.0, width, width);
+- (NSImage *) imageForGroup: (NSMutableDictionary *) dict
+{
+    NSImage * image;
+    if ((image = [dict objectForKey: @"Icon"]))
+        return image;
+    
+    NSRect rect = NSMakeRect(0.0, 0.0, ICON_WIDTH, ICON_WIDTH);
     
     NSBezierPath * bp = [NSBezierPath bezierPathWithRoundedRect: rect radius: 3.0];
@@ -307 +310 @@
     [icon unlockFocus];
     
-    return [icon autorelease];
+    [dict setObject: icon forKey: @"Icon"];
+    [icon release];
+    
+    return icon;
 }
 

trunk/macosx/GroupsWindowController.m

@@ -89 +89 @@
     NSString * identifier = [tableColumn identifier];
     if ([identifier isEqualToString: @"Color"])
-        return [groupsController imageForIndex: groupsIndex isSmall: NO];
+        return [groupsController imageForIndex: groupsIndex];
     else
         return [groupsController nameForIndex: groupsIndex];