* seperated the open, sout and sub-open dialogues from the main nib
authorFelix Paul Kühne <fkuehne@videolan.org>
Mon, 3 Jan 2005 23:01:42 +0000 (23:01 +0000)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 3 Jan 2005 23:01:42 +0000 (23:01 +0000)
12 files changed:
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib [new file with mode: 0644]
extras/MacOSX/Resources/English.lproj/Open.nib/info.nib [new file with mode: 0644]
extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib [new file with mode: 0644]
extras/MacOSX/vlc.pbproj/project.pbxproj
modules/gui/macosx/controls.m
modules/gui/macosx/intf.h
modules/gui/macosx/intf.m
modules/gui/macosx/open.h
modules/gui/macosx/open.m

index 23aec6d..3130ac2 100644 (file)
             ACTIONS = {
                 clearRecentItems = id; 
                 closeError = id; 
+                intfOpenDisc = id; 
+                intfOpenFile = id; 
+                intfOpenFileGeneric = id; 
+                intfOpenNet = id; 
                 openCrashLog = id; 
                 openDocumentation = id; 
                 openLicense = id; 
                 "o_mu_videotrack" = id; 
                 "o_mu_visual" = id; 
                 "o_mu_window" = id; 
+                "o_open" = id; 
                 "o_playlist" = id; 
                 "o_scrollfield" = id; 
                 "o_timefield" = id; 
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {
-                openDisc = id; 
-                openDiscMenusChanged = id; 
-                openDiscStepperChanged = id; 
-                openDiscTypeChanged = id; 
-                openFile = id; 
-                openFileBrowse = id; 
-                openFileGeneric = id; 
-                openFileStreamChanged = id; 
-                openNet = id; 
-                openNetModeChanged = id; 
-                openNetStepperChanged = id; 
-                openVTSBrowse = id; 
-                panelCancel = id; 
-                panelOk = id; 
-                subCloseSheet = id; 
-                subDelayStepperChanged = id; 
-                subFileBrowse = id; 
-                subFpsStepperChanged = id; 
-                subOverride = id; 
-                subSettings = id; 
-                subsChanged = id; 
-            }; 
+            ACTIONS = {}; 
             CLASS = VLCOpen; 
             LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_btn_cancel" = id; 
-                "o_btn_ok" = id; 
-                "o_disc_chapter" = id; 
-                "o_disc_chapter_lbl" = id; 
-                "o_disc_chapter_stp" = id; 
-                "o_disc_device" = id; 
-                "o_disc_device_lbl" = id; 
-                "o_disc_dvd_menus" = id; 
-                "o_disc_title" = id; 
-                "o_disc_title_lbl" = id; 
-                "o_disc_title_stp" = id; 
-                "o_disc_type" = id; 
-                "o_disc_videots_btn_browse" = id; 
-                "o_disc_videots_folder" = id; 
-                "o_file_btn_browse" = id; 
-                "o_file_path" = id; 
-                "o_file_stream" = id; 
-                "o_file_sub_align_lbl" = id; 
-                "o_file_sub_align_pop" = id; 
-                "o_file_sub_btn_browse" = id; 
-                "o_file_sub_btn_settings" = id; 
-                "o_file_sub_ckbox" = id; 
-                "o_file_sub_delay" = id; 
-                "o_file_sub_delay_lbl" = id; 
-                "o_file_sub_delay_stp" = id; 
-                "o_file_sub_encoding_lbl" = id; 
-                "o_file_sub_encoding_pop" = id; 
-                "o_file_sub_file_box" = id; 
-                "o_file_sub_font_box" = id; 
-                "o_file_sub_fps" = id; 
-                "o_file_sub_fps_lbl" = id; 
-                "o_file_sub_fps_stp" = id; 
-                "o_file_sub_ok_btn" = id; 
-                "o_file_sub_override" = id; 
-                "o_file_sub_path" = id; 
-                "o_file_sub_sheet" = id; 
-                "o_file_sub_size_lbl" = id; 
-                "o_file_sub_size_pop" = id; 
-                "o_mrl" = id; 
-                "o_mrl_lbl" = id; 
-                "o_net_http_url" = id; 
-                "o_net_http_url_lbl" = id; 
-                "o_net_mode" = id; 
-                "o_net_udp_port" = id; 
-                "o_net_udp_port_lbl" = id; 
-                "o_net_udp_port_stp" = id; 
-                "o_net_udpm_addr" = id; 
-                "o_net_udpm_addr_lbl" = id; 
-                "o_net_udpm_port" = id; 
-                "o_net_udpm_port_lbl" = id; 
-                "o_net_udpm_port_stp" = id; 
-                "o_output_ckbox" = id; 
-                "o_panel" = id; 
-                "o_playlist" = id; 
-                "o_sout_options" = id; 
-                "o_tabview" = id; 
-            }; 
+            OUTLETS = {}; 
             SUPERCLASS = NSObject; 
         }, 
         {
-            ACTIONS = {
-                announceChanged = id; 
-                outputChanged = id; 
-                outputCloseSheet = id; 
-                outputFileBrowse = id; 
-                outputInfoChanged = id; 
-                outputMethodChanged = id; 
-                outputSettings = id; 
-                streamPortStepperChanged = id; 
-                streamTTLStepperChanged = id; 
-                transcodeChanged = id; 
-                transcodeInfoChanged = id; 
-            }; 
+            ACTIONS = {}; 
             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_slp_chkbox" = 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; 
-            }; 
+            OUTLETS = {}; 
             SUPERCLASS = NSObject; 
         }, 
         {
index 2284bda..ae25b06 100644 (file)
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>IBDocumentLocation</key>
-       <string>470 105 505 517 0 0 1024 746 </string>
+       <string>16 61 505 517 0 0 800 578 </string>
        <key>IBEditorPositions</key>
        <dict>
                <key>1617</key>
@@ -11,7 +11,7 @@
                <key>2197</key>
                <string>91 300 596 367 0 0 1024 746 </string>
                <key>29</key>
-               <string>229 690 419 44 0 0 1024 746 </string>
+               <string>163 439 419 44 0 0 800 578 </string>
                <key>915</key>
                <string>731 416 165 180 0 0 1024 746 </string>
        </dict>
                <integer>2206</integer>
                <integer>2199</integer>
        </array>
+       <key>IBOpenObjects</key>
+       <array>
+               <integer>29</integer>
+       </array>
        <key>IBSystem Version</key>
        <string>7S215</string>
 </dict>
index dc83e33..e2c0120 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ
diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
new file mode 100644 (file)
index 0000000..9c7d658
--- /dev/null
@@ -0,0 +1,417 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; }, 
+        {
+            ACTIONS = {showPanel = id; }; 
+            CLASS = VLAboutBox; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
+        {CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; }, 
+        {CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
+        {CLASS = VLCControllerWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, 
+        {
+            ACTIONS = {
+                backward = id; 
+                faster = id; 
+                forward = id; 
+                loop = id; 
+                mute = id; 
+                next = id; 
+                pause = id; 
+                play = id; 
+                position = id; 
+                prev = id; 
+                random = id; 
+                repeat = id; 
+                slower = id; 
+                stop = id; 
+                toggleVar = id; 
+                volumeDown = id; 
+                volumeSliderUpdated = id; 
+                volumeUp = id; 
+                windowAction = id; 
+            }; 
+            CLASS = VLCControls; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_btn_fullscreen" = id; 
+                "o_main" = id; 
+                "o_open" = id; 
+                "o_volumeslider" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                bandSliderUpdated = id; 
+                changePreset = id; 
+                enable = id; 
+                preampSliderUpdated = id; 
+                toggleWindow = id; 
+                twopass = id; 
+            }; 
+            CLASS = VLCEqualizer; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_btn_equalizer" = id; 
+                "o_ckb_2pass" = id; 
+                "o_ckb_enable" = id; 
+                "o_fld_preamp" = id; 
+                "o_popup_presets" = id; 
+                "o_slider_band1" = id; 
+                "o_slider_band10" = id; 
+                "o_slider_band2" = id; 
+                "o_slider_band3" = id; 
+                "o_slider_band4" = id; 
+                "o_slider_band5" = id; 
+                "o_slider_band6" = id; 
+                "o_slider_band7" = id; 
+                "o_slider_band8" = id; 
+                "o_slider_band9" = id; 
+                "o_slider_preamp" = id; 
+                "o_window" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                createOutlineGroup = id; 
+                deleteOutlineGroup = id; 
+                infoCancel = id; 
+                infoOk = id; 
+                toggleInfoPanel = id; 
+                togglePlaylistInfoPanel = id; 
+            }; 
+            CLASS = VLCInfo; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_author_lbl" = id; 
+                "o_author_txt" = id; 
+                "o_btn_cancel" = id; 
+                "o_btn_ok" = id; 
+                "o_info_window" = id; 
+                "o_outline_view" = id; 
+                "o_title_lbl" = id; 
+                "o_title_txt" = id; 
+                "o_uri_lbl" = id; 
+                "o_uri_txt" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                clearRecentItems = id; 
+                closeError = id; 
+                openCrashLog = id; 
+                openDocumentation = id; 
+                openLicense = id; 
+                openReadMe = id; 
+                openRecentItem = id; 
+                openWebsite = id; 
+                reportABug = id; 
+                timesliderUpdate = id; 
+                viewAbout = id; 
+                viewPreferences = id; 
+            }; 
+            CLASS = VLCMain; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_btn_ff" = id; 
+                "o_btn_fullscreen" = id; 
+                "o_btn_next" = id; 
+                "o_btn_play" = id; 
+                "o_btn_prev" = id; 
+                "o_btn_rewind" = id; 
+                "o_btn_stop" = id; 
+                "o_controls" = id; 
+                "o_dmi_mute" = id; 
+                "o_dmi_next" = id; 
+                "o_dmi_play" = id; 
+                "o_dmi_previous" = id; 
+                "o_dmi_stop" = id; 
+                "o_err_btn_dismiss" = id; 
+                "o_err_btn_msgs" = id; 
+                "o_err_bug_lbl" = id; 
+                "o_err_ckbk_surpress" = id; 
+                "o_err_lbl" = id; 
+                "o_err_msg" = id; 
+                "o_error" = id; 
+                "o_info" = id; 
+                "o_messages" = id; 
+                "o_mi_about" = id; 
+                "o_mi_add_intf" = id; 
+                "o_mi_audiotrack" = id; 
+                "o_mi_bring_atf" = id; 
+                "o_mi_bwd" = id; 
+                "o_mi_channels" = id; 
+                "o_mi_chapter" = id; 
+                "o_mi_clear" = id; 
+                "o_mi_close_window" = id; 
+                "o_mi_controller" = id; 
+                "o_mi_copy" = id; 
+                "o_mi_cut" = id; 
+                "o_mi_deinterlace" = id; 
+                "o_mi_device" = id; 
+                "o_mi_documentation" = id; 
+                "o_mi_double_window" = id; 
+                "o_mi_equalizer" = id; 
+                "o_mi_faster" = id; 
+                "o_mi_ffmpeg_pp" = id; 
+                "o_mi_fittoscreen" = id; 
+                "o_mi_floatontop" = id; 
+                "o_mi_fullscreen" = id; 
+                "o_mi_fwd" = id; 
+                "o_mi_half_window" = id; 
+                "o_mi_hide" = id; 
+                "o_mi_hide_others" = id; 
+                "o_mi_info" = id; 
+                "o_mi_license" = id; 
+                "o_mi_loop" = id; 
+                "o_mi_messages" = id; 
+                "o_mi_minimize" = id; 
+                "o_mi_mute" = id; 
+                "o_mi_next" = id; 
+                "o_mi_normal_window" = id; 
+                "o_mi_open_disc" = id; 
+                "o_mi_open_file" = id; 
+                "o_mi_open_generic" = id; 
+                "o_mi_open_net" = id; 
+                "o_mi_open_recent" = id; 
+                "o_mi_open_recent_cm" = id; 
+                "o_mi_paste" = id; 
+                "o_mi_play" = id; 
+                "o_mi_playlist" = id; 
+                "o_mi_prefs" = id; 
+                "o_mi_previous" = id; 
+                "o_mi_program" = id; 
+                "o_mi_quit" = id; 
+                "o_mi_random" = id; 
+                "o_mi_readme" = id; 
+                "o_mi_repeat" = id; 
+                "o_mi_reportabug" = id; 
+                "o_mi_screen" = id; 
+                "o_mi_select_all" = id; 
+                "o_mi_services" = id; 
+                "o_mi_show_all" = id; 
+                "o_mi_slower" = id; 
+                "o_mi_snapshot" = id; 
+                "o_mi_stop" = id; 
+                "o_mi_subtitle" = id; 
+                "o_mi_title" = id; 
+                "o_mi_videotrack" = id; 
+                "o_mi_visual" = id; 
+                "o_mi_vol_down" = id; 
+                "o_mi_vol_up" = id; 
+                "o_mi_website" = id; 
+                "o_msgs_btn_crashlog" = id; 
+                "o_msgs_panel" = id; 
+                "o_mu_add_intf" = id; 
+                "o_mu_audio" = id; 
+                "o_mu_audiotrack" = id; 
+                "o_mu_channels" = id; 
+                "o_mu_chapter" = id; 
+                "o_mu_controls" = id; 
+                "o_mu_deinterlace" = id; 
+                "o_mu_device" = id; 
+                "o_mu_edit" = id; 
+                "o_mu_ffmpeg_pp" = id; 
+                "o_mu_file" = id; 
+                "o_mu_help" = id; 
+                "o_mu_program" = id; 
+                "o_mu_screen" = id; 
+                "o_mu_subtitle" = id; 
+                "o_mu_title" = id; 
+                "o_mu_video" = id; 
+                "o_mu_videotrack" = id; 
+                "o_mu_visual" = id; 
+                "o_mu_window" = id; 
+                "o_playlist" = id; 
+                "o_scrollfield" = id; 
+                "o_timefield" = id; 
+                "o_timeslider" = id; 
+                "o_volumeslider" = id; 
+                "o_window" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {
+                openDisc = id; 
+                openDiscMenusChanged = id; 
+                openDiscStepperChanged = id; 
+                openDiscTypeChanged = id; 
+                openFile = id; 
+                openFileBrowse = id; 
+                openFileGeneric = id; 
+                openFileStreamChanged = id; 
+                openNet = id; 
+                openNetModeChanged = id; 
+                openNetStepperChanged = id; 
+                openVTSBrowse = id; 
+                panelCancel = id; 
+                panelOk = id; 
+                subCloseSheet = id; 
+                subDelayStepperChanged = id; 
+                subFileBrowse = id; 
+                subFpsStepperChanged = id; 
+                subOverride = id; 
+                subSettings = id; 
+                subsChanged = id; 
+            }; 
+            CLASS = VLCOpen; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_btn_cancel" = id; 
+                "o_btn_ok" = id; 
+                "o_disc_chapter" = id; 
+                "o_disc_chapter_lbl" = id; 
+                "o_disc_chapter_stp" = id; 
+                "o_disc_device" = id; 
+                "o_disc_device_lbl" = id; 
+                "o_disc_dvd_menus" = id; 
+                "o_disc_title" = id; 
+                "o_disc_title_lbl" = id; 
+                "o_disc_title_stp" = id; 
+                "o_disc_type" = id; 
+                "o_disc_videots_btn_browse" = id; 
+                "o_disc_videots_folder" = id; 
+                "o_file_btn_browse" = id; 
+                "o_file_path" = id; 
+                "o_file_stream" = id; 
+                "o_file_sub_align_lbl" = id; 
+                "o_file_sub_align_pop" = id; 
+                "o_file_sub_btn_browse" = id; 
+                "o_file_sub_btn_settings" = id; 
+                "o_file_sub_ckbox" = id; 
+                "o_file_sub_delay" = id; 
+                "o_file_sub_delay_lbl" = id; 
+                "o_file_sub_delay_stp" = id; 
+                "o_file_sub_encoding_lbl" = id; 
+                "o_file_sub_encoding_pop" = id; 
+                "o_file_sub_file_box" = id; 
+                "o_file_sub_font_box" = id; 
+                "o_file_sub_fps" = id; 
+                "o_file_sub_fps_lbl" = id; 
+                "o_file_sub_fps_stp" = id; 
+                "o_file_sub_ok_btn" = id; 
+                "o_file_sub_override" = id; 
+                "o_file_sub_path" = id; 
+                "o_file_sub_sheet" = id; 
+                "o_file_sub_size_lbl" = id; 
+                "o_file_sub_size_pop" = id; 
+                "o_mrl" = id; 
+                "o_mrl_lbl" = id; 
+                "o_net_http_url" = id; 
+                "o_net_http_url_lbl" = id; 
+                "o_net_mode" = id; 
+                "o_net_udp_port" = id; 
+                "o_net_udp_port_lbl" = id; 
+                "o_net_udp_port_stp" = id; 
+                "o_net_udpm_addr" = id; 
+                "o_net_udpm_addr_lbl" = id; 
+                "o_net_udpm_port" = id; 
+                "o_net_udpm_port_lbl" = id; 
+                "o_net_udpm_port_stp" = id; 
+                "o_output_ckbox" = id; 
+                "o_panel" = id; 
+                "o_playlist" = id; 
+                "o_sout_options" = id; 
+                "o_tabview" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            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_slp_chkbox" = 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 = {}; 
+            CLASS = VLCPlaylist; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {}; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
+        {
+            ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; 
+            CLASS = VLCPrefs; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                "o_advanced_ckb" = id; 
+                "o_cancel_btn" = id; 
+                "o_prefs_view" = id; 
+                "o_prefs_window" = id; 
+                "o_reset_btn" = id; 
+                "o_save_btn" = id; 
+                "o_tree" = id; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
new file mode 100644 (file)
index 0000000..20967e1
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>IBDocumentLocation</key>
+       <string>-8 61 505 517 0 0 800 578 </string>
+       <key>IBFramework Version</key>
+       <string>364.0</string>
+       <key>IBLockedObjects</key>
+       <array>
+               <integer>2203</integer>
+               <integer>2208</integer>
+               <integer>2206</integer>
+               <integer>2199</integer>
+       </array>
+       <key>IBSystem Version</key>
+       <string>7S215</string>
+</dict>
+</plist>
diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib
new file mode 100644 (file)
index 0000000..2797967
Binary files /dev/null and b/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib differ
index ecedc40..584000e 100644 (file)
                                8E9CA1C106D7DEE800B7186C,
                                DCA00AA9075F948800E6BF46,
                                DCF358BB077F10BA007DB450,
+                               DCA693C30789DF8700139EC6,
                        );
                        isa = PBXResourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                        settings = {
                        };
                };
