Changeset 939

Show
Ignore:
Timestamp:
11/05/2009 05:56:15 PM (2 years ago)
Author:
gbooker
Message:

A lot of Take 3 compatibility. Layouts still need a lot of work though.
Refs #323

Location:
trunk/SapphireFrappliance
Files:
12 modified

Legend:

Unmodified
Added
Removed

  • trunk/SapphireFrappliance/Browser/SapphireErrorDisplayController.m

    r728 r939  
    3939         
    4040        text = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    41         [SapphireFrontRowCompat setText:longError withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:text]; 
     41        [SapphireFrontRowCompat setText:longError withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:text]; 
    4242        [self addControl:text]; 
    4343        [self layoutFrame]; 

  • trunk/SapphireFrappliance/Browser/SapphireTextEntryController.m

    r790 r939  
    4545         
    4646        title = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    47         [SapphireFrontRowCompat setText:titleText withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:title]; 
     47        [SapphireFrontRowCompat setText:titleText withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:title]; 
    4848        [self addControl:title]; 
    4949 
    5050        textEntry = [SapphireFrontRowCompat newTextEntryControlWithScene:scene]; 
    5151        [textEntry setInitialText:defaultText]; 
    52         [textEntry setTextEntryCompleteDelegate:self]; 
     52        [SapphireFrontRowCompat setDelegate:self forTextEntry:textEntry]; 
    5353         
    5454        entryComplete = [completetion retain]; 

  • trunk/SapphireFrappliance/FRAppliance/SapphireAppliance.m

    r886 r939  
    101101                } 
    102102        } 
     103        if([SapphireFrontRowCompat atvVersion] >= SapphireFrontRowCompatATVVersion3) 
     104                className = @"MOVAppliance"; 
    103105        return ( className ); 
    104106} 
    … …  
    200202} 
    201203 
     204-(id)controllerForIdentifier:(id)ident args:(id)args 
     205{ 
     206        return [self controllerForIdentifier:ident]; 
     207} 
     208 
     209- (id)previewControlForIdentifier:(id)ident 
     210{ 
     211#warning NEED THIS! 
     212        return nil; 
     213} 
     214 
    202215-(id)controllerForIdentifier:(id)ident 
    203216{ 

  • trunk/SapphireFrappliance/FRAppliance/SapphireConfirmPrompt.m

    r865 r939  
    3636         
    3737        subtitle = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    38         [SapphireFrontRowCompat setText:sub withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:subtitle]; 
     38        [SapphireFrontRowCompat setText:sub withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:subtitle]; 
    3939                 
    4040        [[self list] setDatasource:self]; 
    … …  
    5757- (void)setText:(NSString *)theText 
    5858{ 
    59         [SapphireFrontRowCompat setText:theText withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:subtitle]; 
     59        [SapphireFrontRowCompat setText:theText withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:subtitle]; 
    6060         
    6161        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 

  • trunk/SapphireFrappliance/FRAppliance/SapphireMetaDataUpgrading.m

    r894 r939  
    8080        if(file == nil) 
    8181                file = @""; 
    82         [SapphireFrontRowCompat setText:file withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:status]; 
     82        [SapphireFrontRowCompat setText:file withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:status]; 
    8383         
    8484        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 

  • trunk/SapphireFrappliance/FRAppliance/SapphireWaitDisplay.m

    r894 r939  
    8383        if(stat == nil) 
    8484                stat = @""; 
    85         [SapphireFrontRowCompat setText:stat withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:status]; 
     85        [SapphireFrontRowCompat setText:stat withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:status]; 
    8686         
    8787        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m

    r919 r939  
    117117- (void)setText:(NSString *)theText 
    118118{ 
    119         [SapphireFrontRowCompat setText:theText withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:text]; 
     119        [SapphireFrontRowCompat setText:theText withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:text]; 
    120120         
    121121        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 
    … …  
    136136- (void)setFileProgress:(NSString *)theFileProgress 
    137137{ 
    138         [SapphireFrontRowCompat setText:theFileProgress withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileProgress]; 
     138        [SapphireFrontRowCompat setText:theFileProgress withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileProgress]; 
    139139         
    140140        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 
    … …  
    155155- (void)setCurrentFile:(NSString *)theCurrentFile 
    156156{ 
    157         [SapphireFrontRowCompat setText:theCurrentFile withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:currentFile]; 
     157        [SapphireFrontRowCompat setText:theCurrentFile withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:currentFile]; 
    158158         
    159159        NSRect master = [SapphireFrontRowCompat frameOfController:self]; 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireMovieChooser.m

    r886 r939  
    3838        /* Set a control to display the fileName */ 
    3939        fileNameText = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    40         [SapphireFrontRowCompat setText:@"File:" withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileNameText]; 
     40        [SapphireFrontRowCompat setText:@"File:" withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileNameText]; 
    4141         
    4242        [self doMyLayout]; 
    … …  
    8383{ 
    8484        fileName=[choosingForFileName retain] ; 
    85         [SapphireFrontRowCompat setText:choosingForFileName withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileNameText]; 
     85        [SapphireFrontRowCompat setText:choosingForFileName withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileNameText]; 
    8686} 
    8787 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphirePosterChooser.m

    r899 r939  
    6464        /* Set a control to display the fileName */ 
    6565        fileInfoText = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    66         [SapphireFrontRowCompat setText:@"No File" withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileInfoText]; 
     66        [SapphireFrontRowCompat setText:@"No File" withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileInfoText]; 
    6767        NSRect frame = [SapphireFrontRowCompat frameOfController:self]; 
    6868        frame.origin.y = frame.size.height / 1.25f; 

  • trunk/SapphireFrappliance/MetaDataImporting/SapphireShowChooser.m

    r696 r939  
    3939        /* Set a control to display the fileName */ 
    4040        fileName = [SapphireFrontRowCompat newTextControlWithScene:scene]; 
    41         [SapphireFrontRowCompat setText:@"File:" withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileName]; 
     41        [SapphireFrontRowCompat setText:@"File:" withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileName]; 
    4242         
    4343        [self doMyLayout]; 
    … …  
    8888- (void)setFileName:(NSString*)choosingForFileName 
    8989{ 
    90         [SapphireFrontRowCompat setText:choosingForFileName withAtrributes:[[BRThemeInfo sharedTheme] paragraphTextAttributes] forControl:fileName]; 
     90        [SapphireFrontRowCompat setText:choosingForFileName withAtrributes:[SapphireFrontRowCompat paragraphTextAttributes] forControl:fileName]; 
    9191} 
    9292 

  • trunk/SapphireFrappliance/Players/SapphireVideoPlayerController.m

    r924 r939  
    269269- (void)willBePopped 
    270270{ 
     271        [self teardownPlayback]; 
    271272        [super willBePopped]; 
     273} 
     274 
     275- (void)wasPopped 
     276{ 
    272277        [self teardownPlayback]; 
    273 } 
    274  
    275 - (void)wasPopped 
    276 { 
    277278        [super wasPopped]; 
    278         [self teardownPlayback]; 
    279279} 
    280280 

  • trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj

    r934 r939  
    8484                F541CBF50D9C2D19002F9278 /* SapphireRadioSetting.m in Sources */ = {isa = PBXBuildFile; fileRef = F541CBF40D9C2D19002F9278 /* SapphireRadioSetting.m */; }; 
    8585                F544602A0E030D5100311C03 /* SapphireDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = F54460290E030D5100311C03 /* SapphireDirectory.m */; }; 
     86                F54A38ED109F43C600DCC808 /* SapphireTakeThreeCompatClasses.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = F54A38E8109F43A600DCC808 /* SapphireTakeThreeCompatClasses.framework */; }; 
    8687                F54A5FFA0E07089500F9827C /* SapphireFileSorter.m in Sources */ = {isa = PBXBuildFile; fileRef = F54A5FF90E07089500F9827C /* SapphireFileSorter.m */; }; 
    8788                F54A60CC0E0860A200F9827C /* SapphireDisplayMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = F54A60CB0E0860A200F9827C /* SapphireDisplayMenu.m */; }; 
    … …  
    225226                        remoteInfo = "Complete Sapphire"; 
    226227                }; 
     228                F54A38E7109F43A600DCC808 /* PBXContainerItemProxy */ = { 
     229                        isa = PBXContainerItemProxy; 
     230                        containerPortal = F51BFD2D0D26BDF300E22363 /* SapphireCompatibilityClasses.xcodeproj */; 
     231                        proxyType = 2; 
     232                        remoteGlobalIDString = F54A377C109F420000DCC808; 
     233                        remoteInfo = SapphireTakeThreeCompatClasses; 
     234                }; 
     235                F54A38EB109F43B900DCC808 /* PBXContainerItemProxy */ = { 
     236                        isa = PBXContainerItemProxy; 
     237                        containerPortal = F51BFD2D0D26BDF300E22363 /* SapphireCompatibilityClasses.xcodeproj */; 
     238                        proxyType = 1; 
     239                        remoteGlobalIDString = F54A377B109F420000DCC808; 
     240                        remoteInfo = SapphireTakeThreeCompatClasses; 
     241                }; 
    227242                F56895E00D6CE30D00F9D9B0 /* PBXContainerItemProxy */ = { 
    228243                        isa = PBXContainerItemProxy; 
    … …  
    346361                        dstSubfolderSpec = 10; 
    347362                        files = ( 
    348                                 F59FEEFD0ED85FEF0052012E /* SapphireTakeTwoPointTwoCompatClasses.framework in CopyFiles */, 
    349363                                F532ED820E45426800DBEE13 /* SapphireCompatClasses.framework in CopyFiles */, 
    350364                                F532ED830E45426800DBEE13 /* SapphireLeopardCompatClasses.framework in CopyFiles */, 
    351365                                F532ED840E45426800DBEE13 /* SapphireTakeTwoCompatClasses.framework in CopyFiles */, 
     366                                F59FEEFD0ED85FEF0052012E /* SapphireTakeTwoPointTwoCompatClasses.framework in CopyFiles */, 
     367                                F54A38ED109F43C600DCC808 /* SapphireTakeThreeCompatClasses.framework in CopyFiles */, 
    352368                        ); 
    353369                        runOnlyForDeploymentPostprocessing = 0; 
    … …  
    10381054                                F56895E10D6CE30D00F9D9B0 /* SapphireTakeTwoCompatClasses.framework */, 
    10391055                                F582AADB0EBAA7820096B9B4 /* SapphireTakeTwoPointTwoCompatClasses.framework */, 
     1056                                F54A38E8109F43A600DCC808 /* SapphireTakeThreeCompatClasses.framework */, 
    10401057                        ); 
    10411058                        name = Products; 
    … …  
    10741091                                F585A9C70D74EA810043AB22 /* PBXTargetDependency */, 
    10751092                                F59FEEFC0ED85FE50052012E /* PBXTargetDependency */, 
     1093                                F54A38EC109F43B900DCC808 /* PBXTargetDependency */, 
    10761094                        ); 
    10771095                        name = Sapphire; 
    … …  
    11881206 
    11891207/* Begin PBXReferenceProxy section */ 
     1208                F54A38E8109F43A600DCC808 /* SapphireTakeThreeCompatClasses.framework */ = { 
     1209                        isa = PBXReferenceProxy; 
     1210                        fileType = wrapper.framework; 
     1211                        path = SapphireTakeThreeCompatClasses.framework; 
     1212                        remoteRef = F54A38E7109F43A600DCC808 /* PBXContainerItemProxy */; 
     1213                        sourceTree = BUILT_PRODUCTS_DIR; 
     1214                }; 
    11901215                F56895E10D6CE30D00F9D9B0 /* SapphireTakeTwoCompatClasses.framework */ = { 
    11911216                        isa = PBXReferenceProxy; 
    … …  
    14481473                        targetProxy = F532EC470E44FBC900DBEE13 /* PBXContainerItemProxy */; 
    14491474                }; 
     1475                F54A38EC109F43B900DCC808 /* PBXTargetDependency */ = { 
     1476                        isa = PBXTargetDependency; 
     1477                        name = SapphireTakeThreeCompatClasses; 
     1478                        targetProxy = F54A38EB109F43B900DCC808 /* PBXContainerItemProxy */; 
     1479                }; 
    14501480                F585A9C70D74EA810043AB22 /* PBXTargetDependency */ = { 
    14511481                        isa = PBXTargetDependency;