Changeset bde97dacca88796298ba8e2a488d5c69f26dbe5d

Show
Ignore:
Timestamp:
12/30/07 15:53:00 (8 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1199026380 +0000
git-parent:

[7b087611c2486e4a76e3bb9f380a36880e713bc0]

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

macosx: don't allow the user to open the preferences window multiple times (leading to orphan pref windows which can't be controlled)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/intf.h

    rec022e2 rbde97da  
    113113    BOOL nib_bookmarks_loaded;  /* bookmarks nibfile */ 
    114114    BOOL nib_sfilters_loaded;   /* sfilters nibfile */ 
     115    BOOL nib_prefs_loaded;      /* preferences nibfile */ 
    115116    BOOL nib_update_loaded;     /* update nibfile */ 
    116117 

  • modules/gui/macosx/intf.m

    r8a7b94a rbde97da  
    386386 
    387387    o_about = [[VLAboutBox alloc] init]; 
    388     o_prefs = nil; 
     388    o_prefs = [[VLCPrefs alloc] init]; 
    389389    o_open = [[VLCOpen alloc] init]; 
    390390    o_wizard = [[VLCWizard alloc] init]; 
    …… 
    17381738    if( nib_about_loaded && o_about ) 
    17391739        [o_about release]; 
    1740   
     1740     
     1741    if( nib_prefs_loaded && o_prefs ) 
     1742        [o_prefs release]; 
     1743     
    17411744    if( nib_open_loaded && o_open ) 
    17421745        [o_open release]; 
    …… 
    19491952- (IBAction)viewPreferences:(id)sender 
    19501953{ 
    1951 /* GRUIIIIIIIK */ 
    1952     if( o_prefs == nil ) 
    1953         o_prefs = [[VLCPrefs alloc] init]; 
     1954    if( !nib_prefs_loaded ) 
     1955        nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; 
     1956 
    19541957    [o_prefs showPrefs]; 
    19551958} 

  • modules/gui/macosx/prefs.m

    rf9a54b0 rbde97da  
    109109- (void)showPrefs 
    110110{ 
    111     /* load our nib (if not already loaded) */ 
    112     [NSBundle loadNibNamed:@"Preferences" owner:self]; 
    113  
    114111    [o_prefs_window center]; 
    115112    [o_prefs_window makeKeyAndOrderFront:self];