Changeset 7426
- Timestamp:
- Dec 17, 2008, 2:13:49 AM (12 years ago)
- Location:
- trunk/macosx
- Files:
-
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r7370 r7426 45 45 #import "NSApplicationAdditions.h" 46 46 #import "NSStringAdditions.h" 47 #import "NSMenuAdditions.h"48 47 #import "ExpandedPathToPathTransformer.h" 49 48 #import "ExpandedPathToIconTransformer.h" … … 2285 2284 - (void) menuNeedsUpdate: (NSMenu *) menu 2286 2285 { 2287 #warning streamline?2288 2286 if (menu == fGroupsSetMenu || menu == fGroupsSetContextMenu) 2289 2287 { … … 2292 2290 2293 2291 NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroup:) isSmall: NO]; 2294 [menu appendItemsFromMenu: groupMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: 2295 NSMakeRange(0, [groupMenu numberOfItems])] atBottom: NO]; 2292 const NSInteger groupMenuCount = [groupMenu numberOfItems]; 2293 for (NSInteger i = 0; i < groupMenuCount; i++) 2294 { 2295 NSMenuItem * item = [[groupMenu itemAtIndex: 0] retain]; 2296 [groupMenu removeItemAtIndex: 0]; 2297 [menu addItem: item]; 2298 [item release]; 2299 } 2296 2300 } 2297 2301 else if (menu == fGroupFilterMenu) … … 2302 2306 NSMenu * groupMenu = [[GroupsController groups] groupMenuWithTarget: self action: @selector(setGroupFilter:) 2303 2307 isSmall: YES]; 2304 [menu appendItemsFromMenu: groupMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: 2305 NSMakeRange(0, [groupMenu numberOfItems])] atBottom: YES]; 2308 const NSInteger groupMenuCount = [groupMenu numberOfItems]; 2309 for (NSInteger i = 0; i < groupMenuCount; i++) 2310 { 2311 NSMenuItem * item = [[groupMenu itemAtIndex: 0] retain]; 2312 [groupMenu removeItemAtIndex: 0]; 2313 [menu addItem: item]; 2314 [item release]; 2315 } 2306 2316 } 2307 2317 else if (menu == fUploadMenu || menu == fDownloadMenu) -
trunk/macosx/Makefile.am
r7290 r7426 90 90 NSBezierPathAdditions.h \ 91 91 NSBezierPathAdditions.m \ 92 NSMenuAdditions.h \93 NSMenuAdditions.m \94 92 NSStringAdditions.h \ 95 93 NSStringAdditions.m \
Note: See TracChangeset
for help on using the changeset viewer.