From: Felix Paul Kühne Date: Thu, 12 Jun 2008 17:38:39 +0000 (+0200) Subject: Redesign the Capture Device panel X-Git-Tag: 0.9.0-test0~190 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6a5fc04ec3b5e2e52a28c43bfac4d3b8587422f2;p=vlc Redesign the Capture Device panel Complete l10n to be done later on --- diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib index 82f87a1b51..5230aa6fc6 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib @@ -186,6 +186,7 @@ ACTIONS = { checkForUpdate = id; clearRecentItems = id; + intfOpenCapture = id; intfOpenDisc = id; intfOpenFile = id; intfOpenFileGeneric = id; @@ -286,6 +287,7 @@ "o_mi_mute" = id; "o_mi_next" = id; "o_mi_normal_window" = id; + "o_mi_open_capture" = id; "o_mi_open_disc" = id; "o_mi_open_file" = id; "o_mi_open_generic" = id; diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib index ee758aaf7d..387d196648 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib @@ -4,6 +4,11 @@ IBDocumentLocation 429 441 496 337 0 0 1280 778 + IBEditorPositions + + 29 + 64 734 438 44 0 0 1280 778 + IBFramework Version 489.0 IBLastKnownRelativeProjectPath @@ -12,6 +17,7 @@ 5 IBOpenObjects + 29 21 2416 diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib index e922282287..c72596d082 100644 Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib index 5d291c2869..76fb35810c 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib @@ -1,426 +1,479 @@ { - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, - { - ACTIONS = {showPanel = id; }; - CLASS = VLAboutBox; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, - {CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, - {CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, - {CLASS = VLCControllerWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, - { - ACTIONS = { - backward = id; - faster = id; - forward = id; - loop = id; - mute = id; - next = id; - pause = id; - play = id; - position = id; - prev = id; - random = id; - repeat = id; - slower = id; - stop = id; - toggleVar = id; - volumeDown = id; - volumeSliderUpdated = id; - volumeUp = id; - windowAction = id; - }; - CLASS = VLCControls; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_fullscreen" = id; - "o_main" = id; - "o_open" = id; - "o_volumeslider" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - bandSliderUpdated = id; - changePreset = id; - enable = id; - preampSliderUpdated = id; - toggleWindow = id; - twopass = id; - }; - CLASS = VLCEqualizer; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_equalizer" = id; - "o_ckb_2pass" = id; - "o_ckb_enable" = id; - "o_fld_preamp" = id; - "o_popup_presets" = id; - "o_slider_band1" = id; - "o_slider_band10" = id; - "o_slider_band2" = id; - "o_slider_band3" = id; - "o_slider_band4" = id; - "o_slider_band5" = id; - "o_slider_band6" = id; - "o_slider_band7" = id; - "o_slider_band8" = id; - "o_slider_band9" = id; - "o_slider_preamp" = id; - "o_window" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - createOutlineGroup = id; - deleteOutlineGroup = id; - infoCancel = id; - infoOk = id; - toggleInfoPanel = id; - togglePlaylistInfoPanel = id; - }; - CLASS = VLCInfo; - LANGUAGE = ObjC; - OUTLETS = { - "o_author_lbl" = id; - "o_author_txt" = id; - "o_btn_cancel" = id; - "o_btn_ok" = id; - "o_info_window" = id; - "o_outline_view" = id; - "o_title_lbl" = id; - "o_title_txt" = id; - "o_uri_lbl" = id; - "o_uri_txt" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - clearRecentItems = id; - closeError = id; - openCrashLog = id; - openDocumentation = id; - openLicense = id; - openReadMe = id; - openRecentItem = id; - openWebsite = id; - reportABug = id; - timesliderUpdate = id; - viewAbout = id; - viewPreferences = id; - }; - CLASS = VLCMain; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_ff" = id; - "o_btn_fullscreen" = id; - "o_btn_next" = id; - "o_btn_play" = id; - "o_btn_prev" = id; - "o_btn_rewind" = id; - "o_btn_stop" = id; - "o_controls" = id; - "o_dmi_mute" = id; - "o_dmi_next" = id; - "o_dmi_play" = id; - "o_dmi_previous" = id; - "o_dmi_stop" = id; - "o_err_btn_dismiss" = id; - "o_err_btn_msgs" = id; - "o_err_bug_lbl" = id; - "o_err_ckbk_surpress" = id; - "o_err_lbl" = id; - "o_err_msg" = id; - "o_error" = id; - "o_info" = id; - "o_messages" = id; - "o_mi_about" = id; - "o_mi_add_intf" = id; - "o_mi_audiotrack" = id; - "o_mi_bring_atf" = id; - "o_mi_bwd" = id; - "o_mi_channels" = id; - "o_mi_chapter" = id; - "o_mi_clear" = id; - "o_mi_close_window" = id; - "o_mi_controller" = id; - "o_mi_copy" = id; - "o_mi_cut" = id; - "o_mi_deinterlace" = id; - "o_mi_device" = id; - "o_mi_documentation" = id; - "o_mi_double_window" = id; - "o_mi_equalizer" = id; - "o_mi_faster" = id; - "o_mi_ffmpeg_pp" = id; - "o_mi_fittoscreen" = id; - "o_mi_floatontop" = id; - "o_mi_fullscreen" = id; - "o_mi_fwd" = id; - "o_mi_half_window" = id; - "o_mi_hide" = id; - "o_mi_hide_others" = id; - "o_mi_info" = id; - "o_mi_license" = id; - "o_mi_loop" = id; - "o_mi_messages" = id; - "o_mi_minimize" = id; - "o_mi_mute" = id; - "o_mi_next" = id; - "o_mi_normal_window" = id; - "o_mi_open_disc" = id; - "o_mi_open_file" = id; - "o_mi_open_generic" = id; - "o_mi_open_net" = id; - "o_mi_open_recent" = id; - "o_mi_open_recent_cm" = id; - "o_mi_paste" = id; - "o_mi_play" = id; - "o_mi_playlist" = id; - "o_mi_prefs" = id; - "o_mi_previous" = id; - "o_mi_program" = id; - "o_mi_quit" = id; - "o_mi_random" = id; - "o_mi_readme" = id; - "o_mi_repeat" = id; - "o_mi_reportabug" = id; - "o_mi_screen" = id; - "o_mi_select_all" = id; - "o_mi_services" = id; - "o_mi_show_all" = id; - "o_mi_slower" = id; - "o_mi_snapshot" = id; - "o_mi_stop" = id; - "o_mi_subtitle" = id; - "o_mi_title" = id; - "o_mi_videotrack" = id; - "o_mi_visual" = id; - "o_mi_vol_down" = id; - "o_mi_vol_up" = id; - "o_mi_website" = id; - "o_msgs_btn_crashlog" = id; - "o_msgs_panel" = id; - "o_mu_add_intf" = id; - "o_mu_audio" = id; - "o_mu_audiotrack" = id; - "o_mu_channels" = id; - "o_mu_chapter" = id; - "o_mu_controls" = id; - "o_mu_deinterlace" = id; - "o_mu_device" = id; - "o_mu_edit" = id; - "o_mu_ffmpeg_pp" = id; - "o_mu_file" = id; - "o_mu_help" = id; - "o_mu_program" = id; - "o_mu_screen" = id; - "o_mu_subtitle" = id; - "o_mu_title" = id; - "o_mu_video" = id; - "o_mu_videotrack" = id; - "o_mu_visual" = id; - "o_mu_window" = id; - "o_playlist" = id; - "o_scrollfield" = id; - "o_timefield" = id; - "o_timeslider" = id; - "o_volumeslider" = id; - "o_window" = id; - }; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - eyetvLaunch = id; - eyetvSwitchChannel = id; - openDisc = id; - openDiscMenusChanged = id; - openDiscStepperChanged = id; - openDiscTypeChanged = id; - openFile = id; - openFileBrowse = id; - openFileGeneric = id; - openFileStreamChanged = id; - openNet = id; - openNetModeChanged = id; - openNetStepperChanged = id; - openVTSBrowse = id; - panelCancel = id; - panelOk = id; - subCloseSheet = id; - subDelayStepperChanged = id; - subFileBrowse = id; - subFpsStepperChanged = id; - subOverride = id; - subSettings = id; - subsChanged = id; - }; - CLASS = VLCOpen; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_cancel" = id; - "o_btn_ok" = id; - "o_disc_chapter" = id; - "o_disc_chapter_lbl" = id; - "o_disc_chapter_stp" = id; - "o_disc_device" = id; - "o_disc_device_lbl" = id; - "o_disc_dvd_menus" = id; - "o_disc_title" = id; - "o_disc_title_lbl" = id; - "o_disc_title_stp" = id; - "o_disc_type" = id; - "o_disc_videots_btn_browse" = id; - "o_disc_videots_folder" = id; - "o_eyetv_channels_pop" = id; - "o_eyetv_chn_bgbar" = id; - "o_eyetv_chn_status_txt" = id; - "o_eyetv_currentChannel_lbl" = id; - "o_eyetv_launchEyeTV_btn" = id; - "o_eyetv_nextProgram_btn" = id; - "o_eyetv_noDeviceLong_lbl" = id; - "o_eyetv_noDevice_lbl" = id; - "o_eyetv_noEyeTVLong_lbl" = id; - "o_eyetv_noEyeTV_lbl" = id; - "o_eyetv_previousProgram_btn" = id; - "o_eyetv_tabView" = id; - "o_file_btn_browse" = id; - "o_file_path" = id; - "o_file_stream" = id; - "o_file_sub_align_lbl" = id; - "o_file_sub_align_pop" = id; - "o_file_sub_btn_browse" = id; - "o_file_sub_btn_settings" = id; - "o_file_sub_ckbox" = id; - "o_file_sub_delay" = id; - "o_file_sub_delay_lbl" = id; - "o_file_sub_delay_stp" = id; - "o_file_sub_encoding_lbl" = id; - "o_file_sub_encoding_pop" = id; - "o_file_sub_file_box" = id; - "o_file_sub_font_box" = id; - "o_file_sub_fps" = id; - "o_file_sub_fps_lbl" = id; - "o_file_sub_fps_stp" = id; - "o_file_sub_ok_btn" = id; - "o_file_sub_override" = id; - "o_file_sub_path" = id; - "o_file_sub_sheet" = id; - "o_file_sub_size_lbl" = id; - "o_file_sub_size_pop" = id; - "o_mrl" = id; - "o_mrl_lbl" = id; - "o_net_http_url" = id; - "o_net_http_url_lbl" = id; - "o_net_mode" = id; - "o_net_timeshift_ckbox" = id; - "o_net_udp_port" = id; - "o_net_udp_port_lbl" = id; - "o_net_udp_port_stp" = id; - "o_net_udpm_addr" = id; - "o_net_udpm_addr_lbl" = id; - "o_net_udpm_port" = id; - "o_net_udpm_port_lbl" = id; - "o_net_udpm_port_stp" = id; - "o_output_ckbox" = id; - "o_panel" = id; - "o_playlist" = id; - "o_sout_options" = id; - "o_tabview" = id; - }; - SUPERCLASS = NSObject; - }, - {CLASS = VLCOpenTextField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, - { - ACTIONS = { - announceChanged = id; - outputChanged = id; - outputCloseSheet = id; - outputFileBrowse = id; - outputInfoChanged = id; - outputMethodChanged = id; - outputSettings = id; - streamPortStepperChanged = id; - streamTTLStepperChanged = id; - transcodeChanged = id; - transcodeInfoChanged = id; - }; - CLASS = VLCOutput; - LANGUAGE = ObjC; - OUTLETS = { - "o_btn_browse" = id; - "o_btn_ok" = id; - "o_channel_name" = id; - "o_channel_name_lbl" = id; - "o_display" = id; - "o_dump_chkbox" = id; - "o_file_chkbox" = id; - "o_file_field" = id; - "o_http_chkbox" = id; - "o_method" = id; - "o_misc_lbl" = id; - "o_mux_lbl" = id; - "o_mux_selector" = id; - "o_open_panel" = id; - "o_options_lbl" = id; - "o_output_ckbox" = id; - "o_output_settings" = id; - "o_output_sheet" = id; - "o_rtsp_chkbox" = id; - "o_sap_chkbox" = id; - "o_sdp_url" = id; - "o_sdp_url_lbl" = id; - "o_stream_address" = id; - "o_stream_address_lbl" = id; - "o_stream_port" = id; - "o_stream_port_lbl" = id; - "o_stream_port_stp" = id; - "o_stream_ttl" = id; - "o_stream_ttl_lbl" = id; - "o_stream_ttl_stp" = id; - "o_stream_type" = id; - "o_stream_type_lbl" = id; - "o_transcode_audio_bitrate" = id; - "o_transcode_audio_bitrate_lbl" = id; - "o_transcode_audio_channels" = id; - "o_transcode_audio_channels_lbl" = id; - "o_transcode_audio_chkbox" = id; - "o_transcode_audio_selector" = id; - "o_transcode_lbl" = id; - "o_transcode_video_bitrate" = id; - "o_transcode_video_bitrate_lbl" = id; - "o_transcode_video_chkbox" = id; - "o_transcode_video_scale" = id; - "o_transcode_video_scale_lbl" = id; - "o_transcode_video_selector" = id; - }; - SUPERCLASS = NSObject; - }, - {CLASS = VLCPlaylist; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, - { - ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; - CLASS = VLCPrefs; - LANGUAGE = ObjC; - OUTLETS = { - "o_advanced_ckb" = id; - "o_cancel_btn" = id; - "o_prefs_view" = id; - "o_prefs_window" = id; - "o_reset_btn" = id; - "o_save_btn" = id; - "o_tree" = id; - }; - SUPERCLASS = NSObject; + IBClasses = ( + { + CLASS = FirstResponder; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = MPSlider; + LANGUAGE = ObjC; + SUPERCLASS = NSSlider; + }, + { + ACTIONS = { + showPanel = id; + }; + CLASS = VLAboutBox; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = VLBrushedMetalImageView; + LANGUAGE = ObjC; + SUPERCLASS = NSImageView; + }, + { + CLASS = VLCApplication; + LANGUAGE = ObjC; + SUPERCLASS = NSApplication; + }, + { + CLASS = VLCControllerView; + LANGUAGE = ObjC; + SUPERCLASS = NSView; + }, + { + CLASS = VLCControllerWindow; + LANGUAGE = ObjC; + SUPERCLASS = NSWindow; + }, + { + ACTIONS = { + backward = id; + faster = id; + forward = id; + loop = id; + mute = id; + next = id; + pause = id; + play = id; + position = id; + prev = id; + random = id; + repeat = id; + slower = id; + stop = id; + toggleVar = id; + volumeDown = id; + volumeSliderUpdated = id; + volumeUp = id; + windowAction = id; + }; + CLASS = VLCControls; + LANGUAGE = ObjC; + OUTLETS = { + "o_btn_fullscreen" = id; + "o_main" = id; + "o_open" = id; + "o_volumeslider" = id; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + bandSliderUpdated = id; + changePreset = id; + enable = id; + preampSliderUpdated = id; + toggleWindow = id; + twopass = id; + }; + CLASS = VLCEqualizer; + LANGUAGE = ObjC; + OUTLETS = { + "o_btn_equalizer" = id; + "o_ckb_2pass" = id; + "o_ckb_enable" = id; + "o_fld_preamp" = id; + "o_popup_presets" = id; + "o_slider_band1" = id; + "o_slider_band10" = id; + "o_slider_band2" = id; + "o_slider_band3" = id; + "o_slider_band4" = id; + "o_slider_band5" = id; + "o_slider_band6" = id; + "o_slider_band7" = id; + "o_slider_band8" = id; + "o_slider_band9" = id; + "o_slider_preamp" = id; + "o_window" = id; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + createOutlineGroup = id; + deleteOutlineGroup = id; + infoCancel = id; + infoOk = id; + toggleInfoPanel = id; + togglePlaylistInfoPanel = id; + }; + CLASS = VLCInfo; + LANGUAGE = ObjC; + OUTLETS = { + "o_author_lbl" = id; + "o_author_txt" = id; + "o_btn_cancel" = id; + "o_btn_ok" = id; + "o_info_window" = id; + "o_outline_view" = id; + "o_title_lbl" = id; + "o_title_txt" = id; + "o_uri_lbl" = id; + "o_uri_txt" = id; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + clearRecentItems = id; + closeError = id; + openCrashLog = id; + openDocumentation = id; + openLicense = id; + openReadMe = id; + openRecentItem = id; + openWebsite = id; + reportABug = id; + timesliderUpdate = id; + viewAbout = id; + viewPreferences = id; + }; + CLASS = VLCMain; + LANGUAGE = ObjC; + OUTLETS = { + "o_btn_ff" = id; + "o_btn_fullscreen" = id; + "o_btn_next" = id; + "o_btn_play" = id; + "o_btn_prev" = id; + "o_btn_rewind" = id; + "o_btn_stop" = id; + "o_controls" = id; + "o_dmi_mute" = id; + "o_dmi_next" = id; + "o_dmi_play" = id; + "o_dmi_previous" = id; + "o_dmi_stop" = id; + "o_err_btn_dismiss" = id; + "o_err_btn_msgs" = id; + "o_err_bug_lbl" = id; + "o_err_ckbk_surpress" = id; + "o_err_lbl" = id; + "o_err_msg" = id; + "o_error" = id; + "o_info" = id; + "o_messages" = id; + "o_mi_about" = id; + "o_mi_add_intf" = id; + "o_mi_audiotrack" = id; + "o_mi_bring_atf" = id; + "o_mi_bwd" = id; + "o_mi_channels" = id; + "o_mi_chapter" = id; + "o_mi_clear" = id; + "o_mi_close_window" = id; + "o_mi_controller" = id; + "o_mi_copy" = id; + "o_mi_cut" = id; + "o_mi_deinterlace" = id; + "o_mi_device" = id; + "o_mi_documentation" = id; + "o_mi_double_window" = id; + "o_mi_equalizer" = id; + "o_mi_faster" = id; + "o_mi_ffmpeg_pp" = id; + "o_mi_fittoscreen" = id; + "o_mi_floatontop" = id; + "o_mi_fullscreen" = id; + "o_mi_fwd" = id; + "o_mi_half_window" = id; + "o_mi_hide" = id; + "o_mi_hide_others" = id; + "o_mi_info" = id; + "o_mi_license" = id; + "o_mi_loop" = id; + "o_mi_messages" = id; + "o_mi_minimize" = id; + "o_mi_mute" = id; + "o_mi_next" = id; + "o_mi_normal_window" = id; + "o_mi_open_disc" = id; + "o_mi_open_file" = id; + "o_mi_open_generic" = id; + "o_mi_open_net" = id; + "o_mi_open_recent" = id; + "o_mi_open_recent_cm" = id; + "o_mi_paste" = id; + "o_mi_play" = id; + "o_mi_playlist" = id; + "o_mi_prefs" = id; + "o_mi_previous" = id; + "o_mi_program" = id; + "o_mi_quit" = id; + "o_mi_random" = id; + "o_mi_readme" = id; + "o_mi_repeat" = id; + "o_mi_reportabug" = id; + "o_mi_screen" = id; + "o_mi_select_all" = id; + "o_mi_services" = id; + "o_mi_show_all" = id; + "o_mi_slower" = id; + "o_mi_snapshot" = id; + "o_mi_stop" = id; + "o_mi_subtitle" = id; + "o_mi_title" = id; + "o_mi_videotrack" = id; + "o_mi_visual" = id; + "o_mi_vol_down" = id; + "o_mi_vol_up" = id; + "o_mi_website" = id; + "o_msgs_btn_crashlog" = id; + "o_msgs_panel" = id; + "o_mu_add_intf" = id; + "o_mu_audio" = id; + "o_mu_audiotrack" = id; + "o_mu_channels" = id; + "o_mu_chapter" = id; + "o_mu_controls" = id; + "o_mu_deinterlace" = id; + "o_mu_device" = id; + "o_mu_edit" = id; + "o_mu_ffmpeg_pp" = id; + "o_mu_file" = id; + "o_mu_help" = id; + "o_mu_program" = id; + "o_mu_screen" = id; + "o_mu_subtitle" = id; + "o_mu_title" = id; + "o_mu_video" = id; + "o_mu_videotrack" = id; + "o_mu_visual" = id; + "o_mu_window" = id; + "o_playlist" = id; + "o_scrollfield" = id; + "o_timefield" = id; + "o_timeslider" = id; + "o_volumeslider" = id; + "o_window" = id; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = { + eyetvLaunch = id; + eyetvSwitchChannel = id; + openCaptureModeChanged = id; + openCaptureStepperChanged = id; + openDisc = id; + openDiscMenusChanged = id; + openDiscStepperChanged = id; + openDiscTypeChanged = id; + openFile = id; + openFileBrowse = id; + openFileGeneric = id; + openFileStreamChanged = id; + openNet = id; + openNetModeChanged = id; + openNetStepperChanged = id; + openVTSBrowse = id; + panelCancel = id; + panelOk = id; + subCloseSheet = id; + subDelayStepperChanged = id; + subFileBrowse = id; + subFpsStepperChanged = id; + subOverride = id; + subSettings = id; + subsChanged = id; + }; + CLASS = VLCOpen; + LANGUAGE = ObjC; + OUTLETS = { + "o_btn_cancel" = id; + "o_btn_ok" = id; + "o_capture_label_view" = id; + "o_capture_lbl" = id; + "o_capture_long_lbl" = id; + "o_capture_mode_pop" = id; + "o_disc_chapter" = id; + "o_disc_chapter_lbl" = id; + "o_disc_chapter_stp" = id; + "o_disc_device" = id; + "o_disc_device_lbl" = id; + "o_disc_dvd_menus" = id; + "o_disc_title" = id; + "o_disc_title_lbl" = id; + "o_disc_title_stp" = id; + "o_disc_type" = id; + "o_disc_videots_btn_browse" = id; + "o_disc_videots_folder" = id; + "o_eyetv_channels_pop" = id; + "o_eyetv_chn_bgbar" = id; + "o_eyetv_chn_status_txt" = id; + "o_eyetv_currentChannel_lbl" = id; + "o_eyetv_launchEyeTV_btn" = id; + "o_eyetv_nextProgram_btn" = id; + "o_eyetv_noInstanceLong_lbl" = id; + "o_eyetv_noInstance_lbl" = id; + "o_eyetv_notLaunched_view" = id; + "o_eyetv_previousProgram_btn" = id; + "o_eyetv_running_view" = id; + "o_file_btn_browse" = id; + "o_file_path" = id; + "o_file_stream" = id; + "o_file_sub_align_lbl" = id; + "o_file_sub_align_pop" = id; + "o_file_sub_btn_browse" = id; + "o_file_sub_btn_settings" = id; + "o_file_sub_ckbox" = id; + "o_file_sub_delay" = id; + "o_file_sub_delay_lbl" = id; + "o_file_sub_delay_stp" = id; + "o_file_sub_encoding_lbl" = id; + "o_file_sub_encoding_pop" = id; + "o_file_sub_file_box" = id; + "o_file_sub_font_box" = id; + "o_file_sub_fps" = id; + "o_file_sub_fps_lbl" = id; + "o_file_sub_fps_stp" = id; + "o_file_sub_ok_btn" = id; + "o_file_sub_override" = id; + "o_file_sub_path" = id; + "o_file_sub_sheet" = id; + "o_file_sub_size_lbl" = id; + "o_file_sub_size_pop" = id; + "o_mrl" = id; + "o_mrl_lbl" = id; + "o_net_http_url" = id; + "o_net_http_url_lbl" = id; + "o_net_mode" = id; + "o_net_timeshift_ckbox" = id; + "o_net_udp_port" = id; + "o_net_udp_port_lbl" = id; + "o_net_udp_port_stp" = id; + "o_net_udpm_addr" = id; + "o_net_udpm_addr_lbl" = id; + "o_net_udpm_port" = id; + "o_net_udpm_port_lbl" = id; + "o_net_udpm_port_stp" = id; + "o_output_ckbox" = id; + "o_panel" = id; + "o_playlist" = id; + "o_screen_fps_fld" = id; + "o_screen_fps_stp" = id; + "o_screen_lbl" = id; + "o_screen_long_lbl" = id; + "o_screen_view" = id; + "o_sout_options" = id; + "o_tabview" = id; + }; + SUPERCLASS = NSObject; + }, + { + CLASS = VLCOpenTextField; + LANGUAGE = ObjC; + SUPERCLASS = NSTextField; + }, + { + ACTIONS = { + announceChanged = id; + outputChanged = id; + outputCloseSheet = id; + outputFileBrowse = id; + outputInfoChanged = id; + outputMethodChanged = id; + outputSettings = id; + streamPortStepperChanged = id; + streamTTLStepperChanged = id; + transcodeChanged = id; + transcodeInfoChanged = id; + }; + CLASS = VLCOutput; + LANGUAGE = ObjC; + OUTLETS = { + "o_btn_browse" = id; + "o_btn_ok" = id; + "o_channel_name" = id; + "o_channel_name_lbl" = id; + "o_display" = id; + "o_dump_chkbox" = id; + "o_file_chkbox" = id; + "o_file_field" = id; + "o_http_chkbox" = id; + "o_method" = id; + "o_misc_lbl" = id; + "o_mux_lbl" = id; + "o_mux_selector" = id; + "o_open_panel" = id; + "o_options_lbl" = id; + "o_output_ckbox" = id; + "o_output_settings" = id; + "o_output_sheet" = id; + "o_rtsp_chkbox" = id; + "o_sap_chkbox" = id; + "o_sdp_url" = id; + "o_sdp_url_lbl" = id; + "o_stream_address" = id; + "o_stream_address_lbl" = id; + "o_stream_port" = id; + "o_stream_port_lbl" = id; + "o_stream_port_stp" = id; + "o_stream_ttl" = id; + "o_stream_ttl_lbl" = id; + "o_stream_ttl_stp" = id; + "o_stream_type" = id; + "o_stream_type_lbl" = id; + "o_transcode_audio_bitrate" = id; + "o_transcode_audio_bitrate_lbl" = id; + "o_transcode_audio_channels" = id; + "o_transcode_audio_channels_lbl" = id; + "o_transcode_audio_chkbox" = id; + "o_transcode_audio_selector" = id; + "o_transcode_lbl" = id; + "o_transcode_video_bitrate" = id; + "o_transcode_video_bitrate_lbl" = id; + "o_transcode_video_chkbox" = id; + "o_transcode_video_scale" = id; + "o_transcode_video_scale_lbl" = id; + "o_transcode_video_selector" = id; + }; + SUPERCLASS = NSObject; + }, + { + CLASS = VLCPlaylist; + LANGUAGE = ObjC; + SUPERCLASS = NSObject; + }, + { + CLASS = VLCPlaylistView; + LANGUAGE = ObjC; + SUPERCLASS = NSOutlineView; + }, + { + ACTIONS = { + advancedToggle = id; + closePrefs = id; + resetAll = id; + savePrefs = id; + }; + CLASS = VLCPrefs; + LANGUAGE = ObjC; + OUTLETS = { + "o_advanced_ckb" = id; + "o_cancel_btn" = id; + "o_prefs_view" = id; + "o_prefs_window" = id; + "o_reset_btn" = id; + "o_save_btn" = id; + "o_tree" = id; + }; + SUPERCLASS = NSObject; } - ); - IBVersion = 1; + ); + IBVersion = 1; } \ No newline at end of file diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib index 99a6edf210..bbc08bca35 100644 --- a/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib +++ b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib @@ -1,9 +1,20 @@ - + IBDocumentLocation -8 61 505 517 0 0 800 578 + IBEditorPositions + + 2297 + 366 463 548 183 0 0 1280 778 + 2301 + 646 594 548 183 0 0 1280 778 + 2304 + 427 454 547 183 0 0 1280 778 + 2346 + 366 464 548 183 0 0 1280 778 + IBFramework Version 489.0 IBLockedObjects @@ -15,9 +26,12 @@ IBOpenObjects + 2301 + 2297 636 + 2346 IBSystem Version - 8R3032 + 9D34 diff --git a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib index 6030e15483..b998096f5d 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index f3272af0c1..91f7730ef6 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -182,6 +182,7 @@ struct intf_sys_t IBOutlet id o_mi_open_generic; IBOutlet id o_mi_open_disc; IBOutlet id o_mi_open_net; + IBOutlet id o_mi_open_capture; IBOutlet id o_mi_open_recent; IBOutlet id o_mi_open_recent_cm; IBOutlet id o_mi_open_wizard; @@ -358,6 +359,7 @@ struct intf_sys_t - (IBAction)intfOpenFileGeneric:(id)sender; - (IBAction)intfOpenDisc:(id)sender; - (IBAction)intfOpenNet:(id)sender; +- (IBAction)intfOpenCapture:(id)sender; - (IBAction)showWizard:(id)sender; - (IBAction)showExtended:(id)sender; diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index cc9e77f46b..a1e38f857f 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -673,6 +673,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_open_file setTitle: _NS("Quick Open File...")]; [o_mi_open_disc setTitle: _NS("Open Disc...")]; [o_mi_open_net setTitle: _NS("Open Network...")]; + [o_mi_open_capture setTitle: _NS("Open Capture Device...")]; [o_mi_open_recent setTitle: _NS("Open Recent")]; [o_mi_open_recent_cm setTitle: _NS("Clear Menu")]; [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")]; @@ -1910,6 +1911,18 @@ static VLCMain *_o_sharedMainInstance = nil; } } +- (IBAction)intfOpenCapture:(id)sender +{ + if( !nib_open_loaded ) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openCapture]; + } else { + [o_open openCapture]; + } +} + - (IBAction)showWizard:(id)sender { if( !nib_wizard_loaded ) diff --git a/modules/gui/macosx/open.h b/modules/gui/macosx/open.h index 9aecd51be2..aca9a5d838 100644 --- a/modules/gui/macosx/open.h +++ b/modules/gui/macosx/open.h @@ -1,7 +1,7 @@ /***************************************************************************** * open.h: MacOS X module for vlc ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -101,21 +101,34 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); IBOutlet id o_file_sub_font_box; IBOutlet id o_file_sub_file_box; - /* open eyetv support */ - IBOutlet id o_eyetv_tabView; + /* generic capturing stuff */ + IBOutlet id o_capture_lbl; + IBOutlet id o_capture_long_lbl; + IBOutlet id o_capture_mode_pop; + IBOutlet id o_capture_label_view; + + /* eyetv support */ + IBOutlet id o_eyetv_notLaunched_view; + IBOutlet id o_eyetv_running_view; IBOutlet id o_eyetv_channels_pop; IBOutlet id o_eyetv_currentChannel_lbl; IBOutlet id o_eyetv_chn_status_txt; IBOutlet id o_eyetv_chn_bgbar; IBOutlet id o_eyetv_launchEyeTV_btn; IBOutlet id o_eyetv_nextProgram_btn; - IBOutlet id o_eyetv_noDevice_lbl; - IBOutlet id o_eyetv_noDeviceLong_lbl; - IBOutlet id o_eyetv_noEyeTV_lbl; - IBOutlet id o_eyetv_noEyeTVLong_lbl; + IBOutlet id o_eyetv_noInstance_lbl; + IBOutlet id o_eyetv_noInstanceLong_lbl; IBOutlet id o_eyetv_previousProgram_btn; + /* screen support */ + IBOutlet id o_screen_view; + IBOutlet id o_screen_fps_fld; + IBOutlet id o_screen_lbl; + IBOutlet id o_screen_long_lbl; + IBOutlet id o_screen_fps_stp; + BOOL b_autoplay; + id o_currentCaptureView; } + (VLCOpen *)sharedInstance; @@ -143,6 +156,10 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class ); - (IBAction)openNetStepperChanged:(id)sender; - (void)openNetInfoChanged:(NSNotification *)o_notification; +- (void)openCapture; +- (void)showCaptureView: theView; +- (IBAction)openCaptureStepperChanged:(id)sender; +- (IBAction)openCaptureModeChanged:(id)sender; - (IBAction)eyetvSwitchChannel:(id)sender; - (IBAction)eyetvLaunch:(id)sender; - (void)eyetvChanged:(NSNotification *)o_notification; diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m index c5c47bc1be..86a731b968 100644 --- a/modules/gui/macosx/open.m +++ b/modules/gui/macosx/open.m @@ -1,7 +1,7 @@ /***************************************************************************** * open.m: MacOS X module for vlc ***************************************************************************** - * Copyright (C) 2002-2007 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -45,6 +45,14 @@ #import "output.h" #import "eyetv.h" +#define setEyeTVUnconnected \ +[o_capture_lbl setStringValue: _NS("No device connected")]; \ +[o_capture_long_lbl setStringValue: _NS("VLC could not detect any EyeTV compatible device.\n\nCheck the device's connection, make sure that the latest EyeTV software is installed and try again.")]; \ +[o_capture_lbl displayIfNeeded]; \ +[o_capture_long_lbl displayIfNeeded]; \ +[self showCaptureView: o_capture_label_view] + + /***************************************************************************** * GetEjectableMediaOfClass *****************************************************************************/ @@ -162,6 +170,7 @@ static VLCOpen *_o_sharedMainInstance = nil; [[o_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")]; [[o_tabview tabViewItemAtIndex: 1] setLabel: _NS("Disc")]; [[o_tabview tabViewItemAtIndex: 2] setLabel: _NS("Network")]; + [[o_tabview tabViewItemAtIndex: 3] setLabel: _NS("Capture")]; [o_file_btn_browse setTitle: _NS("Browse...")]; [o_file_stream setTitle: _NS("Treat as a pipe rather than as a file")]; @@ -191,8 +200,16 @@ static VLCOpen *_o_sharedMainInstance = nil; [o_net_udp_port_stp setIntValue: config_GetInt( p_intf, "server-port" )]; [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES]; - /* FIXME: implement EyeTV l10n here */ - + + /* FIXME: implement Capturing l10n here completely */ + [o_capture_mode_pop removeAllItems]; + if( MACOS_VERSION > 10.4f ) + [o_capture_mode_pop addItemWithTitle: _NS("iSight")]; + [o_capture_mode_pop addItemWithTitle: _NS("Screen")]; + [o_capture_mode_pop addItemWithTitle: @"EyeTV"]; + [o_screen_lbl setStringValue: _NS("Screen Capture Input")]; + [o_screen_long_lbl setStringValue: _NS("This facility allows you to process your screen's output.")]; + [self setSubPanel]; @@ -235,19 +252,10 @@ static VLCOpen *_o_sharedMainInstance = nil; name: NSControlTextDidChangeNotification object: o_net_http_url]; - /* wake up with the correct EyeTV GUI */ - if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) - { - if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) - { - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"]; - [self setupChannelInfo]; - } - else - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; - } - else - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"]; + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector(screenFPSChanged:) + name: NSControlTextDidChangeNotification + object: o_screen_fps_fld]; [[NSDistributedNotificationCenter defaultCenter] addObserver: self selector: @selector(eyetvChanged:) @@ -414,9 +422,9 @@ static VLCOpen *_o_sharedMainInstance = nil; { [self openNetInfoChanged: nil]; } - else if( [o_label isEqualToString: _NS("EyeTV")] ) + else if( [o_label isEqualToString: _NS("Capture")] ) { - [o_mrl setStringValue: @"eyetv://"]; + [self openCaptureModeChanged: nil]; } } @@ -438,6 +446,13 @@ static VLCOpen *_o_sharedMainInstance = nil; [self openTarget: 2]; } +- (void)openCapture +{ + [self openCaptureModeChanged: nil]; + [self showCaptureView: o_capture_label_view]; + [self openTarget: 3]; +} + - (void)openFilePathChanged:(NSNotification *)o_notification { NSString *o_mrl_string; @@ -801,6 +816,68 @@ static VLCOpen *_o_sharedMainInstance = nil; } } +- (void)showCaptureView: theView +{ + NSRect o_view_rect; + o_view_rect = [theView frame]; + if( o_currentCaptureView ) + { + [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay]; + [o_currentCaptureView release]; + } + [theView setFrame: NSMakeRect( 0, 10, o_view_rect.size.width, o_view_rect.size.height)]; + [theView setNeedsDisplay: YES]; + [theView setAutoresizesSubviews: YES]; + [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView]; + [theView displayIfNeeded]; + o_currentCaptureView = theView; + [o_currentCaptureView retain]; +} + +- (IBAction)openCaptureModeChanged:(id)sender +{ + if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"EyeTV"] ) + { + if( [[[VLCMain sharedInstance] getEyeTVController] isEyeTVrunning] == YES ) + { + if( [[[VLCMain sharedInstance] getEyeTVController] isDeviceConnected] == YES ) + { + [self showCaptureView: o_eyetv_running_view]; + [self setupChannelInfo]; + } + else + { + setEyeTVUnconnected; + } + } + else + [self showCaptureView: o_eyetv_notLaunched_view]; + [o_mrl setStringValue: @""]; + } + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"Screen"] ) + { + [self showCaptureView: o_screen_view]; + [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]]; + } + else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] ) + { + [o_capture_lbl setStringValue: _NS("iSight Capture Input")]; + [o_capture_long_lbl setStringValue: _NS("This facility allows you to process your iSight's input signal.\n\nNo settings are available in this version, so you will be provided a 640px*480px raw video stream.\n\nLive Audio input is not supported.")]; + [o_capture_lbl displayIfNeeded]; + [o_capture_long_lbl displayIfNeeded]; + + [self showCaptureView: o_capture_label_view]; + [o_mrl setStringValue: @"qtcapture://"]; + } +} + +- (IBAction)openCaptureStepperChanged:(id)sender +{ + [o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]]; + [o_panel makeFirstResponder: o_screen_fps_fld]; + [o_mrl setStringValue: [NSString stringWithFormat:@"screen:// :screen-fps=%@", [o_screen_fps_fld stringValue]]]; +} + - (IBAction)eyetvSwitchChannel:(id)sender { if( sender == o_eyetv_nextProgram_btn ) @@ -835,7 +912,7 @@ static VLCOpen *_o_sharedMainInstance = nil; if( [[o_notification name] isEqualToString: @"DeviceAdded"] ) { msg_Dbg( VLCIntf, "eyetv device was added" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"eyetvup"]; + [self showCaptureView: o_eyetv_running_view]; [self setupChannelInfo]; } else if( [[o_notification name] isEqualToString: @"DeviceRemoved"] ) @@ -843,19 +920,19 @@ static VLCOpen *_o_sharedMainInstance = nil; /* leave the channel selection like that, * switch to our "no device" tab */ msg_Dbg( VLCIntf, "eyetv device was removed" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; + setEyeTVUnconnected; } else if( [[o_notification name] isEqualToString: @"PluginQuit"] ) { /* switch to the "launch eyetv" tab */ msg_Dbg( VLCIntf, "eyetv was terminated" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"noeyetv"]; + [self showCaptureView: o_eyetv_notLaunched_view]; } else if( [[o_notification name] isEqualToString: @"PluginInit"] ) { /* we got no device yet */ msg_Dbg( VLCIntf, "eyetv was launched, no device yet" ); - [o_eyetv_tabView selectTabViewItemWithIdentifier:@"nodevice"]; + setEyeTVUnconnected; } else msg_Warn( VLCIntf, "unknown external notify '%s' received", [[o_notification name] UTF8String] );