]> git.sesse.net Git - vlc/commitdiff
macosx: redesigned the Open panel to be more suitable for less-skilled users
authorFelix Paul Kühne <fkuehne@videolan.org>
Sat, 28 Feb 2009 19:11:05 +0000 (20:11 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 3 Mar 2009 14:05:58 +0000 (15:05 +0100)
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
modules/gui/macosx/open.h
modules/gui/macosx/open.m

index 9e712a84e497ff6976ca13d1a6e73ed4a40fc2a8..2f1f4e15a12f93d026dab24530f8d73f0a6390ab 100644 (file)
-<?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">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>eyetvGetPlugin</key>
-                               <string>id</string>
-                               <key>eyetvLaunch</key>
-                               <string>id</string>
-                               <key>eyetvSwitchChannel</key>
-                               <string>id</string>
-                               <key>openCaptureModeChanged</key>
-                               <string>id</string>
-                               <key>openDisc</key>
-                               <string>id</string>
-                               <key>openDiscMenusChanged</key>
-                               <string>id</string>
-                               <key>openDiscStepperChanged</key>
-                               <string>id</string>
-                               <key>openDiscTypeChanged</key>
-                               <string>id</string>
-                               <key>openFile</key>
-                               <string>id</string>
-                               <key>openFileBrowse</key>
-                               <string>id</string>
-                               <key>openFileGeneric</key>
-                               <string>id</string>
-                               <key>openFileStreamChanged</key>
-                               <string>id</string>
-                               <key>openNet</key>
-                               <string>id</string>
-                               <key>openNetModeChanged</key>
-                               <string>id</string>
-                               <key>openNetStepperChanged</key>
-                               <string>id</string>
-                               <key>openVTSBrowse</key>
-                               <string>id</string>
-                               <key>panelCancel</key>
-                               <string>id</string>
-                               <key>panelOk</key>
-                               <string>id</string>
-                               <key>screenStepperChanged</key>
-                               <string>id</string>
-                               <key>subCloseSheet</key>
-                               <string>id</string>
-                               <key>subDelayStepperChanged</key>
-                               <string>id</string>
-                               <key>subFileBrowse</key>
-                               <string>id</string>
-                               <key>subFpsStepperChanged</key>
-                               <string>id</string>
-                               <key>subOverride</key>
-                               <string>id</string>
-                               <key>subSettings</key>
-                               <string>id</string>
-                               <key>subsChanged</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCOpen</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_cancel</key>
-                               <string>id</string>
-                               <key>o_btn_ok</key>
-                               <string>id</string>
-                               <key>o_capture_label_view</key>
-                               <string>id</string>
-                               <key>o_capture_lbl</key>
-                               <string>id</string>
-                               <key>o_capture_long_lbl</key>
-                               <string>id</string>
-                               <key>o_capture_mode_pop</key>
-                               <string>id</string>
-                               <key>o_currentCaptureView</key>
-                               <string>id</string>
-                               <key>o_disc_chapter</key>
-                               <string>id</string>
-                               <key>o_disc_chapter_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_chapter_stp</key>
-                               <string>id</string>
-                               <key>o_disc_device</key>
-                               <string>id</string>
-                               <key>o_disc_device_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_dvd_menus</key>
-                               <string>id</string>
-                               <key>o_disc_title</key>
-                               <string>id</string>
-                               <key>o_disc_title_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_title_stp</key>
-                               <string>id</string>
-                               <key>o_disc_type</key>
-                               <string>id</string>
-                               <key>o_disc_videots_btn_browse</key>
-                               <string>id</string>
-                               <key>o_disc_videots_folder</key>
-                               <string>id</string>
-                               <key>o_eyetv_channels_pop</key>
-                               <string>id</string>
-                               <key>o_eyetv_chn_bgbar</key>
-                               <string>id</string>
-                               <key>o_eyetv_chn_status_txt</key>
-                               <string>id</string>
-                               <key>o_eyetv_currentChannel_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_getPlugin_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_launchEyeTV_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_nextProgram_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_noInstanceLong_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_noInstance_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_notLaunched_view</key>
-                               <string>id</string>
-                               <key>o_eyetv_previousProgram_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_running_view</key>
-                               <string>id</string>
-                               <key>o_file_btn_browse</key>
-                               <string>id</string>
-                               <key>o_file_path</key>
-                               <string>id</string>
-                               <key>o_file_stream</key>
-                               <string>id</string>
-                               <key>o_file_sub_align_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_align_pop</key>
-                               <string>id</string>
-                               <key>o_file_sub_btn_browse</key>
-                               <string>id</string>
-                               <key>o_file_sub_btn_settings</key>
-                               <string>id</string>
-                               <key>o_file_sub_ckbox</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay_stp</key>
-                               <string>id</string>
-                               <key>o_file_sub_encoding_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_encoding_pop</key>
-                               <string>id</string>
-                               <key>o_file_sub_file_box</key>
-                               <string>id</string>
-                               <key>o_file_sub_font_box</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps_stp</key>
-                               <string>id</string>
-                               <key>o_file_sub_ok_btn</key>
-                               <string>id</string>
-                               <key>o_file_sub_override</key>
-                               <string>id</string>
-                               <key>o_file_sub_path</key>
-                               <string>id</string>
-                               <key>o_file_sub_sheet</key>
-                               <string>id</string>
-                               <key>o_file_sub_size_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_size_pop</key>
-                               <string>id</string>
-                               <key>o_mrl</key>
-                               <string>id</string>
-                               <key>o_mrl_lbl</key>
-                               <string>id</string>
-                               <key>o_net_http_url</key>
-                               <string>id</string>
-                               <key>o_net_http_url_lbl</key>
-                               <string>id</string>
-                               <key>o_net_mode</key>
-                               <string>id</string>
-                               <key>o_net_timeshift_ckbox</key>
-                               <string>id</string>
-                               <key>o_net_udp_port</key>
-                               <string>id</string>
-                               <key>o_net_udp_port_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udp_port_stp</key>
-                               <string>id</string>
-                               <key>o_net_udpm_addr</key>
-                               <string>id</string>
-                               <key>o_net_udpm_addr_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port_stp</key>
-                               <string>id</string>
-                               <key>o_output_ckbox</key>
-                               <string>id</string>
-                               <key>o_panel</key>
-                               <string>id</string>
-                               <key>o_playlist</key>
-                               <string>id</string>
-                               <key>o_screen_follow_mouse_ckb</key>
-                               <string>id</string>
-                               <key>o_screen_fps_fld</key>
-                               <string>id</string>
-                               <key>o_screen_fps_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_fps_stp</key>
-                               <string>id</string>
-                               <key>o_screen_height_fld</key>
-                               <string>id</string>
-                               <key>o_screen_height_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_height_stp</key>
-                               <string>id</string>
-                               <key>o_screen_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_left_fld</key>
-                               <string>id</string>
-                               <key>o_screen_left_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_left_stp</key>
-                               <string>id</string>
-                               <key>o_screen_long_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_top_fld</key>
-                               <string>id</string>
-                               <key>o_screen_top_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_top_stp</key>
-                               <string>id</string>
-                               <key>o_screen_view</key>
-                               <string>id</string>
-                               <key>o_screen_width_fld</key>
-                               <string>id</string>
-                               <key>o_screen_width_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_width_stp</key>
-                               <string>id</string>
-                               <key>o_sout_options</key>
-                               <string>id</string>
-                               <key>o_tabview</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCPlaylistCommon</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_outline_view</key>
-                               <string>id</string>
-                               <key>o_tc_author</key>
-                               <string>id</string>
-                               <key>o_tc_duration</key>
-                               <string>id</string>
-                               <key>o_tc_name</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCOpenTextField</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSTextField</string>
-               </dict>
-               <dict>
-                       <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>
+{
+    IBClasses =     (
+                {
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = NSApplication;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSResponder;
+        },
+                {
+            CLASS = NSObject;
+            LANGUAGE = ObjC;
+        },
+                {
+            ACTIONS =             {
+                eyetvGetPlugin = id;
+                eyetvLaunch = id;
+                eyetvSwitchChannel = id;
+                openCaptureModeChanged = id;
+                openDisc = id;
+                openDiscMenusChanged = id;
+                openDiscStepperChanged = id;
+                openDiscTypeChanged = id;
+                openFile = id;
+                openFileBrowse = id;
+                openFileGeneric = id;
+                openFileStreamChanged = id;
+                openNet = id;
+                openNetModeChanged = id;
+                openNetStepperChanged = id;
+                openNetUDPButtonAction = id;
+                openVTSBrowse = id;
+                panelCancel = id;
+                panelOk = id;
+                screenStepperChanged = 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_currentCaptureView" = 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_getPlugin_btn" = 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_help_lbl" = id;
+                "o_net_help_udp_lbl" = id;
+                "o_net_http_url" = id;
+                "o_net_http_url_lbl" = id;
+                "o_net_mode" = id;
+                "o_net_openUDP_btn" = id;
+                "o_net_udp_cancel_btn" = id;
+                "o_net_udp_ok_btn" = id;
+                "o_net_udp_panel" = 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_follow_mouse_ckb" = id;
+                "o_screen_fps_fld" = id;
+                "o_screen_fps_lbl" = id;
+                "o_screen_fps_stp" = id;
+                "o_screen_height_fld" = id;
+                "o_screen_height_lbl" = id;
+                "o_screen_height_stp" = id;
+                "o_screen_lbl" = id;
+                "o_screen_left_fld" = id;
+                "o_screen_left_lbl" = id;
+                "o_screen_left_stp" = id;
+                "o_screen_long_lbl" = id;
+                "o_screen_top_fld" = id;
+                "o_screen_top_lbl" = id;
+                "o_screen_top_stp" = id;
+                "o_screen_view" = id;
+                "o_screen_width_fld" = id;
+                "o_screen_width_lbl" = id;
+                "o_screen_width_stp" = 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;
+        },
+                {
+            ACTIONS =             {
+                addNode = id;
+                deleteItem = id;
+                downloadCoverArt = id;
+                playItem = id;
+                preparseItem = id;
+                recursiveExpandNode = id;
+                revealItemInFinder = id;
+                savePlaylist = id;
+                searchItem = id;
+                selectAll = id;
+                servicesChange = id;
+                sortNodeByAuthor = id;
+                sortNodeByName = id;
+            };
+            CLASS = VLCPlaylist;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_btn_addNode" = id;
+                "o_btn_playlist" = id;
+                "o_controller" = id;
+                "o_ctx_menu" = id;
+                "o_mi_addNode" = id;
+                "o_mi_delete" = id;
+                "o_mi_dl_cover_art" = id;
+                "o_mi_info" = id;
+                "o_mi_play" = id;
+                "o_mi_preparse" = id;
+                "o_mi_recursive_expand" = id;
+                "o_mi_revealInFinder" = id;
+                "o_mi_save_playlist" = id;
+                "o_mi_selectall" = id;
+                "o_mi_services" = id;
+                "o_mi_sort_author" = id;
+                "o_mi_sort_name" = id;
+                "o_mm_mi_revealInFinder" = id;
+                "o_mm_mi_services" = id;
+                "o_mm_mu_services" = id;
+                "o_mu_services" = id;
+                "o_playlist_view" = id;
+                "o_playlist_wizard" = id;
+                "o_save_accessory_popup" = id;
+                "o_save_accessory_text" = id;
+                "o_save_accessory_view" = id;
+                "o_search_field" = id;
+                "o_status_field" = id;
+                "o_tc_sortColumn" = id;
+            };
+            SUPERCLASS = VLCPlaylistCommon;
+        },
+                {
+            CLASS = VLCPlaylistCommon;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_outline_view" = id;
+                "o_tc_author" = id;
+                "o_tc_duration" = id;
+                "o_tc_name" = id;
+            };
+            SUPERCLASS = NSObject;
+        }
+    );
+    IBVersion = 1;
+}
\ No newline at end of file
index 10243f66a052ac11303958afca37909060cad6f4..13867766def9d101a9d4bd85b9bac8e248dbd9a6 100644 (file)
@@ -2,14 +2,24 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <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>
-       <string>677</string>
+       <string>489.0</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
                <integer>2346</integer>
