From: Felix Paul Kühne Date: Fri, 31 Jul 2009 09:06:25 +0000 (+0200) Subject: macosx: some more Sparkle demos X-Git-Tag: 1.1.0-ff~4689 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9c499866fcb2a7700e4eb423cf59c9c47a3a8d82;p=vlc macosx: some more Sparkle demos --- 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 f10301694e..23536c7937 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib @@ -2,16 +2,16 @@ 1050 - 9L27 + 9L30 677 949.54 353.00 YES + + - - @@ -9138,6 +9138,14 @@ LCAuLi4 4534 + + + delegate + + + + 4535 + @@ -14534,7 +14542,7 @@ LCAuLi4 - 4534 + 4535 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 f93a00698f..019ad092c9 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/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib index 7d3b4fdfeb..99c95db003 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.nib @@ -9,9 +9,10 @@ YES - - + + + YES @@ -399,7 +400,7 @@ AAMAAAABABIAAAECAAMAAAAEAAAFxgEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABBxwAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS AAMAAAABAAEAAAFTAAMAAAAEAAAFzodzAAcAAA8oAAAF1gAAAAAACAAIAAgACAABAAEAAQABAAAPKGFw cGwCAAAAbW50clJHQiBYWVogB9gAAwALABIAHQAhYWNzcEFQUEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAPbWAAEAAAAA0y1hcHBsKfUQPfN2YqsZuKHTcfHyHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAPbWAAEAAAAA0y1hcHBsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAOclhZWgAAASwAAAAUZ1hZWgAAAUAAAAAUYlhZWgAAAVQAAAAUd3RwdAAAAWgAAAAUY2hhZAAA AXwAAAAsclRSQwAAAagAAAAOZ1RSQwAAAbgAAAAOYlRSQwAAAcgAAAAOdmNndAAAAdgAAAYSbmRpbgAA B+wAAAY+ZGVzYwAADiwAAABkZHNjbQAADpAAAABKbW1vZAAADtwAAAAoY3BydAAADwQAAAAkWFlaIAAA @@ -898,9 +899,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{133, 214}, {238, 26}} + {{133, 269}, {238, 26}} - YES -2076049856 @@ -979,9 +979,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{17, 220}, {114, 17}} + {{17, 275}, {114, 17}} - YES 67239424 @@ -1006,9 +1005,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{226, 7}, {293, 26}} + {{226, 62}, {293, 26}} - YES -2076049856 @@ -1077,9 +1075,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{13, 13}, {211, 17}} + {{13, 68}, {211, 17}} - YES 67239424 @@ -1091,15 +1088,64 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + + 268 + {{14, 35}, {503, 18}} + + YES + + -2080244224 + 0 + Automatically check for updates + + + 1211912703 + 130 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + + 268 + {{32, 12}, {487, 17}} + + YES + + 68288064 + 272761856 + Last check on June 27 2045 + + + + + 6 + System + controlShadowColor + + 3 + MC4zMzMzMzMzNAA + + + + - {{2, 2}, {532, 41}} + {{2, 2}, {532, 96}} - - {{17, 16}, {536, 58}} + {{17, 16}, {536, 113}} - {0, 0} 67239424 @@ -1121,9 +1167,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{18, 182}, {352, 18}} + {{18, 237}, {352, 18}} - YES 67239424 @@ -1133,13 +1178,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - - NSImage - NSSwitch - - - NSSwitch - + + 200 @@ -1149,9 +1189,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{18, 157}, {352, 18}} + {{18, 212}, {352, 18}} - YES 67239424 @@ -1161,7 +1200,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1172,9 +1211,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{18, 130}, {352, 18}} + {{18, 185}, {352, 18}} - YES 67239424 @@ -1184,7 +1222,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1195,9 +1233,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{18, 105}, {352, 18}} + {{18, 160}, {352, 18}} - YES 67239424 @@ -1207,7 +1244,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1218,9 +1255,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 256 - {{32, 81}, {352, 18}} + {{32, 136}, {352, 18}} - YES 67239424 @@ -1230,7 +1266,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1239,9 +1275,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - {570, 258} + {570, 313} - NSView @@ -1266,7 +1301,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1447,7 +1482,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1623,7 +1658,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1645,7 +1680,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -1898,7 +1933,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2024,7 +2059,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2056,7 +2091,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2078,7 +2113,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2100,7 +2135,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2122,7 +2157,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2440,7 +2475,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -2583,7 +2618,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1211912703 2 - + @@ -3889,7 +3924,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES action - 2.930000e+02 + 3.010000e+02 4.000000e+01 1.000000e+03 @@ -3918,7 +3953,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA shortcut - 2.136982e+02 + 2.206982e+02 8.000000e+00 1.000000e+03 @@ -4014,6 +4049,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + AAAAAAAAAABBmAAAQZgAAA @@ -4088,15 +4124,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 6 - System - controlShadowColor - - 3 - MC4zMzMzMzMzNAA - - + @@ -4147,6 +4175,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA {{0, 0}, {1280, 778}} {3.40282e+38, 3.40282e+38} + + SUUpdater + @@ -5695,6 +5726,38 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 3554 + + + value: automaticallyChecksForUpdates + + + + + + value: automaticallyChecksForUpdates + value + automaticallyChecksForUpdates + 2 + + + 3559 + + + + o_intf_update_ckb + + + + 3562 + + + + o_intf_last_update_lbl + + + + 3563 + @@ -5911,6 +5974,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES + + @@ -7951,6 +8016,40 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + 3555 + + + Sparkle Updater + + + 3556 + + + YES + + + + + + 3557 + + + + + 3560 + + + YES + + + + + + 3561 + + + @@ -7959,6 +8058,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES -1.IBPluginDependency -2.IBPluginDependency + -3.IBPluginDependency 1530.IBEditorWindowLastContentRect 1530.IBWindowTemplateEditedContentRect 1530.ImportedFromIB2 @@ -8342,13 +8442,111 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 3438.ImportedFromIB2 3439.IBPluginDependency 3439.ImportedFromIB2 + 3444.IBPluginDependency + 3445.IBPluginDependency + 3446.IBPluginDependency + 3447.IBPluginDependency + 3448.IBPluginDependency + 3449.IBPluginDependency + 3450.IBPluginDependency + 3451.IBPluginDependency + 3452.IBPluginDependency + 3453.IBPluginDependency + 3454.IBPluginDependency + 3455.IBPluginDependency + 3456.IBPluginDependency + 3457.IBPluginDependency + 3458.IBPluginDependency + 3459.IBPluginDependency + 3460.IBPluginDependency + 3461.IBPluginDependency + 3462.IBPluginDependency + 3463.IBPluginDependency + 3464.IBPluginDependency + 3465.IBPluginDependency + 3466.IBPluginDependency + 3467.IBPluginDependency + 3468.IBPluginDependency + 3469.IBPluginDependency + 3470.IBPluginDependency + 3471.IBPluginDependency + 3472.IBPluginDependency + 3473.IBPluginDependency + 3474.IBPluginDependency + 3475.IBPluginDependency + 3476.IBPluginDependency + 3477.IBPluginDependency + 3478.IBPluginDependency + 3479.IBPluginDependency + 3480.IBPluginDependency + 3481.IBPluginDependency + 3482.IBPluginDependency + 3483.IBPluginDependency + 3484.IBPluginDependency + 3485.IBPluginDependency + 3486.IBPluginDependency + 3487.IBPluginDependency + 3488.IBPluginDependency + 3489.IBPluginDependency + 3490.IBPluginDependency + 3491.IBPluginDependency + 3492.IBPluginDependency + 3493.IBPluginDependency + 3494.IBPluginDependency + 3495.IBPluginDependency + 3496.IBPluginDependency + 3497.IBPluginDependency + 3498.IBPluginDependency + 3499.IBPluginDependency + 3500.IBPluginDependency + 3501.IBPluginDependency + 3502.IBPluginDependency + 3503.IBPluginDependency + 3504.IBPluginDependency + 3505.IBPluginDependency + 3506.IBPluginDependency + 3507.IBPluginDependency + 3508.IBPluginDependency + 3509.IBPluginDependency + 3510.IBPluginDependency + 3511.IBPluginDependency + 3512.IBPluginDependency + 3513.IBPluginDependency + 3514.IBPluginDependency + 3515.IBPluginDependency + 3516.IBPluginDependency + 3517.IBPluginDependency + 3518.IBPluginDependency + 3519.IBPluginDependency + 3520.IBPluginDependency + 3521.IBPluginDependency + 3522.IBPluginDependency + 3523.IBPluginDependency + 3524.IBPluginDependency + 3525.IBPluginDependency + 3526.IBPluginDependency + 3527.IBPluginDependency + 3528.IBPluginDependency + 3529.IBPluginDependency + 3530.IBPluginDependency + 3531.IBPluginDependency + 3532.IBPluginDependency + 3533.IBPluginDependency + 3534.IBPluginDependency 3534.IBShouldRemoveOnLegacySave + 3535.IBPluginDependency 3535.IBShouldRemoveOnLegacySave + 3536.IBPluginDependency 3536.IBShouldRemoveOnLegacySave + 3537.IBPluginDependency 3537.IBShouldRemoveOnLegacySave + 3538.IBPluginDependency 3538.IBShouldRemoveOnLegacySave + 3539.IBPluginDependency 3539.IBShouldRemoveOnLegacySave + 3540.IBPluginDependency 3540.IBShouldRemoveOnLegacySave + 3541.IBPluginDependency 3541.IBShouldRemoveOnLegacySave 3542.IBPluginDependency 3542.ImportedFromIB2 @@ -8356,11 +8554,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 3543.ImportedFromIB2 3544.IBPluginDependency 3544.ImportedFromIB2 + 3545.IBPluginDependency + 3546.IBPluginDependency + 3547.IBPluginDependency + 3555.IBPluginDependency + 3556.IBPluginDependency + 3557.IBPluginDependency + 3560.IBPluginDependency + 3561.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin {{343, 211}, {640, 500}} {{343, 211}, {640, 500}} @@ -8405,7 +8612,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin - {{384, 139}, {570, 258}} + {{371, 260}, {570, 313}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -8744,13 +8951,111 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -8758,6 +9063,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 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 @@ -8780,13 +9093,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - 3554 + 3563 YES FirstResponder + NSObject IBUserSource @@ -8801,6 +9115,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA NSApplication + NSResponder IBUserSource @@ -9007,9 +9322,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA o_intf_fspanel_ckb o_intf_lang_pop o_intf_lang_txt + o_intf_last_update_lbl o_intf_mediakeys_bg_ckb o_intf_mediakeys_ckb o_intf_network_box + o_intf_update_ckb o_intf_view o_osd_encoding_pop o_osd_encoding_txt @@ -9167,6 +9484,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id + id + id @@ -9193,6 +9512,36 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA + + YES + + NSObject + + IBDocumentRelativeSource + ../../../../contrib/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcast.h + + + + NSObject + + IBDocumentRelativeSource + ../../../../contrib/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdater.h + + + + SUUpdater + NSObject + + checkForUpdates: + id + + + delegate + id + + + + 0 ../../vlc.xcodeproj diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib index 9be87c4d6b..55313ef322 100644 Binary files a/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib differ diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj index 970719a369..0a54e0c20e 100644 --- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj +++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj @@ -168,6 +168,7 @@ CC62B95F0FC600E90077BB8C /* pause_big.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9570FC600E90077BB8C /* pause_big.png */; }; CC62B9600FC600E90077BB8C /* play_big_down.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9580FC600E90077BB8C /* play_big_down.png */; }; CC62B9610FC600E90077BB8C /* play_big.png in Resources */ = {isa = PBXBuildFile; fileRef = CC62B9590FC600E90077BB8C /* play_big.png */; }; + CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CC8062631021F8790021EB9A /* dsa_pub.pem */; }; CCB60A420E6E5E3F00407004 /* VLM.nib in Resources */ = {isa = PBXBuildFile; fileRef = CCB60A400E6E5E3F00407004 /* VLM.nib */; }; CCBE999F0F922C51000705F8 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CCBE999E0F922C51000705F8 /* CoreServices.framework */; }; CCD90F4E0E87C86D0034564A /* add_schedule.png in Resources */ = {isa = PBXBuildFile; fileRef = CCD90F4B0E87C86D0034564A /* add_schedule.png */; }; @@ -370,6 +371,7 @@ CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; }; CC6EDD4F0B9CA2140096068A /* eyetv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eyetv.h; path = ../../../modules/gui/macosx/eyetv.h; sourceTree = SOURCE_ROOT; }; CC6EDD500B9CA2140096068A /* eyetv.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = eyetv.m; path = ../../../modules/gui/macosx/eyetv.m; sourceTree = SOURCE_ROOT; }; + CC8062631021F8790021EB9A /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dsa_pub.pem; path = Resources/dsa_pub.pem; sourceTree = ""; }; CC962E2C0CC7992800A56695 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = ""; }; CC965D5D0DA5880F0088F222 /* display_middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_middle.png; path = Resources/display_middle.png; sourceTree = ""; }; CC965D5E0DA5880F0088F222 /* display_left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = display_left.png; path = Resources/display_left.png; sourceTree = ""; }; @@ -482,6 +484,7 @@ 8ECA7E520563CD9500DFC000 /* Controller */, F69B0CA602E24F6401A80112 /* InfoPlist.strings */, 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */, + CC8062631021F8790021EB9A /* dsa_pub.pem */, CC1C41D00D9BAD7F002728FA /* noart.png */, CCD90F4A0E87C82D0034564A /* VLM */, CC0B71E00D54F0DD00448E00 /* simple prefs (taken from qt4) */, @@ -893,6 +896,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + CC8062641021F8790021EB9A /* dsa_pub.pem in Resources */, CC62B95A0FC600E90077BB8C /* backward_big_down.png in Resources */, CC62B95B0FC600E90077BB8C /* backward_big.png in Resources */, CC62B95C0FC600E90077BB8C /* forward_big_down.png in Resources */, diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index d177df7227..43604e83f4 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -58,6 +58,7 @@ #import /* for crashlog send mechanism */ #import /* for the media key support */ +#import /* we're the update delegate */ /***************************************************************************** * Local prototypes. @@ -905,6 +906,19 @@ static VLCMain *_o_sharedMainInstance = nil; /* not reached */ } +#pragma mark - +#pragma mark Sparkle delegate +/* received directly before the update gets installed, so let's shut down a bit */ +- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update +{ + [o_remote stopListening: self]; + var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP ); + + /* Close the window directly, because we do know that there + * won't be anymore video. It's currently waiting a bit. */ + [[[o_controls voutView] window] orderOut:self]; +} + #pragma mark - #pragma mark Toolbar delegate diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 4078d92a85..2c11578e6b 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -96,6 +96,8 @@ IBOutlet id o_intf_lang_txt; IBOutlet id o_intf_network_box; IBOutlet id o_intf_view; + IBOutlet id o_intf_update_ckb; + IBOutlet id o_intf_last_update_lbl; IBOutlet id o_osd_encoding_pop; IBOutlet id o_osd_encoding_txt; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index e6a8c263a5..c8ed3304c2 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -29,6 +29,7 @@ #import "misc.h" #import "intf.h" #import "AppleRemote.h" +#import //for o_intf_last_update_lbl static NSString* VLCSPrefsToolbarIdentifier = @"Our Simple Preferences Toolbar Identifier"; static NSString* VLCIntfSettingToolbarIdentifier = @"Intf Settings Item Identifier"; @@ -267,6 +268,8 @@ create_toolbar_item( NSString * o_itemIdent, NSString * o_name, NSString * o_des [o_intf_appleremote_ckb setTitle: _NS("Control playback with the Apple Remote")]; [o_intf_mediakeys_ckb setTitle: _NS("Control playback with media keys")]; [o_intf_mediakeys_bg_ckb setTitle: _NS("...when VLC is in background")]; + [o_intf_update_ckb setTitle: _NS("Automatically check for updates")]; + [o_intf_last_update_lbl setStringValue: @""]; /* Subtitles and OSD */ [o_osd_encoding_txt setStringValue: _NS("Default Encoding")]; @@ -454,6 +457,10 @@ static inline char * __config_GetLabel( vlc_object_t *p_this, const char *psz_na [self setupButton: o_intf_mediakeys_ckb forBoolValue: "macosx-mediakeys"]; [self setupButton: o_intf_mediakeys_bg_ckb forBoolValue: "macosx-mediakeys-background"]; [o_intf_mediakeys_bg_ckb setEnabled: [o_intf_mediakeys_ckb state]]; + if( [[SUUpdater sharedUpdater] lastUpdateCheckDate] != NULL ) + [o_intf_last_update_lbl setStringValue: [NSString stringWithFormat: _NS("Last check on: %@"), [[[SUUpdater sharedUpdater] lastUpdateCheckDate] descriptionWithLocale: [[NSUserDefaults standardUserDefaults] dictionaryRepresentation]]]]; + else + [o_intf_last_update_lbl setStringValue: _NS("No check was performed yet.")]; /****************** * audio settings *