Changeset feebdf7d844deb3a0fdd0a2fb2b9ad42ce1c65fa

Show
Ignore:
Timestamp:
07/25/05 11:44:12 (3 years ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1122284652 +0000
git-parent:

[e0fc97039a396b035ab8d59376c254b2e33eed44]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1122284652 +0000
Message:

* AUTHORS: add a location to bigben's entry to prevent the OSX-About-Window-Parser from crashing
* other files: small patch to make sure that About.nib is loaded only once

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • AUTHORS

    r5bbb474 rfeebdf7  
    307307D: MacOS X Interface (playlist) 
    308308D: documentation 
     309S: France / Germany 
    309310 
    310311N: Emmanuel Puig 

  • modules/gui/macosx/about.m

    rfe087a3 rfeebdf7  
    5858        NSString *o_version; 
    5959        NSString *o_thanks_path; 
    60          
    61         /* Load the needed nib-file */ 
    62         [NSBundle loadNibNamed:@"About" owner:self]; 
    6360         
    6461        /* Get the info dictionary (Info.plist) */ 

  • modules/gui/macosx/intf.h

    r54ee50f rfeebdf7  
    9393    id o_wizard;                /* VLCWizard      */ 
    9494    BOOL nib_open_loaded;       /* reference to the open-nib */ 
     95    BOOL nib_about_loaded;      /* reference to the about-nib */ 
    9596    BOOL nib_wizard_loaded;     /* reference to the wizard-nib */ 
    9697 

  • modules/gui/macosx/intf.m

    r54ee50f rfeebdf7  
    14481448- (IBAction)viewAbout:(id)sender 
    14491449{ 
    1450     [o_about showPanel]; 
     1450    if (!nib_about_loaded) 
     1451    { 
     1452        nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; 
     1453        [o_about showPanel]; 
     1454    } else { 
     1455        [o_about showPanel]; 
     1456    } 
    14511457} 
    14521458