macosx: added a non-implemented skeletion (just the UI) for a VLM configuration panel...

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 e6a6f6ec97b62d36b5a67be9376a8d76e28dcb72..871b74dc424274358cc1afc14c48617dc7112a03 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -1,825 +1,439 @@
-<?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>CLASS</key>
-                       <string>VLCTimeField</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSTextField</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCControllerView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCEmbeddedWindow</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_backward</key>
-                               <string>id</string>
-                               <key>o_btn_forward</key>
-                               <string>id</string>
-                               <key>o_btn_fullscreen</key>
-                               <string>id</string>
-                               <key>o_btn_play</key>
-                               <string>id</string>
-                               <key>o_slider</key>
-                               <string>id</string>
-                               <key>o_time</key>
-                               <string>id</string>
-                               <key>o_view</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSWindow</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>ACTIONS</key>
-                       <dict>
-                               <key>checkForUpdate</key>
-                               <string>id</string>
-                               <key>clearRecentItems</key>
-                               <string>id</string>
-                               <key>crashReporterAction</key>
-                               <string>id</string>
-                               <key>intfOpenCapture</key>
-                               <string>id</string>
-                               <key>intfOpenDisc</key>
-                               <string>id</string>
-                               <key>intfOpenFile</key>
-                               <string>id</string>
-                               <key>intfOpenFileGeneric</key>
-                               <string>id</string>
-                               <key>intfOpenNet</key>
-                               <string>id</string>
-                               <key>openCrashLog</key>
-                               <string>id</string>
-                               <key>openDocumentation</key>
-                               <string>id</string>
-                               <key>openDonate</key>
-                               <string>id</string>
-                               <key>openForum</key>
-                               <string>id</string>
-                               <key>openReadMe</key>
-                               <string>id</string>
-                               <key>openRecentItem</key>
-                               <string>id</string>
-                               <key>openWebsite</key>
-                               <string>id</string>
-                               <key>showBookmarks</key>
-                               <string>id</string>
-                               <key>showExtended</key>
-                               <string>id</string>
-                               <key>showInformationPanel</key>
-                               <string>id</string>
-                               <key>showLicense</key>
-                               <string>id</string>
-                               <key>showMessagesPanel</key>
-                               <string>id</string>
-                               <key>showWizard</key>
-                               <string>id</string>
-                               <key>timesliderUpdate</key>
-                               <string>id</string>
-                               <key>togglePlaylist</key>
-                               <string>id</string>
-                               <key>viewAbout</key>
-                               <string>id</string>
-                               <key>viewErrorsAndWarnings</key>
-                               <string>id</string>
-                               <key>viewHelp</key>
-                               <string>id</string>
-                               <key>viewPreferences</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCMain</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_about</key>
-                               <string>id</string>
-                               <key>o_bookmarks</key>
-                               <string>id</string>
-                               <key>o_btn_equalizer</key>
-                               <string>NSButton</string>
-                               <key>o_btn_ff</key>
-                               <string>NSButton</string>
-                               <key>o_btn_fullscreen</key>
-                               <string>NSButton</string>
-                               <key>o_btn_next</key>
-                               <string>NSButton</string>
-                               <key>o_btn_play</key>
-                               <string>NSButton</string>
-                               <key>o_btn_playlist</key>
-                               <string>NSButton</string>
-                               <key>o_btn_prev</key>
-                               <string>NSButton</string>
-                               <key>o_btn_rewind</key>
-                               <string>NSButton</string>
-                               <key>o_btn_stop</key>
-                               <string>NSButton</string>
-                               <key>o_controls</key>
-                               <string>VLCControls</string>
-                               <key>o_crashrep_desc_txt</key>
-                               <string>NSTextField</string>
-                               <key>o_crashrep_dontSend_btn</key>
-                               <string>NSButton</string>
-                               <key>o_crashrep_fld</key>
-                               <string>NSTextView</string>
-                               <key>o_crashrep_includeEmail_ckb</key>
-                               <string>NSButton</string>
-                               <key>o_crashrep_includeEmail_txt</key>
-                               <string>NSTextField</string>
-                               <key>o_crashrep_send_btn</key>
-                               <string>NSButton</string>
-                               <key>o_crashrep_title_txt</key>
-                               <string>NSTextField</string>
-                               <key>o_crashrep_win</key>
-                               <string>NSWindow</string>
-                               <key>o_dmi_mute</key>
-                               <string>NSMenuItem</string>
-                               <key>o_dmi_next</key>
-                               <string>NSMenuItem</string>
-                               <key>o_dmi_play</key>
-                               <string>NSMenuItem</string>
-                               <key>o_dmi_previous</key>
-                               <string>NSMenuItem</string>
-                               <key>o_dmi_stop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_embedded_list</key>
-                               <string>id</string>
-                               <key>o_embedded_window</key>
-                               <string>VLCEmbeddedWindow</string>
-                               <key>o_extended</key>
-                               <string>id</string>
-                               <key>o_eyetv</key>
-                               <string>id</string>
-                               <key>o_info</key>
-                               <string>id</string>
-                               <key>o_interaction_list</key>
-                               <string>id</string>
-                               <key>o_main_pgbar</key>
-                               <string>NSProgressIndicator</string>
-                               <key>o_messages</key>
-                               <string>id</string>
-                               <key>o_mi_about</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_add_intf</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_aspect_ratio</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_audiotrack</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_bookmarks</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_bring_atf</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_bwd</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_bwd1m</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_bwd5m</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_channels</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_chapter</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_checkForUpdate</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_clear</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_close_window</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_controller</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_copy</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_crop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_cut</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_deinterlace</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_device</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_documentation</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_donation</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_double_window</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_equalizer</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_errorsAndWarnings</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_extended</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_faster</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_ffmpeg_pp</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_fittoscreen</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_floatontop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_forum</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_fullscreen</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_fwd</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_fwd1m</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_fwd5m</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_half_window</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_help</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_hide</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_hide_others</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_info</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_license</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_loop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_messages</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_minimize</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_mute</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_next</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_normal_window</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_capture</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_disc</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_file</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_generic</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_net</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_recent</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_recent_cm</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_open_wizard</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_paste</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_play</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_playlist</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_prefs</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_previous</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_program</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_quit</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_random</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_readme</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_repeat</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_screen</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_select_all</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_services</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_show_all</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_slower</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_snapshot</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_sprefs</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_stop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_subtitle</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_blue</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_green</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_index</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_red</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_transparent</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_teletext_yellow</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_title</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_videotrack</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_visual</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_vol_down</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_vol_up</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mi_website</key>
-                               <string>NSMenuItem</string>
-                               <key>o_msgs_btn_crashlog</key>
-                               <string>NSButton</string>
-                               <key>o_msgs_panel</key>
-                               <string>id</string>
-                               <key>o_mu_add_intf</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_aspect_ratio</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_audio</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_audiotrack</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_channels</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_chapter</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_controls</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_crop</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_deinterlace</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_device</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_edit</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_ffmpeg_pp</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mu_file</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_help</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_program</key>
-                               <string>NSMenuItem</string>
-                               <key>o_mu_screen</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_subtitle</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_title</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_video</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_videotrack</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_visual</key>
-                               <string>NSMenu</string>
-                               <key>o_mu_window</key>
-                               <string>NSMenu</string>
-                               <key>o_open</key>
-                               <string>id</string>
-                               <key>o_playlist</key>
-                               <string>VLCPlaylist</string>
-                               <key>o_playlist_view</key>
-                               <string>NSView</string>
-                               <key>o_prefs</key>
-                               <string>id</string>
-                               <key>o_scrollfield</key>
-                               <string>id</string>
-                               <key>o_sprefs</key>
-                               <string>id</string>
-                               <key>o_timefield</key>
-                               <string>NSTextField</string>
-                               <key>o_timeslider</key>
-                               <string>NSSlider</string>
-                               <key>o_update</key>
-                               <string>id</string>
-                               <key>o_vmi_fullscreen</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_mute</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_next</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_play</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_prev</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_snapshot</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_stop</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_voldown</key>
-                               <string>NSMenuItem</string>
-                               <key>o_vmi_volup</key>
-                               <string>NSMenuItem</string>
-                               <key>o_volumeslider</key>
-                               <string>NSSlider</string>
-                               <key>o_vout_menu</key>
-                               <string>NSMenu</string>
-                               <key>o_window</key>
-                               <string>VLControllerWindow</string>
-                               <key>o_wizard</key>
-                               <string>id</string>
-                               <key>toolbarMediaControl</key>
-                               <string>NSView</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>ITSlider</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSSlider</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSObject</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>backward</key>
-                               <string>id</string>
-                               <key>faster</key>
-                               <string>id</string>
-                               <key>forward</key>
-                               <string>id</string>
-                               <key>goToSpecificTime</key>
-                               <string>id</string>
-                               <key>loop</key>
-                               <string>id</string>
-                               <key>mute</key>
-                               <string>id</string>
-                               <key>next</key>
-                               <string>id</string>
-                               <key>pause</key>
-                               <string>id</string>
-                               <key>play</key>
-                               <string>id</string>
-                               <key>position</key>
-                               <string>id</string>
-                               <key>prev</key>
-                               <string>id</string>
-                               <key>random</key>
-                               <string>id</string>
-                               <key>repeat</key>
-                               <string>id</string>
-                               <key>repeatButtonAction</key>
-                               <string>id</string>
-                               <key>showPosition</key>
-                               <string>id</string>
-                               <key>slower</key>
-                               <string>id</string>
-                               <key>stop</key>
-                               <string>id</string>
-                               <key>telxNavLink</key>
-                               <string>id</string>
-                               <key>telxTransparent</key>
-                               <string>id</string>
-                               <key>toggleVar</key>
-                               <string>id</string>
-                               <key>toogleFullscreen</key>
-                               <string>id</string>
-                               <key>volumeDown</key>
-                               <string>id</string>
-                               <key>volumeSliderUpdated</key>
-                               <string>id</string>
-                               <key>volumeUp</key>
-                               <string>id</string>
-                               <key>windowAction</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCControls</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_addNode</key>
-                               <string>id</string>
-                               <key>o_btn_repeat</key>
-                               <string>id</string>
-                               <key>o_btn_shuffle</key>
-                               <string>id</string>
-                               <key>o_fs_panel</key>
-                               <string>id</string>
-                               <key>o_main</key>
-                               <string>id</string>
-                               <key>o_specificTime_cancel_btn</key>
-                               <string>id</string>
-                               <key>o_specificTime_enter_fld</key>
-                               <string>id</string>
-                               <key>o_specificTime_goTo_lbl</key>
-                               <string>id</string>
-                               <key>o_specificTime_mi</key>
-                               <string>id</string>
-                               <key>o_specificTime_ok_btn</key>
-                               <string>id</string>
-                               <key>o_specificTime_sec_lbl</key>
-                               <string>id</string>
-                               <key>o_specificTime_stepper</key>
-                               <string>id</string>
-                               <key>o_specificTime_win</key>
-                               <string>id</string>
-                               <key>o_volumeslider</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCPlaylistView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSOutlineView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCVoutView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_window</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSView</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCControllerWindow</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSWindow</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>MPSlider</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSSlider</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCFSPanel</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSWindow</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCEmbeddedVoutView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_embeddedwindow</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>VLCVoutView</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>bandSliderUpdated</key>
-                               <string>id</string>
-                               <key>changePreset</key>
-                               <string>id</string>
-                               <key>enable</key>
-                               <string>id</string>
-                               <key>preampSliderUpdated</key>
-                               <string>id</string>
-                               <key>toggleWindow</key>
-                               <string>id</string>
-                               <key>twopass</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCEqualizer</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_equalizer</key>
-                               <string>id</string>
-                               <key>o_ckb_2pass</key>
-                               <string>id</string>
-                               <key>o_ckb_enable</key>
-                               <string>id</string>
-                               <key>o_fld_preamp</key>
-                               <string>id</string>
-                               <key>o_popup_presets</key>
-                               <string>id</string>
-                               <key>o_slider_band1</key>
-                               <string>id</string>
-                               <key>o_slider_band10</key>
-                               <string>id</string>
-                               <key>o_slider_band2</key>
-                               <string>id</string>
-                               <key>o_slider_band3</key>
-                               <string>id</string>
-                               <key>o_slider_band4</key>
-                               <string>id</string>
-                               <key>o_slider_band5</key>
-                               <string>id</string>
-                               <key>o_slider_band6</key>
-                               <string>id</string>
-                               <key>o_slider_band7</key>
-                               <string>id</string>
-                               <key>o_slider_band8</key>
-                               <string>id</string>
-                               <key>o_slider_band9</key>
-                               <string>id</string>
-                               <key>o_slider_preamp</key>
-                               <string>id</string>
-                               <key>o_window</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLBrushedMetalImageView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSImageView</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>addNode</key>
-                               <string>id</string>
-                               <key>deleteItem</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_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_outline_view</key>
-                               <string>id</string>
-                               <key>o_playlist_view</key>
-                               <string>id</string>
-                               <key>o_playlist_wizard</key>
-                               <string>id</string>
-                               <key>o_random_ckb</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_author</key>
-                               <string>id</string>
-                               <key>o_tc_duration</key>
-                               <string>id</string>
-                               <key>o_tc_name</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 = ITSlider;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSSlider;
+        },
+                {
+            CLASS = MPSlider;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSSlider;
+        },
+                {
+            CLASS = NSApplication;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSResponder;
+        },
+                {
+            CLASS = NSObject;
+            LANGUAGE = ObjC;
+        },
+                {
+            CLASS = VLBrushedMetalImageView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSImageView;
+        },
+                {
+            CLASS = VLCControllerView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSView;
+        },
+                {
+            CLASS = VLCControllerWindow;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSWindow;
+        },
+                {
+            ACTIONS =             {
+                backward = id;
+                faster = id;
+                forward = id;
+                goToSpecificTime = id;
+                loop = id;
+                mute = id;
+                next = id;
+                pause = id;
+                play = id;
+                position = id;
+                prev = id;
+                random = id;
+                repeat = id;
+                repeatButtonAction = id;
+                showPosition = id;
+                slower = id;
+                stop = id;
+                telxNavLink = id;
+                telxTransparent = id;
+                toggleVar = id;
+                toogleFullscreen = id;
+                volumeDown = id;
+                volumeSliderUpdated = id;
+                volumeUp = id;
+                windowAction = id;
+            };
+            CLASS = VLCControls;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_btn_addNode" = id;
+                "o_btn_repeat" = id;
+                "o_btn_shuffle" = id;
+                "o_fs_panel" = id;
+                "o_main" = id;
+                "o_specificTime_cancel_btn" = id;
+                "o_specificTime_enter_fld" = id;
+                "o_specificTime_goTo_lbl" = id;
+                "o_specificTime_mi" = id;
+                "o_specificTime_ok_btn" = id;
+                "o_specificTime_sec_lbl" = id;
+                "o_specificTime_stepper" = id;
+                "o_specificTime_win" = id;
+                "o_volumeslider" = id;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = VLCEmbeddedVoutView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_embeddedwindow" = id;
+            };
+            SUPERCLASS = VLCVoutView;
+        },
+                {
+            CLASS = VLCEmbeddedWindow;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_btn_backward" = id;
+                "o_btn_forward" = id;
+                "o_btn_fullscreen" = id;
+                "o_btn_play" = id;
+                "o_slider" = id;
+                "o_time" = id;
+                "o_view" = id;
+            };
+            SUPERCLASS = NSWindow;
+        },
+                {
+            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;
+        },
+                {
+            CLASS = VLCFSPanel;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSWindow;
+        },
+                {
+            ACTIONS =             {
+                checkForUpdate = id;
+                clearRecentItems = id;
+                crashReporterAction = id;
+                intfOpenCapture = id;
+                intfOpenDisc = id;
+                intfOpenFile = id;
+                intfOpenFileGeneric = id;
+                intfOpenNet = id;
+                openCrashLog = id;
+                openDocumentation = id;
+                openDonate = id;
+                openForum = id;
+                openReadMe = id;
+                openRecentItem = id;
+                openWebsite = id;
+                showBookmarks = id;
+                showExtended = id;
+                showInformationPanel = id;
+                showLicense = id;
+                showMessagesPanel = id;
+                showVLM = id;
+                showWizard = id;
+                timesliderUpdate = id;
+                togglePlaylist = id;
+                viewAbout = id;
+                viewErrorsAndWarnings = id;
+                viewHelp = id;
+                viewPreferences = id;
+            };
+            CLASS = VLCMain;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_about" = id;
+                "o_bookmarks" = id;
+                "o_btn_equalizer" = NSButton;
+                "o_btn_ff" = NSButton;
+                "o_btn_fullscreen" = NSButton;
+                "o_btn_next" = NSButton;
+                "o_btn_play" = NSButton;
+                "o_btn_playlist" = NSButton;
+                "o_btn_prev" = NSButton;
+                "o_btn_rewind" = NSButton;
+                "o_btn_stop" = NSButton;
+                "o_controls" = VLCControls;
+                "o_crashrep_desc_txt" = NSTextField;
+                "o_crashrep_dontSend_btn" = NSButton;
+                "o_crashrep_fld" = NSTextView;
+                "o_crashrep_includeEmail_ckb" = NSButton;
+                "o_crashrep_includeEmail_txt" = NSTextField;
+                "o_crashrep_send_btn" = NSButton;
+                "o_crashrep_title_txt" = NSTextField;
+                "o_crashrep_win" = NSWindow;
+                "o_dmi_mute" = NSMenuItem;
+                "o_dmi_next" = NSMenuItem;
+                "o_dmi_play" = NSMenuItem;
+                "o_dmi_previous" = NSMenuItem;
+                "o_dmi_stop" = NSMenuItem;
+                "o_embedded_list" = id;
+                "o_embedded_window" = VLCEmbeddedWindow;
+                "o_extended" = id;
+                "o_eyetv" = id;
+                "o_info" = id;
+                "o_interaction_list" = id;
+                "o_main_pgbar" = NSProgressIndicator;
+                "o_messages" = id;
+                "o_mi_about" = NSMenuItem;
+                "o_mi_add_intf" = NSMenuItem;
+                "o_mi_aspect_ratio" = NSMenuItem;
+                "o_mi_audiotrack" = NSMenuItem;
+                "o_mi_bookmarks" = NSMenuItem;
+                "o_mi_bring_atf" = NSMenuItem;
+                "o_mi_bwd" = NSMenuItem;
+                "o_mi_bwd1m" = NSMenuItem;
+                "o_mi_bwd5m" = NSMenuItem;
+                "o_mi_channels" = NSMenuItem;
+                "o_mi_chapter" = NSMenuItem;
+                "o_mi_checkForUpdate" = NSMenuItem;
+                "o_mi_clear" = NSMenuItem;
+                "o_mi_close_window" = NSMenuItem;
+                "o_mi_controller" = NSMenuItem;
+                "o_mi_copy" = NSMenuItem;
+                "o_mi_crop" = NSMenuItem;
+                "o_mi_cut" = NSMenuItem;
+                "o_mi_deinterlace" = NSMenuItem;
+                "o_mi_device" = NSMenuItem;
+                "o_mi_documentation" = NSMenuItem;
+                "o_mi_donation" = NSMenuItem;
+                "o_mi_double_window" = NSMenuItem;
+                "o_mi_equalizer" = NSMenuItem;
+                "o_mi_errorsAndWarnings" = NSMenuItem;
+                "o_mi_extended" = NSMenuItem;
+                "o_mi_faster" = NSMenuItem;
+                "o_mi_ffmpeg_pp" = NSMenuItem;
+                "o_mi_fittoscreen" = NSMenuItem;
+                "o_mi_floatontop" = NSMenuItem;
+                "o_mi_forum" = NSMenuItem;
+                "o_mi_fullscreen" = NSMenuItem;
+                "o_mi_fwd" = NSMenuItem;
+                "o_mi_fwd1m" = NSMenuItem;
+                "o_mi_fwd5m" = NSMenuItem;
+                "o_mi_half_window" = NSMenuItem;
+                "o_mi_help" = NSMenuItem;
+                "o_mi_hide" = NSMenuItem;
+                "o_mi_hide_others" = NSMenuItem;
+                "o_mi_info" = NSMenuItem;
+                "o_mi_license" = NSMenuItem;
+                "o_mi_loop" = NSMenuItem;
+                "o_mi_messages" = NSMenuItem;
+                "o_mi_minimize" = NSMenuItem;
+                "o_mi_mute" = NSMenuItem;
+                "o_mi_next" = NSMenuItem;
+                "o_mi_normal_window" = NSMenuItem;
+                "o_mi_open_capture" = NSMenuItem;
+                "o_mi_open_disc" = NSMenuItem;
+                "o_mi_open_file" = NSMenuItem;
+                "o_mi_open_generic" = NSMenuItem;
+                "o_mi_open_net" = NSMenuItem;
+                "o_mi_open_recent" = NSMenuItem;
+                "o_mi_open_recent_cm" = NSMenuItem;
+                "o_mi_open_vlm" = id;
+                "o_mi_open_wizard" = NSMenuItem;
+                "o_mi_paste" = NSMenuItem;
+                "o_mi_play" = NSMenuItem;
+                "o_mi_playlist" = NSMenuItem;
+                "o_mi_prefs" = NSMenuItem;
+                "o_mi_previous" = NSMenuItem;
+                "o_mi_program" = NSMenuItem;
+                "o_mi_quit" = NSMenuItem;
+                "o_mi_random" = NSMenuItem;
+                "o_mi_readme" = NSMenuItem;
+                "o_mi_repeat" = NSMenuItem;
+                "o_mi_screen" = NSMenuItem;
+                "o_mi_select_all" = NSMenuItem;
+                "o_mi_services" = NSMenuItem;
+                "o_mi_show_all" = NSMenuItem;
+                "o_mi_slower" = NSMenuItem;
+                "o_mi_snapshot" = NSMenuItem;
+                "o_mi_sprefs" = NSMenuItem;
+                "o_mi_stop" = NSMenuItem;
+                "o_mi_subtitle" = NSMenuItem;
+                "o_mi_teletext" = NSMenuItem;
+                "o_mi_teletext_blue" = NSMenuItem;
+                "o_mi_teletext_green" = NSMenuItem;
+                "o_mi_teletext_index" = NSMenuItem;
+                "o_mi_teletext_red" = NSMenuItem;
+                "o_mi_teletext_transparent" = NSMenuItem;
+                "o_mi_teletext_yellow" = NSMenuItem;
+                "o_mi_title" = NSMenuItem;
+                "o_mi_videotrack" = NSMenuItem;
+                "o_mi_visual" = NSMenuItem;
+                "o_mi_vol_down" = NSMenuItem;
+                "o_mi_vol_up" = NSMenuItem;
+                "o_mi_website" = NSMenuItem;
+                "o_msgs_btn_crashlog" = NSButton;
+                "o_msgs_panel" = id;
+                "o_mu_add_intf" = NSMenu;
+                "o_mu_aspect_ratio" = NSMenu;
+                "o_mu_audio" = NSMenu;
+                "o_mu_audiotrack" = NSMenu;
+                "o_mu_channels" = NSMenu;
+                "o_mu_chapter" = NSMenu;
+                "o_mu_controls" = NSMenu;
+                "o_mu_crop" = NSMenu;
+                "o_mu_deinterlace" = NSMenu;
+                "o_mu_device" = NSMenu;
+                "o_mu_edit" = NSMenu;
+                "o_mu_ffmpeg_pp" = NSMenuItem;
+                "o_mu_file" = NSMenu;
+                "o_mu_help" = NSMenu;
+                "o_mu_program" = NSMenuItem;
+                "o_mu_screen" = NSMenu;
+                "o_mu_subtitle" = NSMenu;
+                "o_mu_title" = NSMenu;
+                "o_mu_video" = NSMenu;
+                "o_mu_videotrack" = NSMenu;
+                "o_mu_visual" = NSMenu;
+                "o_mu_window" = NSMenu;
+                "o_open" = id;
+                "o_playlist" = VLCPlaylist;
+                "o_playlist_view" = NSView;
+                "o_prefs" = id;
+                "o_scrollfield" = id;
+                "o_sprefs" = id;
+                "o_timefield" = NSTextField;
+                "o_timeslider" = NSSlider;
+                "o_update" = id;
+                "o_vmi_fullscreen" = NSMenuItem;
+                "o_vmi_mute" = NSMenuItem;
+                "o_vmi_next" = NSMenuItem;
+                "o_vmi_play" = NSMenuItem;
+                "o_vmi_prev" = NSMenuItem;
+                "o_vmi_snapshot" = NSMenuItem;
+                "o_vmi_stop" = NSMenuItem;
+                "o_vmi_voldown" = NSMenuItem;
+                "o_vmi_volup" = NSMenuItem;
+                "o_volumeslider" = NSSlider;
+                "o_vout_menu" = NSMenu;
+                "o_window" = VLControllerWindow;
+                "o_wizard" = id;
+                toolbarMediaControl = NSView;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            ACTIONS =             {
+                addNode = id;
+                deleteItem = 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_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_outline_view" = id;
+                "o_playlist_view" = id;
+                "o_playlist_wizard" = id;
+                "o_random_ckb" = 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_author" = id;
+                "o_tc_duration" = id;
+                "o_tc_name" = 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;
+        },
+                {
+            CLASS = VLCPlaylistView;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSOutlineView;
+        },
+                {
+            CLASS = VLCTimeField;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSTextField;
+        },
+                {
+            CLASS = VLCVoutView;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_window" = id;
+            };
+            SUPERCLASS = NSView;
+        }
+    );
+    IBVersion = 1;
+}
\ No newline at end of file

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 cda1ea2aeec4a5a30ae2bc53666b854ac382db5f..844604ea12e9aa070adabe58a1feec49e77b608c 100644 (file)
--- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
@@ -2,8 +2,19 @@
 <!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>69 71 356 240 0 0 1280 778 </string>
