mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2024-12-25 01:03:01 +00:00
Code Issues Releases Wiki Activity

it's faster to lazily generate the torrent action menu each time you need it

Browse source
This commit is contained in:
Mitchell Livingston 2008-03-11 03:37:09 +00:00
parent 2db47a6f2d
commit 8db7a29ab2
3 changed files with 41 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
macosx/Torrent.h
View file

@ -61,8 +61,6 @@ typedef enum
tr_file_stat * fileStat;
NSArray * fFileList;
NSMenu * fFileMenu;
float * fPreviousFinishedPieces;
NSDate * fFinishedPiecesDate;
@ -244,8 +242,6 @@ typedef enum
- (BOOL) hasFilePriority: (int) priority forIndexes: (NSIndexSet *) indexSet;
- (NSSet *) filePrioritiesForIndexes: (NSIndexSet *) indexSet;
- (NSMenu *) fileMenu;
- (NSDate *) dateAdded;
- (NSDate *) dateCompleted;
- (NSDate *) dateActivity;

15
macosx/Torrent.m
View file

@ -190,7 +190,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
[fIcon release];
[fFileList release];
[fFileMenu release];
[fQuickPauseDict release];
@ -284,7 +283,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
//check if stalled (stored because based on time and needs to check if it was previously stalled)
fStalled = [self isActive] && [fDefaults boolForKey: @"CheckStalled"]
&& [fDefaults integerForKey: @"StalledMinutes"] < [self stalledMinutes];
&& [self stalledMinutes] > [fDefaults integerForKey: @"StalledMinutes"];
//update queue for checking (from downloading to seeding), stalled, or error
if ((wasChecking && ![self isChecking]) || (wasStalled != fStalled) || (!wasError && [self isError] && [self isActive]))
@ -1419,16 +1418,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
return priorities;
}
- (NSMenu *) fileMenu
{
if (!fFileMenu)
{
fFileMenu = [[NSMenu alloc] initWithTitle: [@"TorrentMenu:" stringByAppendingString: [self name]]];
[fFileMenu setAutoenablesItems: NO];
}
return fFileMenu;
}
- (NSDate *) dateAdded
{
return fDateAdded;
@ -1460,7 +1449,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
NSDate * started = [NSDate dateWithTimeIntervalSince1970: start / 1000],
* activity = [self dateActivity];
NSDate * laterDate = (!activity || [started compare: activity] == NSOrderedDescending) ? started : activity;
NSDate * laterDate = activity ? [started laterDate: activity] : started;
return -1 * [laterDate timeIntervalSinceNow] / 60;
}

78
macosx/TorrentTableView.m
View file

@ -50,7 +50,7 @@
- (void) setGroupStatusColumns;
- (void) updateFileMenu: (NSMenu *) menu forFiles: (NSArray *) files;
- (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files;
- (void) resizePiecesBarIncrement;
@ -531,12 +531,16 @@
//get and update file menu
fMenuTorrent = [[self itemAtRow: row] retain];
NSMenu * fileMenu = [fMenuTorrent fileMenu];
[self updateFileMenu: fileMenu 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
NSRange range = NSMakeRange(0, [fileMenu numberOfItems]);
[fActionMenu appendItemsFromMenu: fileMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range] atBottom: YES];
NSInteger numberOfItems = [fileMenu numberOfItems];
[fActionMenu appendItemsFromMenu: fileMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, numberOfItems)]
atBottom: YES];
[fileMenu release];
//place menu below button
NSRect rect = [fTorrentCell iconRectForBounds: [self rectOfRow: row]];
@ -550,9 +554,9 @@
[NSMenu popUpContextMenu: fActionMenu withEvent: newEvent forView: self];
//move file menu items back to the torrent's file menu
range.location = [fActionMenu numberOfItems] - range.length;
[fileMenu appendItemsFromMenu: fActionMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range] atBottom: YES];
NSInteger i;
for (i = 0; i < numberOfItems; i++)
[fActionMenu removeItemAtIndex: [fActionMenu numberOfItems]-1];
[fMenuTorrent release];
fMenuTorrent = nil;
@ -633,7 +637,7 @@
else //assume the menu is part of the file list
{
NSMenu * supermenu = [menu supermenu];
[self updateFileMenu: menu forFiles: [[[supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: menu]]
[self createFileMenu: menu forFiles: [[[supermenu itemAtIndex: [supermenu indexOfItemWithSubmenu: menu]]
representedObject] objectForKey: @"Children"]];
}
}
@ -820,9 +824,10 @@
[groupTableColumn setWidth: [groupTableColumn width] + (ratio ? -2.0 : 2.0)];
}
- (void) updateFileMenu: (NSMenu *) menu forFiles: (NSArray *) files
- (void) createFileMenu: (NSMenu *) menu forFiles: (NSArray *) files
{
BOOL create = [menu numberOfItems] <= 0;
if ([menu numberOfItems] > 0)
return;
NSEnumerator * enumerator = [files objectEnumerator];
NSDictionary * dict;
@ -831,35 +836,30 @@
{
NSString * name = [dict objectForKey: @"Name"];
if (create)
{
item = [[NSMenuItem alloc] initWithTitle: name action: @selector(checkFile:) keyEquivalent: @""];
NSImage * icon;
if (![[dict objectForKey: @"IsFolder"] boolValue])
icon = [[NSWorkspace sharedWorkspace] iconForFileType: [name pathExtension]];
else
{
NSMenu * itemMenu = [[NSMenu alloc] initWithTitle: name];
[itemMenu setAutoenablesItems: NO];
[item setSubmenu: itemMenu];
[itemMenu setDelegate: self];
[itemMenu release];
icon = [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')];
}
[item setRepresentedObject: dict];
[icon setScalesWhenResized: YES];
[icon setSize: NSMakeSize(16.0, 16.0)];
[item setImage: icon];
[menu addItem: item];
[item release];
}
item = [[NSMenuItem alloc] initWithTitle: name action: @selector(checkFile:) keyEquivalent: @""];
NSImage * icon;
if (![[dict objectForKey: @"IsFolder"] boolValue])
icon = [[NSWorkspace sharedWorkspace] iconForFileType: [name pathExtension]];
else
item = [menu itemWithTitle: name];
{
NSMenu * itemMenu = [[NSMenu alloc] initWithTitle: name];
[itemMenu setAutoenablesItems: NO];
[item setSubmenu: itemMenu];
[itemMenu setDelegate: self];
[itemMenu release];
icon = [[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')];
}
[item setRepresentedObject: dict];
[icon setScalesWhenResized: YES];
[icon setSize: NSMakeSize(16.0, 16.0)];
[item setImage: icon];
[menu addItem: item];
[item release];
NSIndexSet * indexSet = [dict objectForKey: @"Indexes"];
[item setState: [fMenuTorrent checkForFiles: indexSet]];