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

some small simplifications to the group code

This commit is contained in:
Mitchell Livingston 2008-06-05 02:46:39 +00:00
parent f010e5f372
commit 6d04fb8832
3 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
macosx/Controller.m
View File

@ -2265,21 +2265,17 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
NSImage * icon;
NSString * toolTip;
switch (groupIndex)
if (groupIndex == GROUP_FILTER_ALL_TAG)
{
case GROUP_FILTER_ALL_TAG:
icon = [NSImage imageNamed: @"PinTemplate.png"];
toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
break;
case -1:
icon = [NSImage imageNamed: @"GroupsNoneTemplate.png"];
toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
NSLocalizedString(@"No Label", "Groups -> Button")];
break;
default:
icon = [[GroupsController groups] imageForIndex: groupIndex];
toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"),
[[GroupsController groups] nameForIndex: groupIndex]];
icon = [NSImage imageNamed: @"PinTemplate.png"];
toolTip = NSLocalizedString(@"All Groups", "Groups -> Button");
}
else
{
icon = [[GroupsController groups] imageForIndex: groupIndex];
NSString * groupName = groupIndex != -1 ? [[GroupsController groups] nameForIndex: groupIndex]
: NSLocalizedString(@"None", "Groups -> Button");
toolTip = [NSString stringWithFormat: @"%@: %@", NSLocalizedString(@"Group", "Groups -> Button"), groupName];
}
//tiger doesn't have built-in image scaling in buttons
@ -2542,7 +2538,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
- (id) outlineView: (NSOutlineView *) outlineView objectValueForTableColumn: (NSTableColumn *) tableColumn byItem: (id) item
{
if (![item isKindOfClass: [Torrent class]])
if ([item isKindOfClass: [Torrent class]])
return [item hashString];
else
{
NSString * ident = [tableColumn identifier];
if ([ident isEqualToString: @"Group"])
@ -2554,8 +2552,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
else if ([ident isEqualToString: @"Color"])
{
int group = [[item objectForKey: @"Group"] intValue];
return group != -1 ? [[GroupsController groups] imageForIndex: group]
: [NSImage imageNamed: @"GroupsNoneTemplate.png"];
return [[GroupsController groups] imageForIndex: group];
}
else if ([ident isEqualToString: @"DL Image"])
return [NSImage imageNamed: @"DownArrowGroupTemplate.png"];
@ -2591,8 +2588,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
}
}
}
else
return [item hashString];
}
- (BOOL) outlineView: (NSOutlineView *) outlineView writeItems: (NSArray *) items toPasteboard: (NSPasteboard *) pasteboard

BIN
macosx/English.lproj/Localizable.strings
View File

Binary file not shown.

3
macosx/GroupsController.m
View File

@ -146,7 +146,8 @@ GroupsController * fGroupsInstance = nil;
- (NSImage *) imageForIndex: (int) index
{
int orderIndex = [self rowValueForIndex: index];
return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]] : nil;
return orderIndex != -1 ? [self imageForGroup: [fGroups objectAtIndex: orderIndex]]
: [NSImage imageNamed: @"GroupsNoneTemplate.png"];
}
- (NSColor *) colorForIndex: (int) index