+       <key>IBEditorPositions</key>
+       <dict>
+               <key>29</key>
+               <string>69 317 438 44 0 0 1280 778 </string>
+               <key>3568</key>
+               <string>476 534 328 85 0 0 1280 778 </string>
+               <key>915</key>
+               <string>69 316 187 308 0 0 1280 778 </string>
+       </dict>
        <key>IBFramework Version</key>
-       <string>649</string>
+       <string>489.0</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../../vlc.xcodeproj</string>
        <key>IBOldestOS</key>
@@ -11,10 +22,10 @@
        <key>IBOpenObjects</key>
        <array>
                <integer>3706</integer>
-               <integer>21</integer>
-               <integer>29</integer>
                <integer>3568</integer>
                <integer>915</integer>
+               <integer>21</integer>
+               <integer>29</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9E17</string>

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 600afb12593233f7e95eb312a6c6e7363368b707..6ff8eb5161232af0d8590c5d4bf9ecccb51db920 100644 (file)
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/VLM.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib
new file mode 100644 (file)
index 0000000..78fdd7b
--- /dev/null
+++ b/extras/package/macosx/Resources/English.lproj/VLM.nib/classes.nib
@@ -0,0 +1,72 @@
+{
+    IBClasses =     (
+                {
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = NSDatePicker;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSControl;
+        },
+                {
+            ACTIONS =             {
+                bcastButtonAction = id;
+                listDoubleClickAction = id;
+                schedButtonAction = id;
+                vodButtonAction = id;
+            };
+            CLASS = VLCVLMController;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_bcast_add_btn" = NSButton;
+                "o_bcast_box" = NSBox;
+                "o_bcast_cancel_btn" = NSButton;
+                "o_bcast_enable_ckb" = NSButton;
+                "o_bcast_input_btn" = NSButton;
+                "o_bcast_input_fld" = NSTextField;
+                "o_bcast_loop_ckb" = NSButton;
+                "o_bcast_name_fld" = NSTextField;
+                "o_bcast_output_btn" = NSButton;
+                "o_bcast_output_fld" = NSTextField;
+                "o_bcast_panel" = NSPanel;
+                "o_sched_add_btn" = id;
+                "o_sched_box" = id;
+                "o_sched_cancel_btn" = id;
+                "o_sched_date_datePicker" = NSDatePicker;
+                "o_sched_date_lbl" = NSTextField;
+                "o_sched_input_btn" = NSButton;
+                "o_sched_input_fld" = NSTextField;
+                "o_sched_input_lbl" = NSTextField;
+                "o_sched_name_fld" = NSTextField;
+                "o_sched_name_lbl" = NSTextField;
+                "o_sched_output_btn" = NSButton;
+                "o_sched_output_fld" = NSTextField;
+                "o_sched_output_lbl" = NSTextField;
+                "o_sched_panel" = NSPanel;
+                "o_sched_repeatDelay_datePicker" = NSDatePicker;
+                "o_sched_repeat_fld" = NSTextField;
+                "o_sched_repeat_lbl" = NSTextField;
+                "o_sched_time_box" = id;
+                "o_vlm_list" = NSTableView;
+                "o_vlm_win" = NSWindow;
+                "o_vod_add_btn" = NSButton;
+                "o_vod_box" = id;
+                "o_vod_cancel_btn" = NSButton;
+                "o_vod_input_btn" = NSButton;
+                "o_vod_input_fld" = NSTextField;
+                "o_vod_input_lbl" = NSTextField;
+                "o_vod_loop_ckb" = NSButton;
+                "o_vod_name_fld" = NSTextField;
+                "o_vod_name_lbl" = NSTextField;
+                "o_vod_output_btn" = NSButton;
+                "o_vod_output_fld" = NSTextField;
+                "o_vod_output_lbl" = NSTextField;
+                "o_vod_panel" = NSPanel;
+            };
+            SUPERCLASS = NSObject;
+        }
+    );
+    IBVersion = 1;
+}
\ No newline at end of file

diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib
new file mode 100644 (file)
index 0000000..ea3c540
--- /dev/null
+++ b/extras/package/macosx/Resources/English.lproj/VLM.nib/info.nib
@@ -0,0 +1,19 @@
+<?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>IBDocumentLocation</key>
+       <string>609 119 356 240 0 0 1280 778 </string>
+       <key>IBFramework Version</key>
+       <string>489.0</string>
+       <key>IBOpenObjects</key>
+       <array>
+               <integer>5</integer>
+               <integer>106</integer>
+               <integer>65</integer>
+               <integer>30</integer>
+       </array>
+       <key>IBSystem Version</key>
+       <string>9E17</string>
+</dict>
+</plist>

diff --git a/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib
new file mode 100644 (file)
index 0000000..b078329
Binary files /dev/null and b/extras/package/macosx/Resources/English.lproj/VLM.nib/keyedobjects.nib differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 6c87a88b664c545fa5a09db60da0809775c80317..ecc7e35805a5469536700543dfa8c6e4f9826445 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -154,6 +154,10 @@
                CC402F420E00ABBB006A4BA4 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */; };
                CC402F430E00ABBB006A4BA4 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC1941240B9C1F8400635F6B /* QTKit.framework */; };
                CC402F440E00ABBB006A4BA4 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC962E2C0CC7992800A56695 /* WebKit.framework */; };
