Skip to content

V
vlc-2-2
Commit 0b7bd6a2 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: redesigned the Open panel to be more suitable for less-skilled users

parent 2c1b14a0
Show whitespace changes
Inline Side-by-side
Showing with 402 additions and 580 deletions
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
View file @ 0b7bd6a2
<?xml version="1.0" encoding="UTF-8"?> {
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> IBClasses = (
<plist version="1.0"> {
<dict> CLASS = FirstResponder;
<key>IBClasses</key> LANGUAGE = ObjC;
<array> SUPERCLASS = NSObject;
<dict> },
<key>ACTIONS</key> {
<dict> CLASS = NSApplication;
<key>eyetvGetPlugin</key> LANGUAGE = ObjC;
<string>id</string> SUPERCLASS = NSResponder;
<key>eyetvLaunch</key> },
<string>id</string> {
<key>eyetvSwitchChannel</key> CLASS = NSObject;
<string>id</string> LANGUAGE = ObjC;
<key>openCaptureModeChanged</key> },
<string>id</string> {
<key>openDisc</key> ACTIONS = {
<string>id</string> eyetvGetPlugin = id;
<key>openDiscMenusChanged</key> eyetvLaunch = id;
<string>id</string> eyetvSwitchChannel = id;
<key>openDiscStepperChanged</key> openCaptureModeChanged = id;
<string>id</string> openDisc = id;
<key>openDiscTypeChanged</key> openDiscMenusChanged = id;
<string>id</string> openDiscStepperChanged = id;
<key>openFile</key> openDiscTypeChanged = id;
<string>id</string> openFile = id;
<key>openFileBrowse</key> openFileBrowse = id;
<string>id</string> openFileGeneric = id;
<key>openFileGeneric</key> openFileStreamChanged = id;
<string>id</string> openNet = id;
<key>openFileStreamChanged</key> openNetModeChanged = id;
<string>id</string> openNetStepperChanged = id;
<key>openNet</key> openNetUDPButtonAction = id;
<string>id</string> openVTSBrowse = id;
<key>openNetModeChanged</key> panelCancel = id;
<string>id</string> panelOk = id;
<key>openNetStepperChanged</key> screenStepperChanged = id;
<string>id</string> subCloseSheet = id;
<key>openVTSBrowse</key> subDelayStepperChanged = id;
<string>id</string> subFileBrowse = id;
<key>panelCancel</key> subFpsStepperChanged = id;
<string>id</string> subOverride = id;
<key>panelOk</key> subSettings = id;
<string>id</string> subsChanged = id;
<key>screenStepperChanged</key> };
<string>id</string> CLASS = VLCOpen;
<key>subCloseSheet</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>subDelayStepperChanged</key> "o_btn_cancel" = id;
<string>id</string> "o_btn_ok" = id;
<key>subFileBrowse</key> "o_capture_label_view" = id;
<string>id</string> "o_capture_lbl" = id;
<key>subFpsStepperChanged</key> "o_capture_long_lbl" = id;
<string>id</string> "o_capture_mode_pop" = id;
<key>subOverride</key> "o_currentCaptureView" = id;
<string>id</string> "o_disc_chapter" = id;
<key>subSettings</key> "o_disc_chapter_lbl" = id;
<string>id</string> "o_disc_chapter_stp" = id;
<key>subsChanged</key> "o_disc_device" = id;
<string>id</string> "o_disc_device_lbl" = id;
</dict> "o_disc_dvd_menus" = id;
<key>CLASS</key> "o_disc_title" = id;
<string>VLCOpen</string> "o_disc_title_lbl" = id;
<key>LANGUAGE</key> "o_disc_title_stp" = id;
<string>ObjC</string> "o_disc_type" = id;
<key>OUTLETS</key> "o_disc_videots_btn_browse" = id;
<dict> "o_disc_videots_folder" = id;
<key>o_btn_cancel</key> "o_eyetv_channels_pop" = id;
<string>id</string> "o_eyetv_chn_bgbar" = id;
<key>o_btn_ok</key> "o_eyetv_chn_status_txt" = id;
<string>id</string> "o_eyetv_currentChannel_lbl" = id;
<key>o_capture_label_view</key> "o_eyetv_getPlugin_btn" = id;
<string>id</string> "o_eyetv_launchEyeTV_btn" = id;
<key>o_capture_lbl</key> "o_eyetv_nextProgram_btn" = id;
<string>id</string> "o_eyetv_noInstanceLong_lbl" = id;
<key>o_capture_long_lbl</key> "o_eyetv_noInstance_lbl" = id;
<string>id</string> "o_eyetv_notLaunched_view" = id;
<key>o_capture_mode_pop</key> "o_eyetv_previousProgram_btn" = id;
<string>id</string> "o_eyetv_running_view" = id;
<key>o_currentCaptureView</key> "o_file_btn_browse" = id;
<string>id</string> "o_file_path" = id;
<key>o_disc_chapter</key> "o_file_stream" = id;
<string>id</string> "o_file_sub_align_lbl" = id;
<key>o_disc_chapter_lbl</key> "o_file_sub_align_pop" = id;
<string>id</string> "o_file_sub_btn_browse" = id;
<key>o_disc_chapter_stp</key> "o_file_sub_btn_settings" = id;
<string>id</string> "o_file_sub_ckbox" = id;
<key>o_disc_device</key> "o_file_sub_delay" = id;
<string>id</string> "o_file_sub_delay_lbl" = id;
<key>o_disc_device_lbl</key> "o_file_sub_delay_stp" = id;
<string>id</string> "o_file_sub_encoding_lbl" = id;
<key>o_disc_dvd_menus</key> "o_file_sub_encoding_pop" = id;
<string>id</string> "o_file_sub_file_box" = id;
<key>o_disc_title</key> "o_file_sub_font_box" = id;
<string>id</string> "o_file_sub_fps" = id;
<key>o_disc_title_lbl</key> "o_file_sub_fps_lbl" = id;
<string>id</string> "o_file_sub_fps_stp" = id;
<key>o_disc_title_stp</key> "o_file_sub_ok_btn" = id;
<string>id</string> "o_file_sub_override" = id;
<key>o_disc_type</key> "o_file_sub_path" = id;
<string>id</string> "o_file_sub_sheet" = id;
<key>o_disc_videots_btn_browse</key> "o_file_sub_size_lbl" = id;
<string>id</string> "o_file_sub_size_pop" = id;
<key>o_disc_videots_folder</key> "o_mrl" = id;
<string>id</string> "o_mrl_lbl" = id;
<key>o_eyetv_channels_pop</key> "o_net_help_lbl" = id;
<string>id</string> "o_net_help_udp_lbl" = id;
<key>o_eyetv_chn_bgbar</key> "o_net_http_url" = id;
<string>id</string> "o_net_http_url_lbl" = id;
<key>o_eyetv_chn_status_txt</key> "o_net_mode" = id;
<string>id</string> "o_net_openUDP_btn" = id;
<key>o_eyetv_currentChannel_lbl</key> "o_net_udp_cancel_btn" = id;
<string>id</string> "o_net_udp_ok_btn" = id;
<key>o_eyetv_getPlugin_btn</key> "o_net_udp_panel" = id;
<string>id</string> "o_net_udp_port" = id;
<key>o_eyetv_launchEyeTV_btn</key> "o_net_udp_port_lbl" = id;
<string>id</string> "o_net_udp_port_stp" = id;
<key>o_eyetv_nextProgram_btn</key> "o_net_udpm_addr" = id;
<string>id</string> "o_net_udpm_addr_lbl" = id;
<key>o_eyetv_noInstanceLong_lbl</key> "o_net_udpm_port" = id;
<string>id</string> "o_net_udpm_port_lbl" = id;
<key>o_eyetv_noInstance_lbl</key> "o_net_udpm_port_stp" = id;
<string>id</string> "o_output_ckbox" = id;
<key>o_eyetv_notLaunched_view</key> "o_panel" = id;
<string>id</string> "o_playlist" = id;
<key>o_eyetv_previousProgram_btn</key> "o_screen_follow_mouse_ckb" = id;
<string>id</string> "o_screen_fps_fld" = id;
<key>o_eyetv_running_view</key> "o_screen_fps_lbl" = id;
<string>id</string> "o_screen_fps_stp" = id;
<key>o_file_btn_browse</key> "o_screen_height_fld" = id;
<string>id</string> "o_screen_height_lbl" = id;
<key>o_file_path</key> "o_screen_height_stp" = id;
<string>id</string> "o_screen_lbl" = id;
<key>o_file_stream</key> "o_screen_left_fld" = id;
<string>id</string> "o_screen_left_lbl" = id;
<key>o_file_sub_align_lbl</key> "o_screen_left_stp" = id;
<string>id</string> "o_screen_long_lbl" = id;
<key>o_file_sub_align_pop</key> "o_screen_top_fld" = id;
<string>id</string> "o_screen_top_lbl" = id;
<key>o_file_sub_btn_browse</key> "o_screen_top_stp" = id;
<string>id</string> "o_screen_view" = id;
<key>o_file_sub_btn_settings</key> "o_screen_width_fld" = id;
<string>id</string> "o_screen_width_lbl" = id;
<key>o_file_sub_ckbox</key> "o_screen_width_stp" = id;
<string>id</string> "o_sout_options" = id;
<key>o_file_sub_delay</key> "o_tabview" = id;
<string>id</string> };
<key>o_file_sub_delay_lbl</key> SUPERCLASS = NSObject;
<string>id</string> },
<key>o_file_sub_delay_stp</key> {
<string>id</string> CLASS = VLCOpenTextField;
<key>o_file_sub_encoding_lbl</key> LANGUAGE = ObjC;
<string>id</string> SUPERCLASS = NSTextField;
<key>o_file_sub_encoding_pop</key> },
<string>id</string> {
<key>o_file_sub_file_box</key> ACTIONS = {
<string>id</string> announceChanged = id;
<key>o_file_sub_font_box</key> outputChanged = id;
<string>id</string> outputCloseSheet = id;
<key>o_file_sub_fps</key> outputFileBrowse = id;
<string>id</string> outputInfoChanged = id;
<key>o_file_sub_fps_lbl</key> outputMethodChanged = id;
<string>id</string> outputSettings = id;
<key>o_file_sub_fps_stp</key> streamPortStepperChanged = id;
<string>id</string> streamTTLStepperChanged = id;
<key>o_file_sub_ok_btn</key> transcodeChanged = id;
<string>id</string> transcodeInfoChanged = id;
<key>o_file_sub_override</key> };
<string>id</string> CLASS = VLCOutput;
<key>o_file_sub_path</key> LANGUAGE = ObjC;
<string>id</string> OUTLETS = {
<key>o_file_sub_sheet</key> "o_btn_browse" = id;
<string>id</string> "o_btn_ok" = id;
<key>o_file_sub_size_lbl</key> "o_channel_name" = id;
<string>id</string> "o_channel_name_lbl" = id;
<key>o_file_sub_size_pop</key> "o_display" = id;
<string>id</string> "o_dump_chkbox" = id;
<key>o_mrl</key> "o_file_chkbox" = id;
<string>id</string> "o_file_field" = id;
<key>o_mrl_lbl</key> "o_http_chkbox" = id;
<string>id</string> "o_method" = id;
<key>o_net_http_url</key> "o_misc_lbl" = id;
<string>id</string> "o_mux_lbl" = id;
<key>o_net_http_url_lbl</key> "o_mux_selector" = id;
<string>id</string> "o_open_panel" = id;
<key>o_net_mode</key> "o_options_lbl" = id;
<string>id</string> "o_output_ckbox" = id;
<key>o_net_timeshift_ckbox</key> "o_output_settings" = id;
<string>id</string> "o_output_sheet" = id;
<key>o_net_udp_port</key> "o_rtsp_chkbox" = id;
<string>id</string> "o_sap_chkbox" = id;
<key>o_net_udp_port_lbl</key> "o_sdp_url" = id;
<string>id</string> "o_sdp_url_lbl" = id;
<key>o_net_udp_port_stp</key> "o_stream_address" = id;
<string>id</string> "o_stream_address_lbl" = id;
<key>o_net_udpm_addr</key> "o_stream_port" = id;
<string>id</string> "o_stream_port_lbl" = id;
<key>o_net_udpm_addr_lbl</key> "o_stream_port_stp" = id;
<string>id</string> "o_stream_ttl" = id;
<key>o_net_udpm_port</key> "o_stream_ttl_lbl" = id;
<string>id</string> "o_stream_ttl_stp" = id;
<key>o_net_udpm_port_lbl</key> "o_stream_type" = id;
<string>id</string> "o_stream_type_lbl" = id;
<key>o_net_udpm_port_stp</key> "o_transcode_audio_bitrate" = id;
<string>id</string> "o_transcode_audio_bitrate_lbl" = id;
<key>o_output_ckbox</key> "o_transcode_audio_channels" = id;
<string>id</string> "o_transcode_audio_channels_lbl" = id;
<key>o_panel</key> "o_transcode_audio_chkbox" = id;
<string>id</string> "o_transcode_audio_selector" = id;
<key>o_playlist</key> "o_transcode_lbl" = id;
<string>id</string> "o_transcode_video_bitrate" = id;
<key>o_screen_follow_mouse_ckb</key> "o_transcode_video_bitrate_lbl" = id;
<string>id</string> "o_transcode_video_chkbox" = id;
<key>o_screen_fps_fld</key> "o_transcode_video_scale" = id;
<string>id</string> "o_transcode_video_scale_lbl" = id;
<key>o_screen_fps_lbl</key> "o_transcode_video_selector" = id;
<string>id</string> };
<key>o_screen_fps_stp</key> SUPERCLASS = NSObject;
<string>id</string> },
<key>o_screen_height_fld</key> {
<string>id</string> ACTIONS = {
<key>o_screen_height_lbl</key> addNode = id;
<string>id</string> deleteItem = id;
<key>o_screen_height_stp</key> downloadCoverArt = id;
<string>id</string> playItem = id;
<key>o_screen_lbl</key> preparseItem = id;
<string>id</string> recursiveExpandNode = id;
<key>o_screen_left_fld</key> revealItemInFinder = id;
<string>id</string> savePlaylist = id;
<key>o_screen_left_lbl</key> searchItem = id;
<string>id</string> selectAll = id;
<key>o_screen_left_stp</key> servicesChange = id;
<string>id</string> sortNodeByAuthor = id;
<key>o_screen_long_lbl</key> sortNodeByName = id;
<string>id</string> };
<key>o_screen_top_fld</key> CLASS = VLCPlaylist;
<string>id</string> LANGUAGE = ObjC;
<key>o_screen_top_lbl</key> OUTLETS = {
<string>id</string> "o_btn_addNode" = id;
<key>o_screen_top_stp</key> "o_btn_playlist" = id;
<string>id</string> "o_controller" = id;
<key>o_screen_view</key> "o_ctx_menu" = id;
<string>id</string> "o_mi_addNode" = id;
<key>o_screen_width_fld</key> "o_mi_delete" = id;
<string>id</string> "o_mi_dl_cover_art" = id;
<key>o_screen_width_lbl</key> "o_mi_info" = id;
<string>id</string> "o_mi_play" = id;
<key>o_screen_width_stp</key> "o_mi_preparse" = id;
<string>id</string> "o_mi_recursive_expand" = id;
<key>o_sout_options</key> "o_mi_revealInFinder" = id;
<string>id</string> "o_mi_save_playlist" = id;
<key>o_tabview</key> "o_mi_selectall" = id;
<string>id</string> "o_mi_services" = id;
</dict> "o_mi_sort_author" = id;
<key>SUPERCLASS</key> "o_mi_sort_name" = id;
<string>NSObject</string> "o_mm_mi_revealInFinder" = id;
</dict> "o_mm_mi_services" = id;
<dict> "o_mm_mu_services" = id;
<key>CLASS</key> "o_mu_services" = id;
<string>VLCPlaylistCommon</string> "o_playlist_view" = id;
<key>LANGUAGE</key> "o_playlist_wizard" = id;
<string>ObjC</string> "o_save_accessory_popup" = id;
<key>OUTLETS</key> "o_save_accessory_text" = id;
<dict> "o_save_accessory_view" = id;
<key>o_outline_view</key> "o_search_field" = id;
<string>id</string> "o_status_field" = id;
<key>o_tc_author</key> "o_tc_sortColumn" = id;
<string>id</string> };
<key>o_tc_duration</key> SUPERCLASS = VLCPlaylistCommon;
<string>id</string> },
<key>o_tc_name</key> {
<string>id</string> CLASS = VLCPlaylistCommon;
</dict> LANGUAGE = ObjC;
<key>SUPERCLASS</key> OUTLETS = {
<string>NSObject</string> "o_outline_view" = id;
</dict> "o_tc_author" = id;
<dict> "o_tc_duration" = id;
<key>CLASS</key> "o_tc_name" = id;
<string>VLCOpenTextField</string> };
<key>LANGUAGE</key> SUPERCLASS = NSObject;
<string>ObjC</string> }
<key>SUPERCLASS</key> );
<string>NSTextField</string> IBVersion = 1;
</dict> }
<dict> \ No newline at end of file
<key>ACTIONS</key>
<dict>
<key>announceChanged</key>
<string>id</string>
<key>outputChanged</key>
<string>id</string>
<key>outputCloseSheet</key>
<string>id</string>
<key>outputFileBrowse</key>
<string>id</string>
<key>outputInfoChanged</key>
<string>id</string>
<key>outputMethodChanged</key>
<string>id</string>
<key>outputSettings</key>
<string>id</string>
<key>streamPortStepperChanged</key>
<string>id</string>
<key>streamTTLStepperChanged</key>
<string>id</string>
<key>transcodeChanged</key>
<string>id</string>
<key>transcodeInfoChanged</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCOutput</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_browse</key>
<string>id</string>
<key>o_btn_ok</key>
<string>id</string>
<key>o_channel_name</key>
<string>id</string>
<key>o_channel_name_lbl</key>
<string>id</string>
<key>o_display</key>
<string>id</string>
<key>o_dump_chkbox</key>
<string>id</string>
<key>o_file_chkbox</key>
<string>id</string>
<key>o_file_field</key>
<string>id</string>
<key>o_http_chkbox</key>
<string>id</string>
<key>o_method</key>
<string>id</string>
<key>o_misc_lbl</key>
<string>id</string>
<key>o_mux_lbl</key>
<string>id</string>
<key>o_mux_selector</key>
<string>id</string>
<key>o_open_panel</key>
<string>id</string>
<key>o_options_lbl</key>
<string>id</string>
<key>o_output_ckbox</key>
<string>id</string>
<key>o_output_settings</key>
<string>id</string>
<key>o_output_sheet</key>
<string>id</string>
<key>o_rtsp_chkbox</key>
<string>id</string>
<key>o_sap_chkbox</key>
<string>id</string>
<key>o_sdp_url</key>
<string>id</string>
<key>o_sdp_url_lbl</key>
<string>id</string>
<key>o_stream_address</key>
<string>id</string>
<key>o_stream_address_lbl</key>
<string>id</string>
<key>o_stream_port</key>
<string>id</string>
<key>o_stream_port_lbl</key>
<string>id</string>
<key>o_stream_port_stp</key>
<string>id</string>
<key>o_stream_ttl</key>
<string>id</string>
<key>o_stream_ttl_lbl</key>
<string>id</string>
<key>o_stream_ttl_stp</key>
<string>id</string>
<key>o_stream_type</key>
<string>id</string>
<key>o_stream_type_lbl</key>
<string>id</string>
<key>o_transcode_audio_bitrate</key>
<string>id</string>
<key>o_transcode_audio_bitrate_lbl</key>
<string>id</string>
<key>o_transcode_audio_channels</key>
<string>id</string>
<key>o_transcode_audio_channels_lbl</key>
<string>id</string>
<key>o_transcode_audio_chkbox</key>
<string>id</string>
<key>o_transcode_audio_selector</key>
<string>id</string>
<key>o_transcode_lbl</key>
<string>id</string>
<key>o_transcode_video_bitrate</key>
<string>id</string>
<key>o_transcode_video_bitrate_lbl</key>
<string>id</string>
<key>o_transcode_video_chkbox</key>
<string>id</string>
<key>o_transcode_video_scale</key>
<string>id</string>
<key>o_transcode_video_scale_lbl</key>
<string>id</string>
<key>o_transcode_video_selector</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSApplication</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSResponder</string>
</dict>
<dict>
<key>CLASS</key>
<string>FirstResponder</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>SUPERCLASS</key>
<string>NSObject</string>
</dict>
<dict>
<key>CLASS</key>
<string>NSObject</string>
<key>LANGUAGE</key>
<string>ObjC</string>
</dict>
<dict>
<key>ACTIONS</key>
<dict>
<key>addNode</key>
<string>id</string>
<key>deleteItem</key>
<string>id</string>
<key>downloadCoverArt</key>
<string>id</string>
<key>playItem</key>
<string>id</string>
<key>preparseItem</key>
<string>id</string>
<key>recursiveExpandNode</key>
<string>id</string>
<key>revealItemInFinder</key>
<string>id</string>
<key>savePlaylist</key>
<string>id</string>
<key>searchItem</key>
<string>id</string>
<key>selectAll</key>
<string>id</string>
<key>servicesChange</key>
<string>id</string>
<key>sortNodeByAuthor</key>
<string>id</string>
<key>sortNodeByName</key>
<string>id</string>
</dict>
<key>CLASS</key>
<string>VLCPlaylist</string>
<key>LANGUAGE</key>
<string>ObjC</string>
<key>OUTLETS</key>
<dict>
<key>o_btn_addNode</key>
<string>id</string>
<key>o_btn_playlist</key>
<string>id</string>
<key>o_controller</key>
<string>id</string>
<key>o_ctx_menu</key>
<string>id</string>
<key>o_mi_addNode</key>
<string>id</string>
<key>o_mi_delete</key>
<string>id</string>
<key>o_mi_dl_cover_art</key>
<string>id</string>
<key>o_mi_info</key>
<string>id</string>
<key>o_mi_play</key>
<string>id</string>
<key>o_mi_preparse</key>
<string>id</string>
<key>o_mi_recursive_expand</key>
<string>id</string>
<key>o_mi_revealInFinder</key>
<string>id</string>
<key>o_mi_save_playlist</key>
<string>id</string>
<key>o_mi_selectall</key>
<string>id</string>
<key>o_mi_services</key>
<string>id</string>
<key>o_mi_sort_author</key>
<string>id</string>
<key>o_mi_sort_name</key>
<string>id</string>
<key>o_mm_mi_revealInFinder</key>
<string>id</string>
<key>o_mm_mi_services</key>
<string>id</string>
<key>o_mm_mu_services</key>
<string>id</string>
<key>o_mu_services</key>
<string>id</string>
<key>o_playlist_view</key>
<string>id</string>
<key>o_playlist_wizard</key>
<string>id</string>
<key>o_save_accessory_popup</key>
<string>id</string>
<key>o_save_accessory_text</key>
<string>id</string>
<key>o_save_accessory_view</key>
<string>id</string>
<key>o_search_field</key>
<string>id</string>
<key>o_status_field</key>
<string>id</string>
<key>o_tc_sortColumn</key>
<string>id</string>
</dict>
<key>SUPERCLASS</key>
<string>VLCPlaylistCommon</string>
</dict>
</array>
<key>IBVersion</key>
<string>1</string>
</dict>
</plist>
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
View file @ 0b7bd6a2
...@@ -2,14 +2,24 @@ ...@@ -2,14 +2,24 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>IBDocumentLocation</key>
<string>97 169 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>2297</key>
<string>366 401 548 264 0 0 1280 778 </string>
<key>2346</key>
<string>366 401 548 264 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key> <key>IBFramework Version</key>
<string>677</string> <string>489.0</string>
<key>IBOldestOS</key> <key>IBOldestOS</key>
<integer>5</integer> <integer>5</integer>
<key>IBOpenObjects</key> <key>IBOpenObjects</key>
<array> <array>
<integer>2346</integer> <integer>2346</integer>
<integer>683</integer> <integer>636</integer>
<integer>2792</integer>
<integer>2297</integer> <integer>2297</integer>
</array> </array>
<key>IBSystem Version</key> <key>IBSystem Version</key>
......
modules/gui/macosx/open.h
View file @ 0b7bd6a2
/***************************************************************************** /*****************************************************************************
* open.h: MacOS X module for vlc * open.h: Open dialogues for VLC's MacOS X port
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2008 the VideoLAN team * Copyright (C) 2002-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <thedj@users.sourceforge.net> * Derk-Jan Hartman <thedj@users.sourceforge.net>
* Felix Kühne <fkuehne at videolan dot org> * Felix Paul Kühne <fkuehne at videolan dot org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -65,7 +65,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -65,7 +65,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_disc_dvd_menus; IBOutlet id o_disc_dvd_menus;
/* open network */ /* open network */
IBOutlet id o_net_help_lbl;
IBOutlet id o_net_help_udp_lbl;
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
IBOutlet id o_net_mode; IBOutlet id o_net_mode;
IBOutlet id o_net_openUDP_btn;
IBOutlet id o_net_udp_cancel_btn;
IBOutlet id o_net_udp_ok_btn;
IBOutlet id o_net_udp_panel;
IBOutlet id o_net_udp_port; IBOutlet id o_net_udp_port;
IBOutlet id o_net_udp_port_lbl; IBOutlet id o_net_udp_port_lbl;
IBOutlet id o_net_udp_port_stp; IBOutlet id o_net_udp_port_stp;
...@@ -74,8 +82,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -74,8 +82,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
IBOutlet id o_net_udpm_port; IBOutlet id o_net_udpm_port;
IBOutlet id o_net_udpm_port_lbl; IBOutlet id o_net_udpm_port_lbl;
IBOutlet id o_net_udpm_port_stp; IBOutlet id o_net_udpm_port_stp;
IBOutlet id o_net_http_url;
IBOutlet id o_net_http_url_lbl;
/* open subtitle file */ /* open subtitle file */
IBOutlet id o_file_sub_ckbox; IBOutlet id o_file_sub_ckbox;
...@@ -170,6 +176,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); ...@@ -170,6 +176,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
- (IBAction)openNetModeChanged:(id)sender; - (IBAction)openNetModeChanged:(id)sender;
- (IBAction)openNetStepperChanged:(id)sender; - (IBAction)openNetStepperChanged:(id)sender;
- (void)openNetInfoChanged:(NSNotification *)o_notification; - (void)openNetInfoChanged:(NSNotification *)o_notification;
- (IBAction)openNetUDPButtonAction:(id)sender;
- (void)openCapture; - (void)openCapture;
- (void)showCaptureView: theView; - (void)showCaptureView: theView;
......
modules/gui/macosx/open.m
View file @ 0b7bd6a2
/***************************************************************************** /*****************************************************************************
* open.m: MacOS X module for vlc * open.m: Open dialogues for VLC's MacOS X port
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2008 the VideoLAN team * Copyright (C) 2002-2009 the VideoLAN team
* $Id$ * $Id$
* *
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <thedj@users.sourceforge.net> * Derk-Jan Hartman <thedj@users.sourceforge.net>
* Benjamin Pracht <bigben at videolan dot org> * Benjamin Pracht <bigben at videolan dot org>
* Felix Kühne <fkuehne at videolan dot org> * Felix Paul Kühne <fkuehne at videolan dot org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -163,7 +163,7 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -163,7 +163,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_panel setTitle: _NS("Open Source")]; [o_panel setTitle: _NS("Open Source")];
[o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")]; [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
[o_btn_ok setTitle: _NS("OK")]; [o_btn_ok setTitle: _NS("Open")];
[o_btn_cancel setTitle: _NS("Cancel")]; [o_btn_cancel setTitle: _NS("Cancel")];
[[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")]; [[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")];
...@@ -180,19 +180,23 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -180,19 +180,23 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_disc_videots_btn_browse setTitle: _NS("Browse...")]; [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
[o_disc_dvd_menus setTitle: _NS("No DVD menus")]; [o_disc_dvd_menus setTitle: _NS("No DVD menus")];
[[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS directory")]; [[o_disc_type cellAtRow:0 column:0] setTitle: _NS("VIDEO_TS folder")];
[[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")]; [[o_disc_type cellAtRow:1 column:0] setTitle: _NS("DVD")];
[[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")]; [[o_disc_type cellAtRow:2 column:0] setTitle: _NS("VCD")];
[[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")]; [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")];
[o_net_udp_port_lbl setStringValue: _NS("Port")]; [o_net_udp_port_lbl setStringValue: _NS("Port")];
[o_net_udpm_addr_lbl setStringValue: _NS("Address")]; [o_net_udpm_addr_lbl setStringValue: _NS("IP Address")];
[o_net_udpm_port_lbl setStringValue: _NS("Port")]; [o_net_udpm_port_lbl setStringValue: _NS("Port")];
[o_net_http_url_lbl setStringValue: _NS("URL")]; [o_net_http_url_lbl setStringValue: _NS("URL")];
[o_net_help_lbl setStringValue: _NS("To Open a usual network stream (HTTP, RTSP, MMS, FTP, etc.), just enter the URL in the field above. If you want to open a RTP or UDP stream, press the button below.")];
[o_net_help_udp_lbl setStringValue: _NS("If you want to open a multicast stream, enter the respective IP address given by the stream provider. In unicast mode, VLC use your machine's IP automatically.\n\nTo open a stream using a different protocol, just press Cancel to close this sheet.")];
[o_net_udp_cancel_btn setTitle: _NS("Cancel")];
[o_net_udp_ok_btn setTitle: _NS("Open")];
[o_net_openUDP_btn setTitle: _NS("Open RTP/UDP Stream")];
[[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")]; [[o_net_mode cellAtRow:0 column:0] setTitle: _NS("UDP/RTP")];
[[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")]; [[o_net_mode cellAtRow:1 column:0] setTitle: _NS("UDP/RTP Multicast")];
[[o_net_mode cellAtRow:2 column:0] setTitle: _NS("HTTP/FTP/MMS/RTSP")];
[o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port setIntValue: config_GetInt( p_intf, "server-port" )];
[o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )];
...@@ -200,7 +204,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -200,7 +204,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_eyetv_chn_bgbar setUsesThreadedAnimation: YES]; [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
[o_capture_mode_pop removeAllItems]; [o_capture_mode_pop removeAllItems];
if( MACOS_VERSION > 10.4f )
[o_capture_mode_pop addItemWithTitle: @"iSight"]; [o_capture_mode_pop addItemWithTitle: @"iSight"];
[o_capture_mode_pop addItemWithTitle: _NS("Screen")]; [o_capture_mode_pop addItemWithTitle: _NS("Screen")];
[o_capture_mode_pop addItemWithTitle: @"EyeTV"]; [o_capture_mode_pop addItemWithTitle: @"EyeTV"];
...@@ -729,7 +732,8 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -729,7 +732,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
else if ( [[sender selectedCell] tag] == 1 ) else if ( [[sender selectedCell] tag] == 1 )
[o_panel makeFirstResponder: o_net_udpm_addr]; [o_panel makeFirstResponder: o_net_udpm_addr];
else else
[o_panel makeFirstResponder: o_net_http_url]; msg_Warn( p_intf, "Unknown sender tried to change UDP/RTP mode" );
[self openNetInfoChanged: nil]; [self openNetInfoChanged: nil];
} }
...@@ -758,9 +762,11 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -758,9 +762,11 @@ static VLCOpen *_o_sharedMainInstance = nil;
- (void)openNetInfoChanged:(NSNotification *)o_notification - (void)openNetInfoChanged:(NSNotification *)o_notification
{ {
NSString *o_mode;
NSString *o_mrl_string = [NSString string]; NSString *o_mrl_string = [NSString string];
if( [o_net_udp_panel isVisible] )
{
NSString *o_mode;
o_mode = [[o_net_mode selectedCell] title]; o_mode = [[o_net_mode selectedCell] title];
if( [o_mode isEqualToString: _NS("UDP/RTP")] ) if( [o_mode isEqualToString: _NS("UDP/RTP")] )
...@@ -788,7 +794,8 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -788,7 +794,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_mrl_string stringByAppendingFormat: @":%i", i_port]; [o_mrl_string stringByAppendingFormat: @":%i", i_port];
} }
} }
else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] ) }
else
{ {
NSString *o_url = [o_net_http_url stringValue]; NSString *o_url = [o_net_http_url stringValue];
...@@ -801,6 +808,55 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -801,6 +808,55 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_mrl setStringValue: o_mrl_string]; [o_mrl setStringValue: o_mrl_string];
} }
- (IBAction)openNetUDPButtonAction:(id)sender
{
if( sender == o_net_openUDP_btn )
{
[NSApp beginSheet: o_net_udp_panel
modalForWindow: o_panel
modalDelegate: self
didEndSelector: NULL
contextInfo: nil];
}
else if( sender == o_net_udp_cancel_btn )
{
[o_net_udp_panel orderOut: sender];
[NSApp endSheet: o_net_udp_panel];
}
else if( sender == o_net_udp_ok_btn )
{
NSString *o_mrl_string = [NSString string];
if( [[[o_net_mode selectedCell] title] isEqualToString: _NS("UDP/RTP")] )
{
int i_port = [o_net_udp_port intValue];
o_mrl_string = [NSString stringWithString: @"udp://"];
if( i_port != config_GetInt( p_intf, "server-port" ) )
{
o_mrl_string =
[o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
}
}
else if( [[[o_net_mode selectedCell] title] isEqualToString: _NS("UDP/RTP Multicast")] )
{
NSString *o_addr = [o_net_udpm_addr stringValue];
int i_port = [o_net_udpm_port intValue];
o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
if( i_port != config_GetInt( p_intf, "server-port" ) )
{
o_mrl_string =
[o_mrl_string stringByAppendingFormat: @":%i", i_port];
}
}
[o_mrl setStringValue: o_mrl_string];
[o_net_udp_panel orderOut: sender];
[NSApp endSheet: o_net_udp_panel];
}
}
- (void)openFile - (void)openFile
{ {
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
...@@ -1034,6 +1090,12 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -1034,6 +1090,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
contextInfo: nil]; contextInfo: nil];
} }
- (IBAction)subCloseSheet:(id)sender
{
[o_file_sub_sheet orderOut:sender];
[NSApp endSheet: o_file_sub_sheet];
}
- (IBAction)subFileBrowse:(id)sender - (IBAction)subFileBrowse:(id)sender
{ {
NSOpenPanel *o_open_panel = [NSOpenPanel openPanel]; NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
...@@ -1069,12 +1131,6 @@ static VLCOpen *_o_sharedMainInstance = nil; ...@@ -1069,12 +1131,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
[o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]]; [o_file_sub_fps setFloatValue: [o_file_sub_fps_stp floatValue]];
} }
- (IBAction)subCloseSheet:(id)sender
{
[o_file_sub_sheet orderOut:sender];
[NSApp endSheet: o_file_sub_sheet];
}
- (IBAction)panelCancel:(id)sender - (IBAction)panelCancel:(id)sender
{ {
[NSApp stopModalWithCode: 0]; [NSApp stopModalWithCode: 0];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment