From 8f9ca03e984e235c1fd95a0b6264defa274df44e Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 20 Jun 2006 14:46:15 +0000 Subject: [PATCH] sort by state will sort by progress afterwards --- macosx/Controller.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/macosx/Controller.m b/macosx/Controller.m index a0f0abbb6..562f395b4 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -790,7 +790,10 @@ static void sleepCallBack( void * controller, io_service_t y, NSSortDescriptor * nameDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"name" ascending: YES] autorelease], * dateDescriptor = [[[NSSortDescriptor alloc] initWithKey: - @"date" ascending: YES] autorelease]; + @"date" ascending: YES] autorelease], + * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: + @"progressSortKey" ascending: YES] autorelease]; + NSArray * descriptors; if ([fSortType isEqualToString: @"Name"]) descriptors = [[NSArray alloc] initWithObjects: nameDescriptor, dateDescriptor, nil]; @@ -798,14 +801,11 @@ static void sleepCallBack( void * controller, io_service_t y, { NSSortDescriptor * stateDescriptor = [[[NSSortDescriptor alloc] initWithKey: @"stateSortKey" ascending: NO] autorelease]; - descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, nameDescriptor, dateDescriptor, nil]; + descriptors = [[NSArray alloc] initWithObjects: stateDescriptor, progressDescriptor, + nameDescriptor, dateDescriptor, nil]; } else if ([fSortType isEqualToString: @"Progress"]) - { - NSSortDescriptor * progressDescriptor = [[[NSSortDescriptor alloc] initWithKey: - @"progressSortKey" ascending: YES] autorelease]; descriptors = [[NSArray alloc] initWithObjects: progressDescriptor, nameDescriptor, dateDescriptor, nil]; - } else descriptors = [[NSArray alloc] initWithObjects: dateDescriptor, nameDescriptor, nil];