+               CCB60A420E6E5E3F00407004 /* VLM.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCB60A400E6E5E3F00407004 /* VLM.nib */; };
+               CCD90F4E0E87C86D0034564A /* add_schedule.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4B0E87C86D0034564A /* add_schedule.png */; };
+               CCD90F4F0E87C86D0034564A /* add_vod.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4C0E87C86D0034564A /* add_vod.png */; };
+               CCD90F500E87C86D0034564A /* add_broadcast.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4D0E87C86D0034564A /* add_broadcast.png */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -319,6 +323,9 @@
                CC965D5F0DA5880F0088F222 /* display_right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_right.png; path = Resources/display_right.png; sourceTree = "<group>"; };
                CCB24D5D0D54BBAE004D780C /* simple_prefs.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = simple_prefs.m; path = ../../../modules/gui/macosx/simple_prefs.m; sourceTree = SOURCE_ROOT; };
                CCB24D5E0D54BBAE004D780C /* simple_prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = simple_prefs.h; path = ../../../modules/gui/macosx/simple_prefs.h; sourceTree = SOURCE_ROOT; };
+               CCB60A3E0E6E5DD900407004 /* vlm.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = vlm.m; path = ../../../modules/gui/macosx/vlm.m; sourceTree = SOURCE_ROOT; };
+               CCB60A3F0E6E5DD900407004 /* vlm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vlm.h; path = ../../../modules/gui/macosx/vlm.h; sourceTree = SOURCE_ROOT; };
+               CCB60A410E6E5E3F00407004 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/VLM.nib; sourceTree = "<group>"; };
                CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
                CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
                CCC895830D9A8A82005AE59C /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/access/eyetv.m; sourceTree = SOURCE_ROOT; };
@@ -350,6 +357,9 @@
                CCCB86D80ACFDFB300CF1E10 /* fs_stop_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop_highlight.png; path = Resources/fs_stop_highlight.png; sourceTree = "<group>"; };
                CCCB86D90ACFDFB300CF1E10 /* fs_stop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_stop.png; path = Resources/fs_stop.png; sourceTree = "<group>"; };
                CCCB86DA0ACFDFB300CF1E10 /* fs_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fs_background.png; path = Resources/fs_background.png; sourceTree = "<group>"; };
+               CCD90F4B0E87C86D0034564A /* add_schedule.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_schedule.png; path = Resources/add_schedule.png; sourceTree = "<group>"; };
+               CCD90F4C0E87C86D0034564A /* add_vod.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_vod.png; path = Resources/add_vod.png; sourceTree = "<group>"; };
+               CCD90F4D0E87C86D0034564A /* add_broadcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = add_broadcast.png; path = Resources/add_broadcast.png; sourceTree = "<group>"; };
                DC769AB7085DF0DB001A838D /* wizard.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; name = wizard.m; path = ../../../modules/gui/macosx/wizard.m; sourceTree = SOURCE_ROOT; tabWidth = 4; usesTabs = 0; };
                DC769AB8085DF0DB001A838D /* wizard.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; name = wizard.h; path = ../../../modules/gui/macosx/wizard.h; sourceTree = SOURCE_ROOT; };
                DC7F46EC08A183FC0027DB24 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/Extended.nib; sourceTree = "<group>"; };
@@ -422,6 +432,7 @@
                                F69B0CA602E24F6401A80112 /* InfoPlist.strings */,
                                8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */,
                                CC1C41D00D9BAD7F002728FA /* noart.png */,
