From: Felix Paul Kühne Date: Sun, 14 Mar 2010 23:06:49 +0000 (+0100) Subject: legacy OS X intf: fixed check-for-update and fullscreen-toggle menu items X-Git-Tag: 1.1.0-pre1~381 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ef7ac2f845b05f010f0195368e00eb71e4b28b3d;p=vlc legacy OS X intf: fixed check-for-update and fullscreen-toggle menu items --- diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib index 97bd9742b1..00f9624667 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib @@ -13,6 +13,7 @@ YES + YES @@ -1805,7 +1806,7 @@ 6 - {565, 1e+07} + {1116, 1e+07} {114, 0} @@ -1833,7 +1834,7 @@ - 256 + -2147483392 {{-100, -100}, {87, 18}} 257 @@ -3266,6 +3267,7 @@ {{1, 17}, {574, 33}} + 4 @@ -3298,6 +3300,7 @@ {{1, 0}, {574, 17}} + 4 @@ -3306,6 +3309,7 @@ {{0, 30}, {576, 51}} + 562 @@ -4733,7 +4737,7 @@ LCAuLi4 2322 - {498, 102} + {498, 14} @@ -4789,8 +4793,8 @@ LCAuLi4 6 - {600, 1e+07} - {497, 102} + {998, 1e+07} + {497, 0} @@ -4813,7 +4817,7 @@ LCAuLi4 - 256 + -2147483392 {{-100, -100}, {87, 18}} 1 @@ -4916,6 +4920,9 @@ LCAuLi4 {{0, 0}, {1280, 778}} {1.79769e+308, 1.79769e+308} + + SUUpdater + @@ -6752,14 +6759,6 @@ LCAuLi4 2458 - - - checkForUpdate: - - - - 2459 - takeIntValueFrom: @@ -7840,6 +7839,14 @@ LCAuLi4 4271 + + + checkForUpdates: + + + + 4371 + @@ -10961,12 +10968,18 @@ LCAuLi4 Application + + 4370 + + + YES YES + -3.IBPluginDependency 1002.IBPluginDependency 1002.ImportedFromIB2 1003.IBPluginDependency @@ -11619,13 +11632,110 @@ LCAuLi4 4267.ImportedFromIB2 4272.IBPluginDependency 4272.ImportedFromIB2 + 4274.IBPluginDependency + 4275.IBPluginDependency + 4276.IBPluginDependency + 4277.IBPluginDependency + 4278.IBPluginDependency + 4279.IBPluginDependency + 4280.IBPluginDependency + 4281.IBPluginDependency + 4282.IBPluginDependency + 4283.IBPluginDependency + 4284.IBPluginDependency + 4285.IBPluginDependency + 4286.IBPluginDependency + 4287.IBPluginDependency + 4288.IBPluginDependency + 4289.IBPluginDependency + 4290.IBPluginDependency + 4291.IBPluginDependency + 4292.IBPluginDependency + 4293.IBPluginDependency + 4294.IBPluginDependency + 4295.IBPluginDependency + 4296.IBPluginDependency + 4297.IBPluginDependency + 4298.IBPluginDependency + 4299.IBPluginDependency + 4300.IBPluginDependency + 4301.IBPluginDependency + 4302.IBPluginDependency + 4303.IBPluginDependency + 4304.IBPluginDependency + 4305.IBPluginDependency + 4306.IBPluginDependency + 4307.IBPluginDependency + 4308.IBPluginDependency + 4309.IBPluginDependency + 4310.IBPluginDependency + 4311.IBPluginDependency + 4312.IBPluginDependency + 4313.IBPluginDependency + 4314.IBPluginDependency + 4315.IBPluginDependency + 4316.IBPluginDependency + 4317.IBPluginDependency + 4318.IBPluginDependency + 4319.IBPluginDependency + 4320.IBPluginDependency + 4321.IBPluginDependency + 4322.IBPluginDependency + 4323.IBPluginDependency + 4324.IBPluginDependency + 4325.IBPluginDependency + 4326.IBPluginDependency + 4327.IBPluginDependency + 4328.IBPluginDependency + 4329.IBPluginDependency + 4330.IBPluginDependency + 4331.IBPluginDependency + 4332.IBPluginDependency + 4333.IBPluginDependency + 4334.IBPluginDependency + 4335.IBPluginDependency + 4336.IBPluginDependency + 4337.IBPluginDependency + 4338.IBPluginDependency + 4339.IBPluginDependency + 4340.IBPluginDependency + 4341.IBPluginDependency + 4342.IBPluginDependency + 4343.IBPluginDependency + 4344.IBPluginDependency + 4345.IBPluginDependency + 4346.IBPluginDependency + 4347.IBPluginDependency + 4348.IBPluginDependency + 4349.IBPluginDependency + 4350.IBPluginDependency + 4351.IBPluginDependency + 4352.IBPluginDependency + 4353.IBPluginDependency + 4354.IBPluginDependency + 4355.IBPluginDependency + 4356.IBPluginDependency + 4357.IBPluginDependency + 4358.IBPluginDependency + 4359.IBPluginDependency + 4360.IBPluginDependency + 4361.IBPluginDependency + 4362.IBPluginDependency + 4363.IBPluginDependency 4363.IBShouldRemoveOnLegacySave + 4364.IBPluginDependency 4364.IBShouldRemoveOnLegacySave + 4365.IBPluginDependency 4365.IBShouldRemoveOnLegacySave + 4366.IBPluginDependency 4366.IBShouldRemoveOnLegacySave + 4367.IBPluginDependency 4367.IBShouldRemoveOnLegacySave + 4368.IBPluginDependency 4368.IBShouldRemoveOnLegacySave + 4369.IBPluginDependency 4369.IBShouldRemoveOnLegacySave + 4370.IBPluginDependency 446.IBPluginDependency 446.ImportedFromIB2 5.IBPluginDependency @@ -11636,6 +11746,7 @@ LCAuLi4 568.ImportedFromIB2 569.IBPluginDependency 569.ImportedFromIB2 + 57.IBEditorWindowLastContentRect 57.IBPluginDependency 57.ImportedFromIB2 570.IBPluginDependency @@ -11676,6 +11787,7 @@ LCAuLi4 YES com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12187,7 +12299,7 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin - {{0, 714}, {468, 20}} + {{350, 714}, {468, 20}} com.apple.InterfaceBuilder.CocoaPlugin VLBrushedMetalImageView @@ -12327,14 +12439,111 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12344,6 +12553,7 @@ LCAuLi4 com.apple.InterfaceBuilder.CocoaPlugin + {{362, 481}, {267, 233}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12398,18 +12608,27 @@ LCAuLi4 - 4369 + 4371 YES FirstResponder + NSObject IBUserSource + + ITSlider + NSSlider + + IBProjectSource + ../../../modules/gui/macosx/misc.h + + ITSlider NSSlider @@ -12418,6 +12637,11 @@ LCAuLi4 + + MPSlider + NSSlider + + MPSlider NSSlider @@ -12428,11 +12652,26 @@ LCAuLi4 NSApplication + + IBProjectSource + ../../../modules/gui/macosx/applescript.h + + + + NSApplication + NSResponder IBUserSource + + NSObject + + IBProjectSource + ../../../modules/gui/macosx/AppleRemote.h + + NSObject @@ -12440,6 +12679,11 @@ LCAuLi4 + + VLBrushedMetalImageView + NSImageView + + VLBrushedMetalImageView NSImageView @@ -12448,6 +12692,14 @@ LCAuLi4 + + VLCApplication + NSApplication + + IBProjectSource + ../../../modules/gui/macosx/intf.h + + VLCApplication NSApplication @@ -12456,6 +12708,85 @@ LCAuLi4 + + VLCBookmarks + NSObject + + YES + + YES + add: + clear: + edit: + edit_cancel: + edit_ok: + extract: + goToBookmark: + remove: + + + YES + id + id + id + id + id + id + id + id + + + + YES + + YES + o_bookmarks_window + o_btn_add + o_btn_clear + o_btn_edit + o_btn_extract + o_btn_rm + o_edit_btn_cancel + o_edit_btn_ok + o_edit_fld_bytes + o_edit_fld_name + o_edit_fld_time + o_edit_lbl_bytes + o_edit_lbl_name + o_edit_lbl_time + o_edit_window + o_tbl_dataTable + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + IBProjectSource + ../../../modules/gui/macosx/bookmarks.h + + + + VLCControllerView + NSView + + VLCControllerView NSView @@ -12464,6 +12795,11 @@ LCAuLi4 + + VLCControllerWindow + NSWindow + + VLCControllerWindow NSWindow @@ -12484,13 +12820,14 @@ LCAuLi4 faster: forward: goToSpecificTime: + lockVideosAspectRatio: loop: mute: next: - pause: + normalSpeed: play: - position: prev: + quitAfterPlayback: random: repeat: repeatButtonAction: @@ -12534,6 +12871,7 @@ LCAuLi4 id id id + id @@ -12542,8 +12880,9 @@ LCAuLi4 YES o_btn_addNode o_btn_repeat + o_btn_repeat_embed o_btn_shuffle - o_fs_panel + o_btn_shuffle_embed o_main o_specificTime_cancel_btn o_specificTime_enter_fld @@ -12571,8 +12910,34 @@ LCAuLi4 id id id + id + + + + IBProjectSource + ../../../modules/gui/macosx/controls.h + + + + VLCControls + NSObject + + YES + + YES + pause: + position: + + + YES + id + id + + o_fs_panel + id + IBUserSource @@ -12585,6 +12950,14 @@ LCAuLi4 o_embeddedwindow id + + IBProjectSource + ../../../modules/gui/macosx/vout.h + + + + VLCEmbeddedVoutView + VLCVoutView IBUserSource @@ -12593,17 +12966,42 @@ LCAuLi4 VLCEmbeddedWindow NSWindow + + togglePlaylist: + id + YES YES + o_background_view o_btn_backward + o_btn_equalizer o_btn_forward o_btn_fullscreen + o_btn_next o_btn_play - o_slider + o_btn_playlist + o_btn_prev + o_btn_stop + o_btn_volume_down + o_btn_volume_up + o_horizontal_split + o_main_pgbar + o_playlist + o_playlist_table + o_playlist_view + o_scrollfield + o_searchfield + o_sidebar_list + o_status o_time + o_timeslider + o_vertical_split + o_videosubview o_view + o_vlc_main + o_volumeslider YES @@ -12614,19 +13012,52 @@ LCAuLi4 id id id - - - - IBUserSource - - - - - VLCEqualizer - NSObject - - YES - + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + IBProjectSource + ../../../modules/gui/macosx/embeddedwindow.h + + + + VLCEmbeddedWindow + NSWindow + + o_slider + id + + + IBUserSource + + + + + VLCEqualizer + NSObject + + YES + YES bandSliderUpdated: changePreset: @@ -12650,6 +13081,7 @@ LCAuLi4 YES o_btn_equalizer + o_btn_equalizer_embedded o_ckb_2pass o_ckb_enable o_fld_preamp @@ -12686,13 +13118,30 @@ LCAuLi4 id id id + id + + IBProjectSource + ../../../modules/gui/macosx/equalizer.h + + + + VLCEqualizer + NSObject IBUserSource + + VLCFSPanel + NSWindow + + IBProjectSource + ../../../modules/gui/macosx/fspanel.h + + VLCFSPanel NSWindow @@ -12708,7 +13157,6 @@ LCAuLi4 YES YES - checkForUpdate: clearRecentItems: crashReporterAction: intfOpenCapture: @@ -12770,7 +13218,6 @@ LCAuLi4 id id id - id @@ -12807,8 +13254,6 @@ LCAuLi4 o_embedded_window o_extended o_eyetv - o_info - o_interaction_list o_main_pgbar o_messages o_mi_about @@ -12858,6 +13303,7 @@ LCAuLi4 o_mi_minimize o_mi_mute o_mi_next + o_mi_normalSpeed o_mi_normal_window o_mi_open_capture o_mi_open_disc @@ -12870,11 +13316,13 @@ LCAuLi4 o_mi_open_wizard o_mi_paste o_mi_play + o_mi_player o_mi_playlist o_mi_prefs o_mi_previous o_mi_program o_mi_quit + o_mi_quitAfterPB o_mi_random o_mi_readme o_mi_repeat @@ -12933,7 +13381,6 @@ LCAuLi4 o_sprefs o_timefield o_timeslider - o_update o_vlm o_vmi_fullscreen o_vmi_mute @@ -12982,8 +13429,6 @@ LCAuLi4 VLCEmbeddedWindow id id - id - id NSProgressIndicator NSTextView NSMenuItem @@ -13075,6 +13520,9 @@ LCAuLi4 NSMenuItem NSMenuItem NSMenuItem + NSMenuItem + NSMenuItem + NSMenuItem NSButton NSWindow NSButton @@ -13109,7 +13557,6 @@ LCAuLi4 NSTextField NSSlider id - id NSMenuItem NSMenuItem NSMenuItem @@ -13126,6 +13573,30 @@ LCAuLi4 NSView + + + + VLCMain + NSObject + + checkForUpdate: + id + + + YES + + YES + o_info + o_interaction_list + o_update + + + YES + id + id + id + + IBUserSource @@ -13194,18 +13665,16 @@ LCAuLi4 o_mm_mi_services o_mm_mu_services o_mu_services - o_outline_view o_playlist_view o_playlist_wizard - o_random_ckb o_save_accessory_popup o_save_accessory_text o_save_accessory_view o_search_field + o_search_field_other + o_sidebar o_status_field - o_tc_author - o_tc_duration - o_tc_name + o_status_field_embed o_tc_sortColumn @@ -13242,6 +13711,31 @@ LCAuLi4 id id id + + + + IBProjectSource + ../../../modules/gui/macosx/playlist.h + + + + VLCPlaylist + VLCPlaylistCommon + + YES + + YES + o_outline_view + o_random_ckb + o_tc_author + o_tc_duration + o_tc_name + + + YES + id + id + id id id @@ -13259,9 +13753,13 @@ LCAuLi4 YES o_outline_view + o_outline_view_other o_tc_author + o_tc_author_other o_tc_duration + o_tc_duration_other o_tc_name + o_tc_name_other YES @@ -13269,13 +13767,27 @@ LCAuLi4 id id id + id + id + id + id + + + + VLCPlaylistCommon + NSObject IBUserSource + + VLCPlaylistView + NSOutlineView + + VLCPlaylistView NSOutlineView @@ -13284,6 +13796,11 @@ LCAuLi4 + + VLCTimeField + NSTextField + + VLCTimeField NSTextField @@ -13299,17 +13816,850 @@ LCAuLi4 o_window id + + + + VLCVoutView + NSView IBUserSource - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - + + YES + + NSObject + + IBDocumentRelativeSource + ../../../../contrib/hosts/i686-apple-darwin10/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcast.h + + + + NSObject + + IBDocumentRelativeSource + ../../../../contrib/hosts/i686-apple-darwin10/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdater.h + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + delegate + id + + + + + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSBrowser + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSBrowser.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSImageCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSImageCell.h + + + + NSImageView + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSImageView.h + + + + NSMatrix + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSMatrix.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSMenuItem + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSMenuItemCell + NSButtonCell + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItemCell.h + + + + NSMovieView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMovieView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + PrintCore.framework/Headers/PDEPluginInterface.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureFileOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTCaptureView.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovie.h + + + + NSObject + + IBFrameworkSource + QTKit.framework/Headers/QTMovieView.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebDownload.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebEditingDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebFrameLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebJavaPlugIn.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPlugin.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPluginContainer.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebPolicyDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebResourceLoadDelegate.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebScriptObject.h + + + + NSObject + + IBFrameworkSource + WebKit.framework/Headers/WebUIDelegate.h + + + + NSOutlineView + NSTableView + + + + NSPanel + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSPanel.h + + + + NSPopUpButton + NSButton + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButton.h + + + + NSPopUpButtonCell + NSMenuItemCell + + IBFrameworkSource + AppKit.framework/Headers/NSPopUpButtonCell.h + + + + NSProgressIndicator + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSProgressIndicator.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSearchField + NSTextField + + IBFrameworkSource + AppKit.framework/Headers/NSSearchField.h + + + + NSSearchFieldCell + NSTextFieldCell + + IBFrameworkSource + AppKit.framework/Headers/NSSearchFieldCell.h + + + + NSSlider + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSSlider.h + + + + NSSliderCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSSliderCell.h + + + + NSStepper + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSStepper.h + + + + NSStepperCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSStepperCell.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + + + NSText + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSText.h + + + + NSTextField + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSTextField.h + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSTextView + NSText + + IBFrameworkSource + AppKit.framework/Headers/NSTextView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + QTMovieView + NSView + + YES + + YES + add: + addScaled: + copy: + cut: + delete: + gotoBeginning: + gotoEnd: + gotoNextSelectionPoint: + gotoPosterFrame: + gotoPreviousSelectionPoint: + paste: + pause: + play: + replace: + selectAll: + selectNone: + stepBackward: + stepForward: + trim: + + + YES + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + id + + + + + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 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 1e3ccdbddc..b865b2168b 100644 Binary files a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 3cb3c77339..95a4989421 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -144,7 +144,7 @@ static void Run( intf_thread_t *p_intf ) [NSApp run]; [[VLCMain sharedInstance] applicationWillTerminate:nil]; - + [o_pool release]; } @@ -161,7 +161,7 @@ static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned int i ) int canc = vlc_savecancel(); NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - /* this may happen from time to time, let's bail out as info would be useless anyway */ + /* this may happen from time to time, let's bail out as info would be useless anyway */ if( !item->psz_module || !item->psz_msg ) return; @@ -170,8 +170,8 @@ static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned int i ) [NSString stringWithUTF8String: item->psz_msg], @"Message", [NSNumber numberWithInt: item->i_type], @"Type", nil]; - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreMessageReceived" - object: nil + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreMessageReceived" + object: nil userInfo: o_dict]; [o_pool release]; @@ -224,7 +224,7 @@ static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable, } /***************************************************************************** - * DialogCallback: Callback triggered by the "dialog-*" variables + * DialogCallback: Callback triggered by the "dialog-*" variables * to let the intf display error and interaction dialogs *****************************************************************************/ static int DialogCallback( vlc_object_t *p_this, const char *type, vlc_value_t previous, vlc_value_t value, void *data ) @@ -334,11 +334,11 @@ static VLCMain *_o_sharedMainInstance = nil; - (id)init { - if( _o_sharedMainInstance) + if( _o_sharedMainInstance) { [self dealloc]; return _o_sharedMainInstance; - } + } else _o_sharedMainInstance = [super init]; @@ -348,7 +348,7 @@ static VLCMain *_o_sharedMainInstance = nil; o_msg_arr = [[NSMutableArray arrayWithCapacity: 600] retain]; /* subscribe to LibVLC's debug messages as early as possible (for us) */ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(libvlcMessageReceived:) name: @"VLCCoreMessageReceived" object: nil]; - + o_about = [[VLAboutBox alloc] init]; o_prefs = nil; o_open = [[VLCOpen alloc] init]; @@ -461,7 +461,7 @@ static VLCMain *_o_sharedMainInstance = nil; i_key = config_GetInt( p_intf, "key-vol-mute" ); [o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; [o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; - i_key = config_GetInt( p_intf, "key-fullscreen" ); + i_key = config_GetInt( p_intf, "key-toggle-fullscreen" ); [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; i_key = config_GetInt( p_intf, "key-snapshot" ); @@ -486,7 +486,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_volumeslider setEnabled: YES]; [self manageVolumeSlider]; [o_window setDelegate: self]; - + b_restore_size = false; // Set that here as IB seems to be buggy @@ -523,7 +523,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* load our Core Dialogs nib */ nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp]; - + /* subscribe to various interactive dialogues */ var_Create( p_intf, "dialog-error", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "dialog-error", DialogCallback, self ); @@ -547,7 +547,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* take care of tint changes during runtime */ o_img_play = [NSImage imageNamed: @"play"]; - o_img_pause = [NSImage imageNamed: @"pause"]; + o_img_pause = [NSImage imageNamed: @"pause"]; [self controlTintChanged]; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector( controlTintChanged ) @@ -744,7 +744,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_dmi_next setTitle: _NS("Next")]; [o_dmi_previous setTitle: _NS("Previous")]; [o_dmi_mute setTitle: _NS("Mute")]; - + /* vout menu */ [o_vmi_play setTitle: _NS("Play")]; [o_vmi_stop setTitle: _NS("Stop")]; @@ -789,7 +789,7 @@ static VLCMain *_o_sharedMainInstance = nil; playlist_t * p_playlist; vout_thread_t * p_vout; int returnedValue = 0; - + if( !p_intf ) return; @@ -869,7 +869,7 @@ static VLCMain *_o_sharedMainInstance = nil; [crashLogURLConnection cancel]; [crashLogURLConnection release]; - + [o_embedded_list release]; [o_coredialogs release]; [o_eyetv release]; @@ -981,15 +981,15 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; - (void)controlTintChanged { BOOL b_playing = NO; - + if( [o_btn_play alternateImage] == o_img_play_pressed ) b_playing = YES; - + if( [NSColor currentControlTint] == NSGraphiteControlTint ) { o_img_play_pressed = [NSImage imageNamed: @"play_graphite"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_graphite"]; - + [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_graphite"]]; [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_graphite"]]; [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_graphite"]]; @@ -1003,7 +1003,7 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; { o_img_play_pressed = [NSImage imageNamed: @"play_blue"]; o_img_pause_pressed = [NSImage imageNamed: @"pause_blue"]; - + [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_blue"]]; [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_blue"]]; [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_blue"]]; @@ -1013,7 +1013,7 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_blue"]]; [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_blue"]]; } - + if( b_playing ) [o_btn_play setAlternateImage: o_img_play_pressed]; else @@ -1061,7 +1061,7 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; /* When user click in the Dock icon our double click in the finder */ - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows -{ +{ if(!hasVisibleWindows) [o_window makeKeyAndOrderFront:self]; @@ -1676,7 +1676,7 @@ static void manage_cleanup( void * args ) p_input = playlist_CurrentInput( p_playlist ); bool b_buffering = NO; - + if( ( b_input = ( p_input != NULL ) ) ) { /* seekable streams */ @@ -1729,7 +1729,7 @@ static void manage_cleanup( void * args ) [o_embedded_window setTime:@"00:00" position:0.0]; p_intf->p_sys->b_current_title_update = true; - + p_intf->p_sys->b_intf_update = false; } @@ -1781,7 +1781,7 @@ static void manage_cleanup( void * args ) [[[self controls] fspanel] setStreamTitle: aString]; [[o_controls voutView] updateTitle]; - + [o_playlist updateRowSelection]; p_intf->p_sys->b_current_title_update = FALSE; @@ -1948,7 +1948,7 @@ end: vout_thread_t * p_vout = getVout(); if( !p_vout ) return; - + /* clean the menu before adding new entries */ if( [o_mi_screen hasSubmenu] ) { @@ -2095,7 +2095,7 @@ end: { b_time_remaining = !b_time_remaining; } - + #pragma mark - #pragma mark Recent Items @@ -2221,7 +2221,7 @@ end: nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner: NSApp]; [o_wizard initStrings]; } - + if( !nib_bookmarks_loaded ) nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner: NSApp]; @@ -2258,7 +2258,7 @@ end: [o_about showGPL: sender]; } - + - (IBAction)viewHelp:(id)sender { if( !nib_about_loaded ) @@ -2377,7 +2377,7 @@ end: // Dooh. ugly. if( year < [[compo objectAtIndex:0] intValue] || - (year ==[[compo objectAtIndex:0] intValue] && + (year ==[[compo objectAtIndex:0] intValue] && (month < [[compo objectAtIndex:1] intValue] || (month ==[[compo objectAtIndex:1] intValue] && (day < [[compo objectAtIndex:2] intValue] || @@ -2454,7 +2454,7 @@ end: int version = [[NSUserDefaults standardUserDefaults] integerForKey:kVLCPreferencesVersion]; if( version >= kCurrentPreferencesVersion ) return; - NSArray *libraries = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, + NSArray *libraries = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES); if( !libraries || [libraries count] == 0) return; NSString * preferences = [[libraries objectAtIndex:0] stringByAppendingPathComponent:@"Preferences"]; @@ -2516,7 +2516,7 @@ end: { if(! nib_info_loaded ) nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp]; - + [o_info initPanel]; } @@ -2597,7 +2597,7 @@ end: - (IBAction)saveDebugLog:(id)sender { NSOpenPanel * saveFolderPanel = [[NSSavePanel alloc] init]; - + [saveFolderPanel setCanChooseDirectories: NO]; [saveFolderPanel setCanChooseFiles: YES]; [saveFolderPanel setCanSelectHiddenExtension: NO]; @@ -2636,7 +2636,7 @@ end: o_rect.size.height = o_size_with_playlist.height; else o_rect.size.height = 500.; - + if( o_size_with_playlist.width >= [o_window contentMinSize].width ) o_rect.size.width = o_size_with_playlist.width; else @@ -2889,10 +2889,10 @@ end: int keyFlags = ([event data1] & 0x0000FFFF); int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA; int keyRepeat = (keyFlags & 0x1); - + if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 ) var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); - + if( keyCode == NX_KEYTYPE_FAST && !b_justJumped ) { if( keyState == 0 && keyRepeat == 0 ) @@ -2908,7 +2908,7 @@ end: afterDelay:0.25]; } } - + if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped ) { if( keyState == 0 && keyRepeat == 0 )