Changeset b58dfe3584f7a60fcd5afbdac903b513f7082804

Show
Ignore:
Timestamp:
03/02/06 13:14:52 (3 years ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1141301692 +0000
git-parent:

[8e3a102f3f6558cde8dd1d2ab450c9b472b47b9b]

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

* MainMenu?.nib, playlist.m: use NSSearchField instead of NSTextField, so we don't need to replace it manually anymore. This breaks the 10.2-compatibility. (refs #189)

* update.m: use mtime() instead of NSCalenderDate for the time-stamp

* sfilters.m: fixed 2 compilation warnings (corrected UTF8String to char casting)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/playlist.m

    r2927b62 rb58dfe3  
    464464    vlc_object_release( p_playlist ); 
    465465 
    466     /* Change the simple textfield into a searchField if we can... */ 
    467 #if 0 
    468     if( MACOS_VERSION >= 10.3 ) 
    469     { 
    470         NSView *o_parentview = [o_status_field superview]; 
    471         NSSearchField *o_better_search_field = [[NSSearchField alloc]initWithFrame:[o_search_field frame]]; 
    472         [o_better_search_field setRecentsAutosaveName:@"VLC media player search"]; 
    473         [o_better_search_field setDelegate:self]; 
    474         [[NSNotificationCenter defaultCenter] addObserver: self 
    475             selector: @selector(searchfieldChanged:) 
    476             name: NSControlTextDidChangeNotification 
    477             object: o_better_search_field]; 
    478  
    479         [o_better_search_field setTarget:self]; 
    480         [o_better_search_field setAction:@selector(searchItem:)]; 
    481  
    482         [o_better_search_field setAutoresizingMask:NSViewMinXMargin]; 
    483         [o_parentview addSubview:o_better_search_field]; 
    484         [o_search_field setHidden:YES]; 
    485     } 
    486 #endif 
    487466    //[self playlistUpdated]; 
    488467} 
    …… 
    525504    unsigned int i; 
    526505 
    527     /* Clear indications of any existing column sorting*/ 
     506    /* Clear indications of any existing column sorting */ 
    528507    for( i = 0 ; i < [[o_outline_view tableColumns] count] ; i++ ) 
    529508    { 

  • modules/gui/macosx/sfilters.m

    rbaed4c1 rb58dfe3  
    415415        else 
    416416        { 
    417             val.psz_string = [[o_marq_marq_fld stringValue] UTF8String]; 
     417            val.psz_string = (char *)[[o_marq_marq_fld stringValue] UTF8String]; 
    418418        } 
    419419 
    …… 
    485485        else 
    486486        { 
    487             val.psz_string = [[o_time_stamp_fld stringValue] UTF8String]; 
     487            val.psz_string = (char *)[[o_time_stamp_fld stringValue] UTF8String]; 
    488488        } 
    489489 

  • modules/gui/macosx/update.m

    r349175a rb58dfe3  
    144144    NSString * pathToReleaseNote; 
    145145    pathToReleaseNote = [NSString stringWithFormat: \ 
    146         @"/tmp/vlc_releasenote_%@.tmp", [[NSCalendarDate calendarDate] \ 
    147         descriptionWithCalendarFormat: @"%m-%d-%y--%I.%M.%S.%F"]]; 
     146        @"/tmp/vlc_releasenote_%d.tmp", mdate()]; /*[[NSCalendarDate calendarDate] \ 
     147        descriptionWithCalendarFormat: @"%m-%d-%y--%I.%M.%S.%F"]];*/ 
     148    NSLog( pathToReleaseNote ); 
    148149     
    149150    if( p_uit )