+                               CCD90F4A0E87C82D0034564A /* VLM */,
                                CC0B71E00D54F0DD00448E00 /* simple prefs (taken from qt4) */,
                                8EBF3FA503F140960059A3A7 /* vlc.scriptTerminology */,
                                8EDAC3430440F72D0059A3A7 /* README.MacOSX.rtf */,
@@ -480,6 +491,8 @@
                                CC6EDD500B9CA2140096068A /* eyetv.m */,
                                CCB24D5E0D54BBAE004D780C /* simple_prefs.h */,
                                CCB24D5D0D54BBAE004D780C /* simple_prefs.m */,
+                               CCB60A3F0E6E5DD900407004 /* vlm.h */,
+                               CCB60A3E0E6E5DD900407004 /* vlm.m */,
                        );
                        name = Classes;
                        sourceTree = "<group>";
@@ -729,9 +742,20 @@
                        name = "Native FSPanel icons";
                        sourceTree = "<group>";
                };
+               CCD90F4A0E87C82D0034564A /* VLM */ = {
+                       isa = PBXGroup;
+                       children = (
+                               CCD90F4B0E87C86D0034564A /* add_schedule.png */,
+                               CCD90F4C0E87C86D0034564A /* add_vod.png */,
+                               CCD90F4D0E87C86D0034564A /* add_broadcast.png */,
+                       );
+                       name = VLM;
+                       sourceTree = "<group>";
+               };
                DCF358BC077F1236007DB450 /* nibs */ = {
                        isa = PBXGroup;
                        children = (
+                               CCB60A400E6E5E3F00407004 /* VLM.nib */,
                                CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */,
                                DCA00AA7075F948800E6BF46 /* About.nib */,
                                F74F13EA02C2A79C01EE194C /* MainMenu.nib */,
@@ -933,6 +957,10 @@
                                CC402F3D0E00ABBB006A4BA4 /* display_middle.png in Resources */,
                                CC402F3E0E00ABBB006A4BA4 /* display_left.png in Resources */,
                                CC402F3F0E00ABBB006A4BA4 /* display_right.png in Resources */,
+                               CCB60A420E6E5E3F00407004 /* VLM.nib in Resources */,
+                               CCD90F4E0E87C86D0034564A /* add_schedule.png in Resources */,
+                               CCD90F4F0E87C86D0034564A /* add_vod.png in Resources */,
+                               CCD90F500E87C86D0034564A /* add_broadcast.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };
@@ -973,6 +1001,14 @@
                        name = Update.nib;
                        sourceTree = "<group>";
                };
+               CCB60A400E6E5E3F00407004 /* VLM.nib */ = {
+                       isa = PBXVariantGroup;
+                       children = (
+                               CCB60A410E6E5E3F00407004 /* English */,
+                       );
+                       name = VLM.nib;
+                       sourceTree = "<group>";
+               };
                CCC896B80D9AA9E8005AE59C /* MediaInfo.nib */ = {
                        isa = PBXVariantGroup;
                        children = (

diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am
index 5d706e5a3cb8c94950c9c936002bf1f7c6ca9c4f..98cebba45b13bb3f8eb79dff56892e5a175457c8 100644 (file)
--- a/modules/gui/macosx/Modules.am
+++ b/modules/gui/macosx/Modules.am
@@ -52,5 +52,7 @@ SOURCES_macosx = \
        fspanel.h \
        eyetv.h \
        eyetv.m \
+       vlm.h \
+       vlm.m \
        $(NULL)
 

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index a8fb22a9bc0c390276ce96235e4d4f73b82810c4..e851d409b0f34019f5ea535925622f9e133e4e66 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -102,6 +102,7 @@ struct intf_sys_t
     id o_wizard;                /* VLCWizard      */
     id o_extended;              /* VLCExtended    */
     id o_bookmarks;             /* VLCBookmarks   */
+    id o_vlm;                   /* VLCVLMController */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
     VLCInformation * o_info;                  /* VLCInformation */
@@ -118,6 +119,7 @@ struct intf_sys_t
     BOOL nib_prefs_loaded;      /* preferences nibfile */
     BOOL nib_update_loaded;     /* update nibfile */
     BOOL nib_info_loaded;       /* information panel nibfile */
+    BOOL nib_vlm_loaded;        /* VLM Panel nibfile */
 
     IBOutlet VLControllerWindow * o_window;       /* main window    */
     IBOutlet NSView * o_playlist_view;/* playlist view  */
@@ -189,6 +191,7 @@ struct intf_sys_t
     IBOutlet NSMenuItem * o_mi_open_recent;
     IBOutlet NSMenuItem * o_mi_open_recent_cm;
     IBOutlet NSMenuItem * o_mi_open_wizard;
+    IBOutlet NSMenuItem * o_mi_open_vlm;
 
     IBOutlet NSMenu * o_mu_edit;
     IBOutlet NSMenuItem * o_mi_cut;
@@ -380,6 +383,7 @@ struct intf_sys_t
 - (IBAction)intfOpenCapture:(id)sender;
 
 - (IBAction)showWizard:(id)sender;
+- (IBAction)showVLM:(id)sender;
 - (IBAction)showExtended:(id)sender;
 - (IBAction)showBookmarks:(id)sender;
 

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 2b1b9c4b302f6b66479316c19ab3884c2438e43d..8a6244836a29c80fcb07497e003b2d8b8b0ec108 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -55,6 +55,7 @@
 #import "AppleRemote.h"
 #import "eyetv.h"
 #import "simple_prefs.h"
+#import "vlm.h"
 
 #import <vlc_input.h>
 #import <vlc_interface.h>
@@ -248,6 +249,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_prefs = nil;
     o_open = [[VLCOpen alloc] init];
     o_wizard = [[VLCWizard alloc] init];
+    o_vlm = [[VLCVLMController alloc] init];
     o_extended = nil;
     o_bookmarks = [[VLCBookmarks alloc] init];
     o_embedded_list = [[VLCEmbeddedList alloc] init];
@@ -1291,6 +1293,11 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
     return nil;
 }
 
+- (id)getVLM
+{
+    return o_vlm;
+}
+
 - (id)getBookmarks
 {
     if( o_bookmarks )
@@ -1985,6 +1992,14 @@ end:
     }
 }
 
+- (IBAction)showVLM:(id)sender
+{
+    if( !nib_vlm_loaded )
+        nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner:self];
+
+    [o_vlm showVLMWindow];
+}
+
 - (IBAction)showExtended:(id)sender
 {
     if( o_extended == nil )

diff --git a/modules/gui/macosx/vlm.h b/modules/gui/macosx/vlm.h
new file mode 100644 (file)
index 0000000..bbaeba7
--- /dev/null
+++ b/modules/gui/macosx/vlm.h
@@ -0,0 +1,115 @@
+/*****************************************************************************
+ * vlm.h: VLM Configuration panel for Mac OS X
+ *****************************************************************************
+ * Copyright (c) 2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Felix Paul Kühne <fkuehne@videolan.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+
+#ifdef HAVE_CONFIG_H
+#   import "config.h"
+#endif
+
+#ifdef ENABLE_VLM
+
+#import <Cocoa/Cocoa.h>
+#import "intf.h"
+
+#import <vlc_vlm.h>
+
+@interface VLCVLMController : NSObject
+{
+    /* broadcast panel */
+    IBOutlet NSButton *o_bcast_add_btn;
+    IBOutlet NSBox *o_bcast_box;
+    IBOutlet NSButton *o_bcast_cancel_btn;
+    IBOutlet NSButton *o_bcast_enable_ckb;
+    IBOutlet NSButton *o_bcast_input_btn;
+    IBOutlet NSTextField *o_bcast_input_fld;
+    IBOutlet NSButton *o_bcast_loop_ckb;
+    IBOutlet NSTextField *o_bcast_name_fld;
+    IBOutlet NSButton *o_bcast_output_btn;
+    IBOutlet NSTextField *o_bcast_output_fld;
+    IBOutlet NSPanel *o_bcast_panel;
+
+    /* schedule panel */
+    IBOutlet id o_sched_add_btn;
+    IBOutlet id o_sched_box;
+    IBOutlet id o_sched_cancel_btn;
+    IBOutlet NSDatePicker *o_sched_date_datePicker;
+    IBOutlet NSTextField *o_sched_date_lbl;
+    IBOutlet NSButton *o_sched_input_btn;
+    IBOutlet NSTextField *o_sched_input_fld;
+    IBOutlet NSTextField *o_sched_input_lbl;
+    IBOutlet NSTextField *o_sched_name_fld;
+    IBOutlet NSTextField *o_sched_name_lbl;
+    IBOutlet NSButton *o_sched_output_btn;
+    IBOutlet NSTextField *o_sched_output_fld;
+    IBOutlet NSTextField *o_sched_output_lbl;
+    IBOutlet NSTextField *o_sched_repeat_fld;
+    IBOutlet NSTextField *o_sched_repeat_lbl;
+    IBOutlet NSDatePicker *o_sched_repeatDelay_datePicker;
+    IBOutlet id o_sched_time_box;
+    IBOutlet NSWindow *o_sched_panel;
+
+    /* VLM Window */
+    IBOutlet NSTableView *o_vlm_list;
+    IBOutlet NSWindow *o_vlm_win;
+
+    /* VOD Panel */
+    IBOutlet NSButton *o_vod_add_btn;
+    IBOutlet id o_vod_box;
+    IBOutlet NSButton *o_vod_cancel_btn;
+    IBOutlet NSButton *o_vod_input_btn;
+    IBOutlet NSTextField *o_vod_input_fld;
+    IBOutlet NSTextField *o_vod_input_lbl;
+    IBOutlet NSButton *o_vod_loop_ckb;
+    IBOutlet NSTextField *o_vod_name_fld;
+    IBOutlet NSTextField *o_vod_name_lbl;
+    IBOutlet NSButton *o_vod_output_btn;
+    IBOutlet NSTextField *o_vod_output_fld;
+    IBOutlet NSTextField *o_vod_output_lbl;
+    IBOutlet NSWindow *o_vod_panel;
+}
++ (VLCVLMController *)sharedInstance;
+
+/* toolbar */
+- (NSToolbarItem *) toolbar: (NSToolbar *)o_toolbar 
+      itemForItemIdentifier: (NSString *)o_itemIdent 
+  willBeInsertedIntoToolbar: (BOOL)b_willBeInserted;
+- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar;
+- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar;
+
+- (void)showVLMWindow;
+- (void)initStrings;
+
+- (void)addBcast;
+- (void)addVOD;
+- (void)addSched;
+
+- (IBAction)bcastButtonAction:(id)sender;
+- (IBAction)listDoubleClickAction:(id)sender;
+- (IBAction)schedButtonAction:(id)sender;
+- (IBAction)vodButtonAction:(id)sender;
+
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
+@end
+
+#endif
\ No newline at end of file

diff --git a/modules/gui/macosx/vlm.m b/modules/gui/macosx/vlm.m
new file mode 100644 (file)
index 0000000..de8cde6
--- /dev/null
+++ b/modules/gui/macosx/vlm.m
@@ -0,0 +1,184 @@
+/*****************************************************************************
+ * vlm.m: VLM Configuration panel for Mac OS X
+ *****************************************************************************
+ * Copyright (c) 2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Felix Paul Kühne <fkuehne@videolan.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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+#import "vlm.h"
+
+#ifdef ENABLE_VLM
+
+static NSString * VLCVLMToolbarIdentifier = @"Our VLM Toolbar Identifier";
+static NSString * VLCVODToolbarIdentifier = @"VLM Item";
+static NSString * VLCSchedToolbarIdentifier = @"Sched Item";
+static NSString * VLCBcastToolbarIdentifier = @"Bcast Item";
+
+@implementation VLCVLMController
+
+static VLCVLMController *_o_sharedInstance = nil;
+
++ (VLCVLMController *)sharedInstance
+{
+    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+    if( _o_sharedInstance )
+        [self dealloc];
+    else
+    {
+        _o_sharedInstance = [super init];
+    }
+
+    return _o_sharedInstance;
+}
+
+- (void)awakeFromNib
+{
+    [self initStrings];
+    
+    /* setup the toolbar */
+    NSToolbar * o_vlm_toolbar = [[[NSToolbar alloc] initWithIdentifier: VLCVLMToolbarIdentifier] autorelease];
+    [o_vlm_toolbar setAllowsUserCustomization: NO];
+    [o_vlm_toolbar setAutosavesConfiguration: NO];
+    [o_vlm_toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
+    [o_vlm_toolbar setSizeMode: NSToolbarSizeModeRegular];
+    [o_vlm_toolbar setDelegate: self];
+    [o_vlm_win setToolbar: o_vlm_toolbar];
+}
+
+#define CreateToolbarItem( o_name, o_desc, o_img, sel ) \
+    o_toolbarItem = create_toolbar_item(o_itemIdent, o_name, o_desc, o_img, self, @selector(sel));
+static inline NSToolbarItem *
+create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_desc, NSString * o_img, id target, SEL selector )
+{
+    NSToolbarItem *o_toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: o_itemIdent] autorelease]; \
+
+    [o_toolbarItem setLabel: o_name];
+    [o_toolbarItem setPaletteLabel: o_desc];
+
+    [o_toolbarItem setToolTip: o_desc];
+    [o_toolbarItem setImage: [NSImage imageNamed: o_img]];
+
+    [o_toolbarItem setTarget: target];
+    [o_toolbarItem setAction: selector];
+
+    [o_toolbarItem setEnabled: YES];
+    [o_toolbarItem setAutovalidates: YES];
+
+    return o_toolbarItem;
+}
+
+- (NSToolbarItem *) toolbar: (NSToolbar *)o_sprefs_toolbar 
+      itemForItemIdentifier: (NSString *)o_itemIdent 
+  willBeInsertedIntoToolbar: (BOOL)b_willBeInserted
+{
+    NSToolbarItem *o_toolbarItem = nil;
+
+    if( [o_itemIdent isEqual: VLCVODToolbarIdentifier] )
+    {
+        CreateToolbarItem( _NS("Video On Demand"), _NS("Video On Demand"), @"add_vod", addVOD );
+    }
+    else if( [o_itemIdent isEqual: VLCSchedToolbarIdentifier] )
+    {
+        CreateToolbarItem( _NS("Schedule"), _NS("Schedule"), @"add_schedule", addSched );
+    }
+    else if( [o_itemIdent isEqual: VLCBcastToolbarIdentifier] )
+    {
+        CreateToolbarItem( _NS("Broadcast"), _NS("Broadcast"), @"add_broadcast", addBcast );
+    }
+
+    return o_toolbarItem;
+}
+
+- (NSArray *)toolbarDefaultItemIdentifiers: (NSToolbar *)toolbar
+{
+    return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+}
+
+- (NSArray *)toolbarAllowedItemIdentifiers: (NSToolbar *)toolbar
+{
+    return [NSArray arrayWithObjects: VLCBcastToolbarIdentifier, VLCSchedToolbarIdentifier, VLCVODToolbarIdentifier, NSToolbarFlexibleSpaceItemIdentifier, nil];
+}
+
+- (void)initStrings
+{
+    /* not implemented */
+}
+
+- (void)showVLMWindow
+{
+    [o_vlm_win makeKeyAndOrderFront: self];
+}
+
+- (void)addBcast
+{
+    [NSApp beginSheet: o_bcast_panel modalForWindow: o_vlm_win
+        modalDelegate: self didEndSelector: nil contextInfo: nil];
+}
+
+- (void)addVOD
+{
+    [NSApp beginSheet: o_vod_panel modalForWindow: o_vlm_win
+        modalDelegate: self didEndSelector: nil contextInfo: nil];
+}
+
+- (void)addSched
+{ 
+    [NSApp beginSheet: o_sched_panel modalForWindow: o_vlm_win
+         modalDelegate: self didEndSelector: nil contextInfo: nil];
+}
+
+- (IBAction)bcastButtonAction:(id)sender
+{
+    [NSApp endSheet: o_bcast_panel];
+    [o_bcast_panel close];
+}
+
+- (IBAction)listDoubleClickAction:(id)sender
+{
+}
+
+- (IBAction)schedButtonAction:(id)sender
+{
+    [NSApp endSheet: o_sched_panel];
+    [o_sched_panel close];
+}
+
+- (IBAction)vodButtonAction:(id)sender
+{
+    [NSApp endSheet: o_vod_panel];
+    [o_vod_panel close];
+}
+
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView
+{
+    return 0;
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
+{
+    return @"dummy";
+}
+
+@end
+
+#endif
\ No newline at end of file