-               <integer>683</integer>
+               <integer>636</integer>
+               <integer>2792</integer>
                <integer>2297</integer>
        </array>
        <key>IBSystem Version</key>
index 52f5206a78ed17930d39b91ff29e562fb6de95d2..b466a0b6c5e9e9aa6b3e58dd964691d07e5464cc 100644 (file)
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
index d925751848d5ca57bba2149aac5e5cab077cd931..b0b0546d24fe217410464802897dc869b7ad13e7 100644 (file)
@@ -1,13 +1,13 @@
 /*****************************************************************************
- * 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$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          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
  * it under the terms of the GNU General Public License as published by
@@ -65,7 +65,15 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_disc_dvd_menus;
 
     /* 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_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_lbl;
     IBOutlet id o_net_udp_port_stp;
@@ -74,8 +82,6 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_net_udpm_port;
     IBOutlet id o_net_udpm_port_lbl;
     IBOutlet id o_net_udpm_port_stp;
-    IBOutlet id o_net_http_url;
-    IBOutlet id o_net_http_url_lbl;
 
     /* open subtitle file */
     IBOutlet id o_file_sub_ckbox;
@@ -170,6 +176,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)openNetModeChanged:(id)sender;
 - (IBAction)openNetStepperChanged:(id)sender;
 - (void)openNetInfoChanged:(NSNotification *)o_notification;