+               DCA693C10789DF8700139EC6 = {
+                       children = (
+                               DCA693C20789DF8700139EC6,
+                       );
+                       isa = PBXVariantGroup;
+                       name = Open.nib;
+                       path = "";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               DCA693C20789DF8700139EC6 = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.nib;
+                       name = English;
+                       path = Resources/English.lproj/Open.nib;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               DCA693C30789DF8700139EC6 = {
+                       fileRef = DCA693C10789DF8700139EC6;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                DCF358B9077F10BA007DB450 = {
                        children = (
                                DCF358BA077F10BA007DB450,
                                DCA00AA7075F948800E6BF46,
                                F74F13EA02C2A79C01EE194C,
                                DCF358B9077F10BA007DB450,
+                               DCA693C10789DF8700139EC6,
                        );
                        isa = PBXGroup;
                        name = nibs;
index 1a5ecac..c7f4eae 100644 (file)
@@ -54,7 +54,7 @@
         {
             vlc_mutex_unlock( &p_playlist->object_lock );
             vlc_object_release( p_playlist );
-            [o_open openFileGeneric: nil];
+            [o_open openFileGeneric];
         }
         else
         {
index fe350ad..e6f8638 100644 (file)
@@ -82,7 +82,8 @@ struct intf_sys_t
 {
     intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
-    id o_about;                 /* VLAboutBox */
+    id o_about;                 /* VLAboutBox     */
+    id o_open;                  /* VLCOpen        */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_scrollfield;  /* info field     */
@@ -261,6 +262,11 @@ struct intf_sys_t
 - (IBAction)clearRecentItems:(id)sender;
 - (void)openRecentItem:(id)sender;
 
+- (IBAction)intfOpenFile:(id)sender;
+- (IBAction)intfOpenFileGeneric:(id)sender;
+- (IBAction)intfOpenDisc:(id)sender;
+- (IBAction)intfOpenNet:(id)sender;
+
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)closeError:(id)sender;
index 5132481..3483558 100644 (file)
@@ -37,6 +37,7 @@
 #include "playlist.h"
 #include "controls.h"
 #include "about.h"
+#include "open.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -375,6 +376,10 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     [self setSubmenusEnabled: FALSE];
     [self manageVolumeSlider];
+    
+    /* let's load the open and sout-option dialogues and init the related classes */
+    o_open = [[VLCOpen alloc] init];
+    [o_open getReady];
 
     p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
 
@@ -1283,6 +1288,26 @@ static VLCMain *_o_sharedMainInstance = nil;
     [self application: nil openFile: [sender title]];
 }
 
+- (IBAction)intfOpenFile:(id)sender
+{
+    [o_open openFile];
+}
+
+- (IBAction)intfOpenFileGeneric:(id)sender
+{
+    [o_open openFileGeneric];
+}
+
+- (IBAction)intfOpenDisc:(id)sender
+{
+    [o_open openDisc];
+}
+
+- (IBAction)intfOpenNet:(id)sender
+{
+    [o_open openNet];
+}
+
 - (IBAction)viewAbout:(id)sender
 {
     [o_about showPanel];
index 6ec28f4..59034d9 100644 (file)
@@ -96,24 +96,26 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
     IBOutlet id o_sout_options;
 }
 
++ (VLCOpen *)sharedInstance;
+
 - (void)setSubPanel;
 - (void)openTarget:(int)i_type;
 - (void)tabView:(NSTabView *)o_tv didSelectTabViewItem:(NSTabViewItem *)o_tvi;
 
-- (IBAction)openFileGeneric:(id)sender;
+- (void)openFileGeneric;
 - (void)openFilePathChanged:(NSNotification *)o_notification;
 - (IBAction)openFileBrowse:(id)sender;
 - (void) pathChosenInPanel: (NSOpenPanel *) sheet withReturn:(int)returnCode contextInfo:(void  *)contextInfo;
 - (IBAction)openFileStreamChanged:(id)sender;
 
-- (IBAction)openDisc:(id)sender;
+- (void)openDisc;
 - (IBAction)openDiscTypeChanged:(id)sender;
 - (IBAction)openDiscStepperChanged:(id)sender;
 - (void)openDiscInfoChanged:(NSNotification *)o_notification;
 - (IBAction)openDiscMenusChanged:(id)sender;
 - (IBAction)openVTSBrowse:(id)sender;
 
-- (IBAction)openNet:(id)sender;
+- (void)openNet;
 - (IBAction)openNetModeChanged:(id)sender;
 - (IBAction)openNetStepperChanged:(id)sender;
 - (void)openNetInfoChanged:(NSNotification *)o_notification;
@@ -129,6 +131,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 - (IBAction)panelCancel:(id)sender;
 - (IBAction)panelOk:(id)sender;
 
-- (IBAction)openFile:(id)sender;
+- (void)openFile;
 
+- (void)getReady;
 @end
index af42eb9..4bbbbd5 100644 (file)
@@ -129,6 +129,29 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
  *****************************************************************************/
 @implementation VLCOpen
 
+static VLCOpen *_o_sharedMainInstance = nil;
+
++ (VLCOpen *)sharedInstance
+{
+    return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+    if( _o_sharedMainInstance) {
+        [self dealloc];
+    } else {
+        _o_sharedMainInstance = [super init];
+    }
+    
+    return _o_sharedMainInstance;
+}
+
+- (void)getReady
+{
+    [NSBundle loadNibNamed:@"Open" owner:self];
+}
+
 - (void)awakeFromNib
 {
     intf_thread_t * p_intf = VLCIntf;
@@ -358,19 +381,19 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     }  
 }
 
-- (IBAction)openFileGeneric:(id)sender
+- (void)openFileGeneric
 {
     [self openFilePathChanged: nil];
     [self openTarget: 0];
 }
 
-- (IBAction)openDisc:(id)sender
+- (void)openDisc
 {
     [self openDiscTypeChanged: nil];
     [self openTarget: 1];
 }
 
-- (IBAction)openNet:(id)sender
+- (void)openNet
 {
     [self openNetModeChanged: nil];
     [self openTarget: 2];
@@ -704,7 +727,7 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class )
     [o_mrl setStringValue: o_mrl_string];
 }
 
-- (IBAction)openFile:(id)sender
+- (void)openFile
 {
     NSOpenPanel *o_open_panel = [NSOpenPanel openPanel];
     int i;