Changeset 387

Show
Ignore:
Timestamp:
12/08/07 11:35:44 (1 year ago)
Author:
gbooker
Message:

Better mark menu for joining

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireMarkMenu.m

    r386 r387  
    2121        COMMAND_MARK_TO_DELETE_METADATA, 
    2222        COMMAND_MARK_TO_JOIN, 
     23        COMMAND_MARK_AND_JOIN, 
    2324        COMMAND_CLEAR_JOIN_MARK, 
    2425        COMMAND_JOIN, 
    …… 
    8788                if(![joinList containsObject:fileMeta]) 
    8889                { 
    89                         [names addObject:BRLocalizedString(@"Join This with Other Files", @"Join This with Other Files")]; 
     90                        [names addObject:BRLocalizedString(@"Mark This File to Be Joined", @"Mark This File to Be Joined")]; 
    9091                        [commands addObject:[NSNumber numberWithInt:COMMAND_MARK_TO_JOIN]]; 
     92                        [names addObject:BRLocalizedString(@"Mark This File and Join Group", @"Mark This File and Join Group")]; 
     93                        [commands addObject:[NSNumber numberWithInt:COMMAND_MARK_AND_JOIN]]; 
    9194                } 
    9295                if([joinList count]) 
    9396                { 
     97                        [names addObject:BRLocalizedString(@"Join Marked Files", @"Join Marked Files")]; 
     98                        [commands addObject:[NSNumber numberWithInt:COMMAND_JOIN]]; 
    9499                        [names addObject:BRLocalizedString(@"Clear the Join List", @"Clear the Join List")]; 
    95100                        [commands addObject:[NSNumber numberWithInt:COMMAND_CLEAR_JOIN_MARK]]; 
    96                         [names addObject:BRLocalizedString(@"Join Marked Files", @"Join Marked Files")]; 
    97                         [commands addObject:[NSNumber numberWithInt:COMMAND_JOIN]]; 
    98101                } 
    99102        } 
    …… 
    339342                                [joinList removeAllObjects]; 
    340343                                break; 
     344                        case COMMAND_MARK_AND_JOIN: 
     345                                [joinList addObject:fileMeta]; 
    341346                        case COMMAND_JOIN: 
    342347                                [self doJoin]; 

  • trunk/SapphireMovieChooser.m

    r379 r387  
    9898         
    9999        if(row == 0)/*Put in the special "this is not a movie"*/ 
    100                 [SapphireFrontRowCompat setTitle:BRLocalizedString(@"<This is NOT a Movie>", @"Mark a file that is not a movie in the movie chooser") forMenu:result]; 
     100                [SapphireFrontRowCompat setTitle:BRLocalizedString(@"<This is Not a Movie>", @"Mark a file that is not a movie in the movie chooser") forMenu:result]; 
    101101        else 
    102102        {