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

make the file menu code a bit more straightforward

This commit is contained in:
Mitchell Livingston 2008-03-11 03:46:38 +00:00
parent 8db7a29ab2
commit cf433976b3
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
macosx/TorrentTableView.m
View File

@ -529,18 +529,11 @@
if (row < 0) if (row < 0)
return; return;
//get and update file menu NSInteger numberOfNonFileItems = [fActionMenu numberOfItems];
//update file action menu
fMenuTorrent = [[self itemAtRow: row] retain]; fMenuTorrent = [[self itemAtRow: row] retain];
[self createFileMenu: fActionMenu forFiles: [fMenuTorrent fileList]];
NSMenu * fileMenu = [[NSMenu alloc] initWithTitle: @"TorrentMenu"];
[fileMenu setAutoenablesItems: NO];
[self createFileMenu: fileMenu forFiles: [fMenuTorrent fileList]];
//add file menu items to action menu
NSInteger numberOfItems = [fileMenu numberOfItems];
[fActionMenu appendItemsFromMenu: fileMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, numberOfItems)]
atBottom: YES];
[fileMenu release];
//place menu below button //place menu below button
NSRect rect = [fTorrentCell iconRectForBounds: [self rectOfRow: row]]; NSRect rect = [fTorrentCell iconRectForBounds: [self rectOfRow: row]];
@ -555,8 +548,8 @@
[NSMenu popUpContextMenu: fActionMenu withEvent: newEvent forView: self]; [NSMenu popUpContextMenu: fActionMenu withEvent: newEvent forView: self];
NSInteger i; NSInteger i;
for (i = 0; i < numberOfItems; i++) for (i = [fActionMenu numberOfItems]-1; i >= numberOfNonFileItems; i--)
[fActionMenu removeItemAtIndex: [fActionMenu numberOfItems]-1]; [fActionMenu removeItemAtIndex: i];
[fMenuTorrent release]; [fMenuTorrent release];
fMenuTorrent = nil; fMenuTorrent = nil;
@ -636,6 +629,9 @@
} }
else //assume the menu is part of the file list else //assume the menu is part of the file list
{ {
if ([menu numberOfItems] > 0)
return;
NSMenu * supermenu = [menu supermenu]; NSMenu * supermenu = [menu supermenu];
[self createFileMenu: menu forFiles: [[[supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: menu]] [self createFileMenu: menu forFiles: [[[supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: menu]]
representedObject] objectForKey: @"Children"]]; representedObject] objectForKey: @"Children"]];
@ -826,9 +822,6 @@
- (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files - (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files
{ {
if ([menu numberOfItems] > 0)
return;
NSEnumerator * enumerator = [files objectEnumerator]; NSEnumerator * enumerator = [files objectEnumerator];
NSDictionary * dict; NSDictionary * dict;
NSMenuItem * item; NSMenuItem * item;