X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=fbd57b05d31cac6aa071f1c1c209e76563d07839;hb=5caa41762b984f27a1f1af0bcea9bdcfd812a25b;hp=622b906f64ae799eae5f00adf75bd93e6f71e88a;hpb=626c340b8a5bd9fa540167506af03975d4028b4b;p=vlc diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 622b906f64..fbd57b05d3 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -1,18 +1,18 @@ /***************************************************************************** * intf.h: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: intf.h,v 1.26 2003/02/13 00:09:51 hartman Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id: intf.h,v 1.55 2004/01/09 22:11:04 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -31,17 +31,16 @@ #include /***************************************************************************** - * VLCApplication interface + * VLCApplication interface *****************************************************************************/ @interface VLCApplication : NSApplication { - NSStringEncoding i_encoding; intf_thread_t *p_intf; } -- (void)initIntlSupport; - (NSString *)localizedString:(char *)psz; - (char *)delocalizeString:(NSString *)psz; +- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width; - (void)setIntf:(intf_thread_t *)p_intf; - (intf_thread_t *)getIntf; @@ -49,8 +48,15 @@ @end #define _NS(s) [NSApp localizedString: _(s)] +/* Get an alternate version of the string. + * This string is stored as '1:string' but when displayed it only displays + * the translated string. the translation should be '1:translatedstring' though */ +#define _ANS(s) [[NSApp localizedString: _(s)] substringFromIndex:2] int ExecuteOnMainThread( id target, SEL sel, void * p_arg ); +int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ); +unsigned int CocoaKeyToVLC( unichar i_key ); /***************************************************************************** * intf_sys_t: description and status of the interface @@ -68,58 +74,55 @@ struct intf_sys_t vlc_bool_t b_intf_update; vlc_bool_t b_play_status; vlc_bool_t b_playlist_update; - + vlc_bool_t b_current_title_update; + vlc_bool_t b_fullscreen_update; + /* menus handlers */ - vlc_bool_t b_chapter_update; - vlc_bool_t b_program_update; - vlc_bool_t b_title_update; - vlc_bool_t b_audio_update; - vlc_bool_t b_spu_update; + vlc_bool_t b_input_update; vlc_bool_t b_aout_update; vlc_bool_t b_vout_update; /* The messages window */ msg_subscription_t * p_sub; - - /* DVD mode */ - unsigned int i_part; }; /***************************************************************************** - * VLCMain interface + * VLCMain interface *****************************************************************************/ @interface VLCMain : NSObject { id o_prefs; /* VLCPrefs */ IBOutlet id o_window; /* main window */ + IBOutlet id o_scrollfield; /* info field */ IBOutlet id o_timefield; /* time field */ IBOutlet id o_timeslider; /* time slider */ float f_slider; /* slider value */ - float f_slider_old; /* old slider val */ + float f_slider_old; /* old slider val */ IBOutlet id o_volumeslider; /* volume slider */ - IBOutlet id o_btn_playlist; /* btn playlist */ IBOutlet id o_btn_prev; /* btn previous */ - IBOutlet id o_btn_slower; /* btn slower */ + IBOutlet id o_btn_rewind; /* btn rewind */ IBOutlet id o_btn_play; /* btn play */ IBOutlet id o_btn_stop; /* btn stop */ - IBOutlet id o_btn_faster; /* btn faster */ + IBOutlet id o_btn_ff; /* btn fast forward */ IBOutlet id o_btn_next; /* btn next */ - IBOutlet id o_btn_prefs; /* btn prefs */ + IBOutlet id o_btn_fullscreen;/* btn fullscreen */ NSImage * o_img_play; /* btn play img */ NSImage * o_img_pause; /* btn pause img */ + NSImage * o_img_play_pressed; /* btn play img */ + NSImage * o_img_pause_pressed; /* btn pause img */ IBOutlet id o_controls; /* VLCControls */ IBOutlet id o_playlist; /* VLCPlaylist */ + IBOutlet id o_info; /* VLCInfo */ IBOutlet id o_messages; /* messages tv */ IBOutlet id o_msgs_panel; /* messages panel */ - IBOutlet id o_msgs_btn_ok; /* messages btn */ NSMutableArray * o_msg_arr; /* messages array */ NSLock * o_msg_lock; /* messages lock */ - IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */ + IBOutlet id o_msgs_btn_crashlog; /* messages open crashlog */ IBOutlet id o_error; /* error panel */ IBOutlet id o_err_msg; /* NSTextView */ @@ -127,6 +130,9 @@ struct intf_sys_t IBOutlet id o_err_bug_lbl; IBOutlet id o_err_btn_msgs; /* Open Messages */ IBOutlet id o_err_btn_dismiss; + IBOutlet id o_err_ckbk_surpress; + + IBOutlet id o_info_window; /* Info panel */ /* main menu */ @@ -159,40 +165,59 @@ struct intf_sys_t IBOutlet id o_mi_slower; IBOutlet id o_mi_previous; IBOutlet id o_mi_next; + IBOutlet id o_mi_random; + IBOutlet id o_mi_repeat; IBOutlet id o_mi_loop; IBOutlet id o_mi_fwd; IBOutlet id o_mi_bwd; IBOutlet id o_mi_program; + IBOutlet id o_mu_program; IBOutlet id o_mi_title; + IBOutlet id o_mu_title; IBOutlet id o_mi_chapter; - IBOutlet id o_mi_language; - IBOutlet id o_mi_subtitle; + IBOutlet id o_mu_chapter; IBOutlet id o_mu_audio; IBOutlet id o_mi_vol_up; IBOutlet id o_mi_vol_down; IBOutlet id o_mi_mute; + IBOutlet id o_mi_audiotrack; + IBOutlet id o_mu_audiotrack; IBOutlet id o_mi_channels; + IBOutlet id o_mu_channels; IBOutlet id o_mi_device; + IBOutlet id o_mu_device; + IBOutlet id o_mi_visual; + IBOutlet id o_mu_visual; IBOutlet id o_mu_video; IBOutlet id o_mi_half_window; IBOutlet id o_mi_normal_window; IBOutlet id o_mi_double_window; + IBOutlet id o_mi_fittoscreen; IBOutlet id o_mi_fullscreen; + IBOutlet id o_mi_floatontop; + IBOutlet id o_mi_videotrack; + IBOutlet id o_mu_videotrack; IBOutlet id o_mi_screen; + IBOutlet id o_mu_screen; + IBOutlet id o_mi_subtitle; + IBOutlet id o_mu_subtitle; IBOutlet id o_mi_deinterlace; + IBOutlet id o_mu_deinterlace; IBOutlet id o_mu_window; IBOutlet id o_mi_minimize; IBOutlet id o_mi_close_window; IBOutlet id o_mi_controller; IBOutlet id o_mi_playlist; + IBOutlet id o_mi_info; IBOutlet id o_mi_messages; IBOutlet id o_mi_bring_atf; - + IBOutlet id o_mu_help; IBOutlet id o_mi_readme; + IBOutlet id o_mi_documentation; IBOutlet id o_mi_reportabug; IBOutlet id o_mi_website; IBOutlet id o_mi_license; @@ -202,41 +227,32 @@ struct intf_sys_t IBOutlet id o_dmi_stop; IBOutlet id o_dmi_next; IBOutlet id o_dmi_previous; + IBOutlet id o_dmi_mute; } +- (id)getControls; +- (id)getPlaylist; - (void)terminate; +- (void)initStrings; + - (void)manage; -- (void)manage:(playlist_t *)p_playlist; -- (void)manageMode:(playlist_t *)p_playlist; - (void)manageIntf:(NSTimer *)o_timer; +- (void)setupMenus; - (void)updateMessageArray; - (void)playStatusUpdated:(BOOL)b_pause; - (void)setSubmenusEnabled:(BOOL)b_enabled; - (void)manageVolumeSlider; - -- (void)setupMenus:(input_thread_t *)p_input; -- (void)setupLangMenu:(input_thread_t *)p_input - mi:(NSMenuItem *)o_mi - es:(es_descriptor_t *)p_es - category:(int)i_cat - selector:(SEL)pf_callback; -- (void)setupVarMenu:(NSMenuItem *)o_mi - target:(vlc_object_t *)p_object - var:(const char *)psz_var - selector:(SEL)pf_callback; +- (IBAction)timesliderUpdate:(id)sender; - (IBAction)clearRecentItems:(id)sender; - (void)openRecentItem:(id)sender; - (IBAction)viewPreferences:(id)sender; - -- (IBAction)timesliderUpdate:(id)sender; - - (IBAction)closeError:(id)sender; - - (IBAction)openReadMe:(id)sender; +- (IBAction)openDocumentation:(id)sender; - (IBAction)reportABug:(id)sender; - (IBAction)openWebsite:(id)sender; - (IBAction)openLicense:(id)sender;