+- (IBAction)openNetUDPButtonAction:(id)sender;
 
 - (void)openCapture;
 - (void)showCaptureView: theView;
index 617e3775cd25ebb9c1ca8c3abac29b1ecb49d5e5..174c0b4b8c3e64ac33f7345f74d2c01625faf4bd 100644 (file)
@@ -1,14 +1,14 @@
 /*****************************************************************************
- * 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$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
  *          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
  * it under the terms of the GNU General Public License as published by
@@ -163,7 +163,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_panel setTitle: _NS("Open Source")];
     [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_tabview tabViewItemAtIndex: 0] setLabel: _NS("File")];
@@ -180,19 +180,23 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_disc_videots_btn_browse setTitle: _NS("Browse...")];
     [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:2 column:0] setTitle: _NS("VCD")];
     [[o_disc_type cellAtRow:3 column:0] setTitle: _NS("Audio CD")];
 
     [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_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: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_stp setIntValue: config_GetInt( p_intf, "server-port" )];
@@ -200,8 +204,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [o_eyetv_chn_bgbar setUsesThreadedAnimation: YES];
 
     [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: @"EyeTV"];
     [o_screen_lbl setStringValue: _NS("Screen Capture Input")];
@@ -729,7 +732,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
     else if ( [[sender selectedCell] tag] == 1 )
         [o_panel makeFirstResponder: o_net_udpm_addr];
     else
-        [o_panel makeFirstResponder: o_net_http_url];
+        msg_Warn( p_intf, "Unknown sender tried to change UDP/RTP mode" );
+
 
     [self openNetInfoChanged: nil];
 }
@@ -758,37 +762,40 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)openNetInfoChanged:(NSNotification *)o_notification
 {
-    NSString *o_mode;
     NSString *o_mrl_string = [NSString string];
 
-    o_mode = [[o_net_mode selectedCell] title];
-
-    if( [o_mode isEqualToString: _NS("UDP/RTP")] )
+    if( [o_net_udp_panel isVisible] )
     {
-        int i_port = [o_net_udp_port intValue];
+        NSString *o_mode;
+        o_mode = [[o_net_mode selectedCell] title];
 
-        o_mrl_string = [NSString stringWithString: @"udp://"];
-
-        if( i_port != config_GetInt( p_intf, "server-port" ) )
+        if( [o_mode isEqualToString: _NS("UDP/RTP")] )
         {
-            o_mrl_string =
-                [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
-        }
-    }
-    else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] )
-    {
-        NSString *o_addr = [o_net_udpm_addr stringValue];
-        int i_port = [o_net_udpm_port intValue];
+            int i_port = [o_net_udp_port intValue];
 
-        o_mrl_string = [NSString stringWithFormat: @"udp://@%@", o_addr];
+            o_mrl_string = [NSString stringWithString: @"udp://"];
 
-        if( i_port != config_GetInt( p_intf, "server-port" ) )
+            if( i_port != config_GetInt( p_intf, "server-port" ) )
+            {
+                o_mrl_string =
+                    [o_mrl_string stringByAppendingFormat: @"@:%i", i_port];
+            }
+        }
+        else if( [o_mode isEqualToString: _NS("UDP/RTP Multicast")] )
         {
-            o_mrl_string =
-                [o_mrl_string stringByAppendingFormat: @":%i", i_port];
+            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];
+            }
         }
     }
-    else if( [o_mode isEqualToString: _NS("HTTP/FTP/MMS/RTSP")] )
+    else
     {
         NSString *o_url = [o_net_http_url stringValue];
 
@@ -801,6 +808,55 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [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
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
@@ -1034,6 +1090,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
         contextInfo: nil];
 }
 
+- (IBAction)subCloseSheet:(id)sender
+{
+    [o_file_sub_sheet orderOut:sender];
+    [NSApp endSheet: o_file_sub_sheet];
+}
+    
 - (IBAction)subFileBrowse:(id)sender
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
@@ -1069,12 +1131,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
     [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
 {
     [NSApp stopModalWithCode: 0];