macosx: resized to the open dialogue again and cleaned-up the screen input section
authorFelix Paul Kühne <fkuehne@videolan.org>
Tue, 3 Feb 2009 16:12:48 +0000 (17:12 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 3 Feb 2009 16:16:08 +0000 (17:16 +0100)
extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
modules/gui/macosx/open.h
modules/gui/macosx/open.m

index ec197e2..bbd1503 100644 (file)
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>IBClasses</key>
-       <array>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>eyetvGetPlugin</key>
-                               <string>id</string>
-                               <key>eyetvLaunch</key>
-                               <string>id</string>
-                               <key>eyetvSwitchChannel</key>
-                               <string>id</string>
-                               <key>openCaptureModeChanged</key>
-                               <string>id</string>
-                               <key>openDisc</key>
-                               <string>id</string>
-                               <key>openDiscMenusChanged</key>
-                               <string>id</string>
-                               <key>openDiscStepperChanged</key>
-                               <string>id</string>
-                               <key>openDiscTypeChanged</key>
-                               <string>id</string>
-                               <key>openFile</key>
-                               <string>id</string>
-                               <key>openFileBrowse</key>
-                               <string>id</string>
-                               <key>openFileGeneric</key>
-                               <string>id</string>
-                               <key>openFileStreamChanged</key>
-                               <string>id</string>
-                               <key>openNet</key>
-                               <string>id</string>
-                               <key>openNetModeChanged</key>
-                               <string>id</string>
-                               <key>openNetStepperChanged</key>
-                               <string>id</string>
-                               <key>openVTSBrowse</key>
-                               <string>id</string>
-                               <key>panelCancel</key>
-                               <string>id</string>
-                               <key>panelOk</key>
-                               <string>id</string>
-                               <key>screenStepperChanged</key>
-                               <string>id</string>
-                               <key>subCloseSheet</key>
-                               <string>id</string>
-                               <key>subDelayStepperChanged</key>
-                               <string>id</string>
-                               <key>subFileBrowse</key>
-                               <string>id</string>
-                               <key>subFpsStepperChanged</key>
-                               <string>id</string>
-                               <key>subOverride</key>
-                               <string>id</string>
-                               <key>subSettings</key>
-                               <string>id</string>
-                               <key>subsChanged</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCOpen</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_cancel</key>
-                               <string>id</string>
-                               <key>o_btn_ok</key>
-                               <string>id</string>
-                               <key>o_capture_label_view</key>
-                               <string>id</string>
-                               <key>o_capture_lbl</key>
-                               <string>id</string>
-                               <key>o_capture_long_lbl</key>
-                               <string>id</string>
-                               <key>o_capture_mode_pop</key>
-                               <string>id</string>
-                               <key>o_disc_chapter</key>
-                               <string>id</string>
-                               <key>o_disc_chapter_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_chapter_stp</key>
-                               <string>id</string>
-                               <key>o_disc_device</key>
-                               <string>id</string>
-                               <key>o_disc_device_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_dvd_menus</key>
-                               <string>id</string>
-                               <key>o_disc_title</key>
-                               <string>id</string>
-                               <key>o_disc_title_lbl</key>
-                               <string>id</string>
-                               <key>o_disc_title_stp</key>
-                               <string>id</string>
-                               <key>o_disc_type</key>
-                               <string>id</string>
-                               <key>o_disc_videots_btn_browse</key>
-                               <string>id</string>
-                               <key>o_disc_videots_folder</key>
-                               <string>id</string>
-                               <key>o_eyetv_channels_pop</key>
-                               <string>id</string>
-                               <key>o_eyetv_chn_bgbar</key>
-                               <string>id</string>
-                               <key>o_eyetv_chn_status_txt</key>
-                               <string>id</string>
-                               <key>o_eyetv_currentChannel_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_getPlugin_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_launchEyeTV_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_nextProgram_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_noInstanceLong_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_noInstance_lbl</key>
-                               <string>id</string>
-                               <key>o_eyetv_notLaunched_view</key>
-                               <string>id</string>
-                               <key>o_eyetv_previousProgram_btn</key>
-                               <string>id</string>
-                               <key>o_eyetv_running_view</key>
-                               <string>id</string>
-                               <key>o_file_btn_browse</key>
-                               <string>id</string>
-                               <key>o_file_path</key>
-                               <string>id</string>
-                               <key>o_file_stream</key>
-                               <string>id</string>
-                               <key>o_file_sub_align_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_align_pop</key>
-                               <string>id</string>
-                               <key>o_file_sub_btn_browse</key>
-                               <string>id</string>
-                               <key>o_file_sub_btn_settings</key>
-                               <string>id</string>
-                               <key>o_file_sub_ckbox</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_delay_stp</key>
-                               <string>id</string>
-                               <key>o_file_sub_encoding_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_encoding_pop</key>
-                               <string>id</string>
-                               <key>o_file_sub_file_box</key>
-                               <string>id</string>
-                               <key>o_file_sub_font_box</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_fps_stp</key>
-                               <string>id</string>
-                               <key>o_file_sub_ok_btn</key>
-                               <string>id</string>
-                               <key>o_file_sub_override</key>
-                               <string>id</string>
-                               <key>o_file_sub_path</key>
-                               <string>id</string>
-                               <key>o_file_sub_sheet</key>
-                               <string>id</string>
-                               <key>o_file_sub_size_lbl</key>
-                               <string>id</string>
-                               <key>o_file_sub_size_pop</key>
-                               <string>id</string>
-                               <key>o_mrl</key>
-                               <string>id</string>
-                               <key>o_mrl_lbl</key>
-                               <string>id</string>
-                               <key>o_net_http_url</key>
-                               <string>id</string>
-                               <key>o_net_http_url_lbl</key>
-                               <string>id</string>
-                               <key>o_net_mode</key>
-                               <string>id</string>
-                               <key>o_net_timeshift_ckbox</key>
-                               <string>id</string>
-                               <key>o_net_udp_port</key>
-                               <string>id</string>
-                               <key>o_net_udp_port_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udp_port_stp</key>
-                               <string>id</string>
-                               <key>o_net_udpm_addr</key>
-                               <string>id</string>
-                               <key>o_net_udpm_addr_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port_lbl</key>
-                               <string>id</string>
-                               <key>o_net_udpm_port_stp</key>
-                               <string>id</string>
-                               <key>o_output_ckbox</key>
-                               <string>id</string>
-                               <key>o_panel</key>
-                               <string>id</string>
-                               <key>o_playlist</key>
-                               <string>id</string>
-                               <key>o_screen_follow_mouse_btn</key>
-                               <string>id</string>
-                               <key>o_screen_fps_fld</key>
-                               <string>id</string>
-                               <key>o_screen_fps_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_fps_stp</key>
-                               <string>id</string>
-                               <key>o_screen_height_fld</key>
-                               <string>id</string>
-                               <key>o_screen_height_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_left_fld</key>
-                               <string>id</string>
-                               <key>o_screen_left_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_long_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_top_fld</key>
-                               <string>id</string>
-                               <key>o_screen_top_lbl</key>
-                               <string>id</string>
-                               <key>o_screen_view</key>
-                               <string>id</string>
-                               <key>o_screen_width_fld</key>
-                               <string>id</string>
-                               <key>o_screen_width_lbl</key>
-                               <string>id</string>
-                               <key>o_sout_options</key>
-                               <string>id</string>
-                               <key>o_tabview</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCOpenTextField</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSTextField</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key>announceChanged</key>
-                               <string>id</string>
-                               <key>outputChanged</key>
-                               <string>id</string>
-                               <key>outputCloseSheet</key>
-                               <string>id</string>
-                               <key>outputFileBrowse</key>
-                               <string>id</string>
-                               <key>outputInfoChanged</key>
-                               <string>id</string>
-                               <key>outputMethodChanged</key>
-                               <string>id</string>
-                               <key>outputSettings</key>
-                               <string>id</string>
-                               <key>streamPortStepperChanged</key>
-                               <string>id</string>
-                               <key>streamTTLStepperChanged</key>
-                               <string>id</string>
-                               <key>transcodeChanged</key>
-                               <string>id</string>
-                               <key>transcodeInfoChanged</key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>VLCOutput</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>OUTLETS</key>
-                       <dict>
-                               <key>o_btn_browse</key>
-                               <string>id</string>
-                               <key>o_btn_ok</key>
-                               <string>id</string>
-                               <key>o_channel_name</key>
-                               <string>id</string>
-                               <key>o_channel_name_lbl</key>
-                               <string>id</string>
-                               <key>o_display</key>
-                               <string>id</string>
-                               <key>o_dump_chkbox</key>
-                               <string>id</string>
-                               <key>o_file_chkbox</key>
-                               <string>id</string>
-                               <key>o_file_field</key>
-                               <string>id</string>
-                               <key>o_http_chkbox</key>
-                               <string>id</string>
-                               <key>o_method</key>
-                               <string>id</string>
-                               <key>o_misc_lbl</key>
-                               <string>id</string>
-                               <key>o_mux_lbl</key>
-                               <string>id</string>
-                               <key>o_mux_selector</key>
-                               <string>id</string>
-                               <key>o_open_panel</key>
-                               <string>id</string>
-                               <key>o_options_lbl</key>
-                               <string>id</string>
-                               <key>o_output_ckbox</key>
-                               <string>id</string>
-                               <key>o_output_settings</key>
-                               <string>id</string>
-                               <key>o_output_sheet</key>
-                               <string>id</string>
-                               <key>o_rtsp_chkbox</key>
-                               <string>id</string>
-                               <key>o_sap_chkbox</key>
-                               <string>id</string>
-                               <key>o_sdp_url</key>
-                               <string>id</string>
-                               <key>o_sdp_url_lbl</key>
-                               <string>id</string>
-                               <key>o_stream_address</key>
-                               <string>id</string>
-                               <key>o_stream_address_lbl</key>
-                               <string>id</string>
-                               <key>o_stream_port</key>
-                               <string>id</string>
-                               <key>o_stream_port_lbl</key>
-                               <string>id</string>
-                               <key>o_stream_port_stp</key>
-                               <string>id</string>
-                               <key>o_stream_ttl</key>
-                               <string>id</string>
-                               <key>o_stream_ttl_lbl</key>
-                               <string>id</string>
-                               <key>o_stream_ttl_stp</key>
-                               <string>id</string>
-                               <key>o_stream_type</key>
-                               <string>id</string>
-                               <key>o_stream_type_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_bitrate</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_bitrate_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_channels</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_channels_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_chkbox</key>
-                               <string>id</string>
-                               <key>o_transcode_audio_selector</key>
-                               <string>id</string>
-                               <key>o_transcode_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_video_bitrate</key>
-                               <string>id</string>
-                               <key>o_transcode_video_bitrate_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_video_chkbox</key>
-                               <string>id</string>
-                               <key>o_transcode_video_scale</key>
-                               <string>id</string>
-                               <key>o_transcode_video_scale_lbl</key>
-                               <string>id</string>
-                               <key>o_transcode_video_selector</key>
-                               <string>id</string>
-                       </dict>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>VLCPlaylist</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-       </array>
-       <key>IBVersion</key>
-       <string>1</string>
-</dict>
-</plist>
+{
+    IBClasses =     (
+                {
+            CLASS = FirstResponder;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        },
+                {
+            ACTIONS =             {
+                eyetvGetPlugin = id;
+                eyetvLaunch = id;
+                eyetvSwitchChannel = id;
+                openCaptureModeChanged = id;
+                openDisc = id;
+                openDiscMenusChanged = id;
+                openDiscStepperChanged = id;
+                openDiscTypeChanged = id;
+                openFile = id;
+                openFileBrowse = id;
+                openFileGeneric = id;
+                openFileStreamChanged = id;
+                openNet = id;
+                openNetModeChanged = id;
+                openNetStepperChanged = id;
+                openVTSBrowse = id;
+                panelCancel = id;
+                panelOk = id;
+                screenStepperChanged = id;
+                subCloseSheet = id;
+                subDelayStepperChanged = id;
+                subFileBrowse = id;
+                subFpsStepperChanged = id;
+                subOverride = id;
+                subSettings = id;
+                subsChanged = id;
+            };
+            CLASS = VLCOpen;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_btn_cancel" = id;
+                "o_btn_ok" = id;
+                "o_capture_label_view" = id;
+                "o_capture_lbl" = id;
+                "o_capture_long_lbl" = id;
+                "o_capture_mode_pop" = id;
+                "o_disc_chapter" = id;
+                "o_disc_chapter_lbl" = id;
+                "o_disc_chapter_stp" = id;
+                "o_disc_device" = id;
+                "o_disc_device_lbl" = id;
+                "o_disc_dvd_menus" = id;
+                "o_disc_title" = id;
+                "o_disc_title_lbl" = id;
+                "o_disc_title_stp" = id;
+                "o_disc_type" = id;
+                "o_disc_videots_btn_browse" = id;
+                "o_disc_videots_folder" = id;
+                "o_eyetv_channels_pop" = id;
+                "o_eyetv_chn_bgbar" = id;
+                "o_eyetv_chn_status_txt" = id;
+                "o_eyetv_currentChannel_lbl" = id;
+                "o_eyetv_getPlugin_btn" = id;
+                "o_eyetv_launchEyeTV_btn" = id;
+                "o_eyetv_nextProgram_btn" = id;
+                "o_eyetv_noInstanceLong_lbl" = id;
+                "o_eyetv_noInstance_lbl" = id;
+                "o_eyetv_notLaunched_view" = id;
+                "o_eyetv_previousProgram_btn" = id;
+                "o_eyetv_running_view" = id;
+                "o_file_btn_browse" = id;
+                "o_file_path" = id;
+                "o_file_stream" = id;
+                "o_file_sub_align_lbl" = id;
+                "o_file_sub_align_pop" = id;
+                "o_file_sub_btn_browse" = id;
+                "o_file_sub_btn_settings" = id;
+                "o_file_sub_ckbox" = id;
+                "o_file_sub_delay" = id;
+                "o_file_sub_delay_lbl" = id;
+                "o_file_sub_delay_stp" = id;
+                "o_file_sub_encoding_lbl" = id;
+                "o_file_sub_encoding_pop" = id;
+                "o_file_sub_file_box" = id;
+                "o_file_sub_font_box" = id;
+                "o_file_sub_fps" = id;
+                "o_file_sub_fps_lbl" = id;
+                "o_file_sub_fps_stp" = id;
+                "o_file_sub_ok_btn" = id;
+                "o_file_sub_override" = id;
+                "o_file_sub_path" = id;
+                "o_file_sub_sheet" = id;
+                "o_file_sub_size_lbl" = id;
+                "o_file_sub_size_pop" = id;
+                "o_mrl" = id;
+                "o_mrl_lbl" = id;
+                "o_net_http_url" = id;
+                "o_net_http_url_lbl" = id;
+                "o_net_mode" = id;
+                "o_net_timeshift_ckbox" = id;
+                "o_net_udp_port" = id;
+                "o_net_udp_port_lbl" = id;
+                "o_net_udp_port_stp" = id;
+                "o_net_udpm_addr" = id;
+                "o_net_udpm_addr_lbl" = id;
+                "o_net_udpm_port" = id;
+                "o_net_udpm_port_lbl" = id;
+                "o_net_udpm_port_stp" = id;
+                "o_output_ckbox" = id;
+                "o_panel" = id;
+                "o_playlist" = id;
+                "o_screen_follow_mouse_ckb" = id;
+                "o_screen_fps_fld" = id;
+                "o_screen_fps_lbl" = id;
+                "o_screen_fps_stp" = id;
+                "o_screen_height_fld" = id;
+                "o_screen_height_lbl" = id;
+                "o_screen_height_stp" = id;
+                "o_screen_lbl" = id;
+                "o_screen_left_fld" = id;
+                "o_screen_left_lbl" = id;
+                "o_screen_left_stp" = id;
+                "o_screen_long_lbl" = id;
+                "o_screen_top_fld" = id;
+                "o_screen_top_lbl" = id;
+                "o_screen_top_stp" = id;
+                "o_screen_view" = id;
+                "o_screen_width_fld" = id;
+                "o_screen_width_lbl" = id;
+                "o_screen_width_stp" = id;
+                "o_sout_options" = id;
+                "o_tabview" = id;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = VLCOpenTextField;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSTextField;
+        },
+                {
+            ACTIONS =             {
+                announceChanged = id;
+                outputChanged = id;
+                outputCloseSheet = id;
+                outputFileBrowse = id;
+                outputInfoChanged = id;
+                outputMethodChanged = id;
+                outputSettings = id;
+                streamPortStepperChanged = id;
+                streamTTLStepperChanged = id;
+                transcodeChanged = id;
+                transcodeInfoChanged = id;
+            };
+            CLASS = VLCOutput;
+            LANGUAGE = ObjC;
+            OUTLETS =             {
+                "o_btn_browse" = id;
+                "o_btn_ok" = id;
+                "o_channel_name" = id;
+                "o_channel_name_lbl" = id;
+                "o_display" = id;
+                "o_dump_chkbox" = id;
+                "o_file_chkbox" = id;
+                "o_file_field" = id;
+                "o_http_chkbox" = id;
+                "o_method" = id;
+                "o_misc_lbl" = id;
+                "o_mux_lbl" = id;
+                "o_mux_selector" = id;
+                "o_open_panel" = id;
+                "o_options_lbl" = id;
+                "o_output_ckbox" = id;
+                "o_output_settings" = id;
+                "o_output_sheet" = id;
+                "o_rtsp_chkbox" = id;
+                "o_sap_chkbox" = id;
+                "o_sdp_url" = id;
+                "o_sdp_url_lbl" = id;
+                "o_stream_address" = id;
+                "o_stream_address_lbl" = id;
+                "o_stream_port" = id;
+                "o_stream_port_lbl" = id;
+                "o_stream_port_stp" = id;
+                "o_stream_ttl" = id;
+                "o_stream_ttl_lbl" = id;
+                "o_stream_ttl_stp" = id;
+                "o_stream_type" = id;
+                "o_stream_type_lbl" = id;
+                "o_transcode_audio_bitrate" = id;
+                "o_transcode_audio_bitrate_lbl" = id;
+                "o_transcode_audio_channels" = id;
+                "o_transcode_audio_channels_lbl" = id;
+                "o_transcode_audio_chkbox" = id;
+                "o_transcode_audio_selector" = id;
+                "o_transcode_lbl" = id;
+                "o_transcode_video_bitrate" = id;
+                "o_transcode_video_bitrate_lbl" = id;
+                "o_transcode_video_chkbox" = id;
+                "o_transcode_video_scale" = id;
+                "o_transcode_video_scale_lbl" = id;
+                "o_transcode_video_selector" = id;
+            };
+            SUPERCLASS = NSObject;
+        },
+                {
+            CLASS = VLCPlaylist;
+            LANGUAGE = ObjC;
+            SUPERCLASS = NSObject;
+        }
+    );
+    IBVersion = 1;
+}
\ No newline at end of file
index 4f4512e..93d70e4 100644 (file)
@@ -2,14 +2,28 @@
 <!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>171 127 356 240 0 0 1280 778 </string>
+       <key>IBEditorPositions</key>
+       <dict>
+               <key>2297</key>
+               <string>366 400 548 264 0 0 1280 778 </string>
+               <key>2301</key>
+               <string>366 417 548 264 0 0 1280 778 </string>
+               <key>2304</key>
+               <string>366 380 547 264 0 0 1280 778 </string>
+               <key>2346</key>
+               <string>366 400 548 264 0 0 1280 778 </string>
+       </dict>
        <key>IBFramework Version</key>
-       <string>677</string>
+       <string>489.0</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>678</integer>
+               <integer>636</integer>
                <integer>2346</integer>
+               <integer>2297</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9G55</string>
index 45f7145..fd53abd 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib differ
index 695c0b2..c223870 100644 (file)
@@ -123,23 +123,28 @@ NSArray *GetEjectableMediaOfClass( const char *psz_class );
 
     /* screen support */
     IBOutlet id o_screen_view;
-    IBOutlet id o_screen_fps_fld;
     IBOutlet id o_screen_lbl;
     IBOutlet id o_screen_long_lbl;
-    IBOutlet id o_screen_fps_stp;
+    IBOutlet id o_screen_fps_fld;
     IBOutlet id o_screen_fps_lbl;
+    IBOutlet id o_screen_fps_stp;
     IBOutlet id o_screen_left_fld;
     IBOutlet id o_screen_left_lbl;
+    IBOutlet id o_screen_left_stp;
     IBOutlet id o_screen_top_fld;
     IBOutlet id o_screen_top_lbl;
+    IBOutlet id o_screen_top_stp;
     IBOutlet id o_screen_width_fld;
     IBOutlet id o_screen_width_lbl;
+    IBOutlet id o_screen_width_stp;
     IBOutlet id o_screen_height_fld;
     IBOutlet id o_screen_height_lbl;
-    IBOutlet id o_screen_follow_mouse_btn;
+    IBOutlet id o_screen_height_stp;
+    IBOutlet id o_screen_follow_mouse_ckb;
 
     BOOL b_autoplay;
     id o_currentCaptureView;
+    intf_thread_t * p_intf;
 }
 
 + (VLCOpen *)sharedInstance;
index 21a81bc..3402af6 100644 (file)
@@ -152,6 +152,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
         [self dealloc];
     } else {
         _o_sharedMainInstance = [super init];
+        p_intf = VLCIntf;
     }
  
     return _o_sharedMainInstance;
@@ -159,8 +160,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)awakeFromNib
 {
-    intf_thread_t * p_intf = VLCIntf;
-
     [o_panel setTitle: _NS("Open Source")];
     [o_mrl_lbl setTitle: _NS("Media Resource Locator (MRL)")];
 
@@ -283,7 +282,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (void)setSubPanel
 {
-    intf_thread_t * p_intf = VLCIntf;
     int i_index;
     module_config_t * p_item;
 
@@ -352,7 +350,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
 - (void)openTarget:(int)i_type
 {
     int i_result;
-    intf_thread_t * p_intf = VLCIntf;
 
     b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
 
@@ -412,14 +409,15 @@ static VLCOpen *_o_sharedMainInstance = nil;
         if( [[[o_tabview selectedTabViewItem] label] isEqualToString: _NS("Capture")] )
         {
             if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: _NS("Screen")] )
-                [o_options addObject: [NSString stringWithFormat: @"screen-fps=%i", [o_screen_fps_fld intValue]]];
+                [o_options addObject: [NSString stringWithFormat: @"screen-fps=%f", [o_screen_fps_fld floatValue]]];
                 [o_options addObject: [NSString stringWithFormat: @"screen-left=%i", [o_screen_left_fld intValue]]];
                 [o_options addObject: [NSString stringWithFormat: @"screen-top=%i", [o_screen_top_fld intValue]]];
                 [o_options addObject: [NSString stringWithFormat: @"screen-width=%i", [o_screen_width_fld intValue]]];
                 [o_options addObject: [NSString stringWithFormat: @"screen-height=%i", [o_screen_height_fld intValue]]];
-                if ([o_screen_follow_mouse_btn state]) {
-                  [o_options addObject: @"screen-follow-mouse"];
-                }
+                if( [o_screen_follow_mouse_ckb intValue] == YES )
+                    [o_options addObject: @"screen-follow-mouse"];
+                else
+                    [o_options addObject: @"no-screen-follow-mouse"];
         }
 
         /* apply the options to our item(s) */
@@ -490,7 +488,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
     if( b_dir )
     {
-        o_mrl_string = [NSString stringWithFormat: @"directory://%@", o_filename];
+        o_mrl_string = [NSString stringWithFormat: @"directory://%@/", o_filename];
     }
     else if( [o_ext isEqualToString: @"bin"] ||
         [o_ext isEqualToString: @"cue"] ||
@@ -768,7 +766,6 @@ static VLCOpen *_o_sharedMainInstance = nil;
 {
     NSString *o_mode;
     NSString *o_mrl_string = [NSString string];
-    intf_thread_t * p_intf = VLCIntf;
 
     o_mode = [[o_net_mode selectedCell] title];
 
@@ -850,7 +847,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
         [o_currentCaptureView removeFromSuperviewWithoutNeedingDisplay];
         [o_currentCaptureView release];
     }
-    [theView setFrame: NSMakeRect( 0, 10, o_view_rect.size.width, o_view_rect.size.height)];
+    [theView setFrame: NSMakeRect( 0, -10, o_view_rect.size.width, o_view_rect.size.height)];
     [theView setNeedsDisplay: YES];
     [theView setAutoresizesSubviews: YES];
     [[[o_tabview tabViewItemAtIndex: 3] view] addSubview: theView];
@@ -883,6 +880,12 @@ static VLCOpen *_o_sharedMainInstance = nil;
     {
         [self showCaptureView: o_screen_view];
         [o_mrl setStringValue: @"screen://"];
+        [o_screen_height_fld setIntValue: config_GetInt( p_intf, "screen-height" )];
+        [o_screen_width_fld setIntValue: config_GetInt( p_intf, "screen-width" )];
+        [o_screen_fps_fld setFloatValue: config_GetFloat( p_intf, "screen-fps" )];
+        [o_screen_left_fld setIntValue: config_GetInt( p_intf, "screen-left" )];
+        [o_screen_top_fld setIntValue: config_GetInt( p_intf, "screen-top" )];
+        [o_screen_follow_mouse_ckb setIntValue: config_GetInt( p_intf, "screen-follow-mouse" )];
     }
     else if( [[[o_capture_mode_pop selectedItem] title] isEqualToString: @"iSight"] )
     {
@@ -898,16 +901,16 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
 - (IBAction)screenStepperChanged:(id)sender
 {
-    [o_screen_fps_fld setIntValue: [o_screen_fps_stp intValue]];
+    [o_screen_fps_fld setFloatValue: [o_screen_fps_stp floatValue]];
     [o_panel makeFirstResponder: o_screen_fps_fld];
     [o_mrl setStringValue: @"screen://"];
 }
 
 - (void)screenFPSfieldChanged:(NSNotification *)o_notification
 {
-    [o_screen_fps_stp setIntValue: [o_screen_fps_fld intValue]];
+    [o_screen_fps_stp setFloatValue: [o_screen_fps_fld floatValue]];
     if( [[o_screen_fps_fld stringValue] isEqualToString: @""] )
-        [o_screen_fps_fld setIntValue: 1];
+        [o_screen_fps_fld setFloatValue: 1.0];
     [o_mrl setStringValue: @"screen://"];
 }