mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

allow new menu method to use an index set instead of range

This commit is contained in:
Mitchell Livingston 2007-08-20 19:05:58 +00:00
parent 420115e322
commit ca6f1934b3
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
macosx/NSMenuAdditions.h
View File

@ -26,6 +26,6 @@
@interface NSMenu (NSMenuAdditions) @interface NSMenu (NSMenuAdditions)
- (void) moveItemsToEndFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range; - (void) appendItemsFromMenu: (NSMenu *) menu atIndexes: (NSIndexSet *) indexes;
@end @end

14
macosx/NSMenuAdditions.m
View File

@ -26,15 +26,17 @@
@implementation NSMenu (NSMenuAdditions) @implementation NSMenu (NSMenuAdditions)
- (void) moveItemsToEndFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range - (void) appendItemsFromMenu: (NSMenu *) menu atIndexes: (NSIndexSet *) indexes
{ {
int bottom = [self numberOfItems];
NSMenuItem * item; NSMenuItem * item;
int i; unsigned int i;
for (i=0; i<range.length; i++) for (i = [indexes lastIndex]; i != NSNotFound; i = [indexes indexLessThanIndex: i])
{ {
item = [[oldMenu itemAtIndex: range.location] retain]; item = [[menu itemAtIndex:i] retain];
[oldMenu removeItem: item]; [menu removeItem: item];
[self addItem: item]; [self insertItem: item atIndex: bottom];
[item release]; [item release];
} }
} }

6
macosx/TorrentTableView.m
View File

@ -317,8 +317,8 @@
[self updateFileMenu: fileMenu forFiles: [fMenuTorrent fileList]]; [self updateFileMenu: fileMenu forFiles: [fMenuTorrent fileList]];
//add file menu items to action menu //add file menu items to action menu
NSRange range = NSMakeRange(0, [fileMenu numberOfItems]); NSRange range = NSMakeRange(0, [fileMenu numberOfItems]);
[fActionMenu moveItemsToEndFromMenu: fileMenu inRange: range]; [fActionMenu appendItemsFromMenu: fileMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range]];
//place menu below button //place menu below button
NSRect rect = [self actionRectForRow: row]; NSRect rect = [self actionRectForRow: row];
@ -334,7 +334,7 @@
//move file menu items back to the torrent's file menu //move file menu items back to the torrent's file menu
range.location = [fActionMenu numberOfItems] - range.length; range.location = [fActionMenu numberOfItems] - range.length;
[fileMenu moveItemsToEndFromMenu: fActionMenu inRange: range]; [fileMenu appendItemsFromMenu: fActionMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range]];
[fMenuTorrent release]; [fMenuTorrent release];
fMenuTorrent = nil; fMenuTorrent = nil;