From 3def03c5a52ecc853f7e17d84c4886e76a49bcc7 Mon Sep 17 00:00:00 2001 From: David Fuhrmann Date: Sun, 1 Jun 2014 11:25:26 +0200 Subject: [PATCH] macosx: use new metadata-network-access variable --- .../Resources/English.lproj/Preferences.xib | 2570 ++--------------- modules/gui/macosx/MainWindow.m | 2 +- modules/gui/macosx/simple_prefs.h | 3 +- modules/gui/macosx/simple_prefs.m | 5 +- 4 files changed, 280 insertions(+), 2300 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/Preferences.xib b/extras/package/macosx/Resources/English.lproj/Preferences.xib index eabb194539..85691a9a5e 100644 --- a/extras/package/macosx/Resources/English.lproj/Preferences.xib +++ b/extras/package/macosx/Resources/English.lproj/Preferences.xib @@ -12,15 +12,15 @@ YES + - - - - - + + + + YES @@ -526,7 +526,7 @@ 256 - {{260, 203}, {293, 26}} + {{260, 195}, {293, 26}} YES @@ -568,7 +568,7 @@ 256 - {{17, 209}, {241, 17}} + {{17, 201}, {241, 17}} YES @@ -586,7 +586,7 @@ 256 - {{260, 231}, {293, 26}} + {{260, 223}, {293, 26}} YES @@ -624,7 +624,7 @@ 256 - {{17, 237}, {241, 17}} + {{17, 229}, {241, 17}} YES @@ -642,7 +642,7 @@ 256 - {{260, 532}, {293, 26}} + {{260, 524}, {293, 26}} YES @@ -737,7 +737,7 @@ _NS:21 - {{17, 16}, {536, 60}} + {{17, 15}, {536, 60}} _NS:18 {0, 0} @@ -761,7 +761,7 @@ 268 - {{262, 508}, {288, 18}} + {{262, 500}, {288, 18}} YES NO @@ -920,7 +920,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{17, 538}, {241, 17}} + {{17, 530}, {241, 17}} YES @@ -938,7 +938,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{17, 509}, {114, 17}} + {{17, 501}, {114, 17}} YES @@ -963,101 +963,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 274 YES - - - 256 - {{226, 63}, {293, 26}} - - YES - - -2076180416 - 2048 - - - 109199360 - 1 - - - - - - 400 - 75 - - - Manual download only - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - When track starts playing - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - As soon as track is added - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - 3 - YES - YES - 1 - - NO - - - - 256 - {{13, 69}, {211, 17}} - - YES - - 67108864 - 272629760 - Album art download policy - - - - - - NO - 1 - 268 @@ -1086,10 +991,33 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO + + + 268 + {{14, 64}, {503, 18}} + + YES + + -2080374784 + 0 + Allow metadata access + + + 1211912448 + 2 + + + + + 200 + 25 + + NO + 268 - {{32, 13}, {487, 17}} + {{42, 13}, {487, 17}} YES @@ -1113,11 +1041,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1 - {{2, 2}, {532, 97}} + {{2, 2}, {532, 90}} - {{17, 80}, {536, 114}} + {{17, 79}, {536, 107}} {0, 0} @@ -1140,7 +1068,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 451}, {534, 18}} + {{18, 443}, {534, 18}} YES @@ -1163,7 +1091,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 479}, {534, 18}} + {{18, 471}, {534, 18}} YES @@ -1186,7 +1114,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 424}, {534, 18}} + {{18, 416}, {534, 18}} YES @@ -1209,7 +1137,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 397}, {534, 18}} + {{18, 389}, {534, 18}} YES @@ -1232,7 +1160,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 344}, {534, 18}} + {{18, 336}, {534, 18}} YES @@ -1255,7 +1183,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 370}, {534, 18}} + {{18, 362}, {534, 18}} YES @@ -1278,7 +1206,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 261}, {534, 18}} + {{18, 253}, {534, 18}} YES @@ -1301,7 +1229,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 289}, {534, 18}} + {{18, 281}, {534, 18}} YES @@ -1324,7 +1252,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 256 - {{18, 316}, {534, 18}} + {{18, 308}, {534, 18}} YES @@ -1345,7 +1273,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 NO - {570, 576} + {570, 568} NSView @@ -1605,8 +1533,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + _popUpItemAction: @@ -1624,8 +1558,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -1635,8 +1569,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2013,8 +1947,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2032,8 +1966,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2043,8 +1977,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2301,8 +2235,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2320,8 +2254,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2331,8 +2265,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2372,8 +2306,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2391,8 +2325,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2402,8 +2336,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2618,8 +2552,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2637,8 +2571,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2648,8 +2582,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -2881,8 +2815,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -2900,8 +2834,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3102,8 +3036,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3120,8 +3054,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3132,8 +3066,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3143,8 +3077,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3281,8 +3215,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3300,8 +3234,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3311,8 +3245,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3370,8 +3304,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3389,8 +3323,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3400,8 +3334,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3459,8 +3393,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3478,8 +3412,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3489,8 +3423,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3548,8 +3482,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -3567,8 +3501,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -3578,8 +3512,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4118,8 +4052,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -4137,8 +4071,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4148,8 +4082,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4251,8 +4185,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -4270,8 +4204,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4281,8 +4215,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4340,8 +4274,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -4359,8 +4293,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4370,8 +4304,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4446,8 +4380,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -4465,8 +4399,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -4476,8 +4410,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5065,8 +4999,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5082,8 +5016,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5093,8 +5027,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5154,8 +5088,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5171,8 +5105,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5182,8 +5116,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5243,8 +5177,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5260,8 +5194,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5271,8 +5205,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5332,8 +5266,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5349,8 +5283,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5360,8 +5294,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5421,8 +5355,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5438,8 +5372,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5449,8 +5383,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5510,8 +5444,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5527,8 +5461,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5538,8 +5472,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5599,8 +5533,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5616,8 +5550,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5627,8 +5561,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5688,8 +5622,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 1 - - + + _popUpItemAction: @@ -5705,8 +5639,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -5716,8 +5650,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 1048576 2147483647 - - + + _popUpItemAction: @@ -6012,22 +5946,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2395 - - - o_intf_art_pop - - - - 2396 - - - - o_intf_art_txt - - - - 2397 - o_intf_fspanel_ckb @@ -6092,14 +6010,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2419 - - - interfaceSettingChanged: - - - - 2422 - audioSettingChanged: @@ -7836,6 +7746,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 3927 + + + o_intf_art_ckb + + + + 3931 + @@ -8020,9 +7938,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + Interface @@ -8032,9 +7950,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 YES - - + @@ -8601,64 +8518,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - - 2320 - - - YES - - - - - - 3453 - - - YES - - - - - - 2321 - - - YES - - - - - - - - 2322 - - - - - 2323 - - - - - 2324 - - - - - 2325 - - - YES - - - - - - 3454 - - - 2335 @@ -11074,6 +10933,20 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 + + 3928 + + + YES + + + + + + 3929 + + + @@ -11129,20 +11002,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 2318.IBPluginDependency 2318.IBViewBoundsToFrameTransform 2318.ImportedFromIB2 - 2320.IBPluginDependency - 2320.IBViewBoundsToFrameTransform - 2320.ImportedFromIB2 - 2321.IBPluginDependency - 2321.ImportedFromIB2 - 2322.IBPluginDependency - 2322.ImportedFromIB2 - 2323.IBPluginDependency - 2323.ImportedFromIB2 - 2324.IBPluginDependency - 2324.ImportedFromIB2 - 2325.IBPluginDependency - 2325.IBViewBoundsToFrameTransform - 2325.ImportedFromIB2 2327.IBPluginDependency 2327.IBViewBoundsToFrameTransform 2327.ImportedFromIB2 @@ -11447,8 +11306,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 3448.IBPluginDependency 3449.IBPluginDependency 3450.IBPluginDependency - 3453.IBPluginDependency - 3454.IBPluginDependency 3455.IBPluginDependency 3456.IBPluginDependency 3457.IBPluginDependency @@ -11537,6 +11394,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 3546.IBPluginDependency 3547.IBPluginDependency 3556.IBPluginDependency + 3556.IBViewBoundsToFrameTransform 3557.IBPluginDependency 3560.IBPluginDependency 3560.IBViewBoundsToFrameTransform @@ -11846,6 +11704,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 3922.IBPluginDependency 3922.ImportedFromIB2 3923.IBPluginDependency + 3928.IBPluginDependency + 3928.IBViewBoundsToFrameTransform + 3929.IBPluginDependency YES @@ -11895,7 +11756,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 P4AAAL+AAABDSAAAwiwAAA - {{710, 180}, {570, 576}} + {{398, 188}, {570, 568}} com.apple.InterfaceBuilder.CocoaPlugin @@ -11905,24 +11766,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDYgAAwq4AAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBUAAAwwoAAA - - - com.apple.InterfaceBuilder.CocoaPlugin P4AAAL+AAABBkAAAw9wAAA @@ -12358,8 +12201,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12388,10 +12229,13 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBcAAAwlAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABCAAAAwdgAAA + P4AAAL+AAABCAAAAweAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -12492,7 +12336,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBkAAAw14AAA + P4AAAL+AAABBkAAAw4qAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -12766,7 +12610,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin - AUGIAABCZAAAA + AUGIAABBgAAAA NSSecureTextField com.apple.InterfaceBuilder.CocoaPlugin @@ -12819,6 +12663,11 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBmAAAwjwAAA + + com.apple.InterfaceBuilder.CocoaPlugin @@ -12837,7 +12686,7 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - 3927 + 3932 @@ -13234,12 +13083,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_input_view o_intf_appleremote_ckb o_intf_appleremote_sysvol_ckb - o_intf_art_pop - o_intf_art_txt + o_intf_art_ckb o_intf_autoresize_ckb + o_intf_continueplayback_lbl + o_intf_continueplayback_pop o_intf_embedded_ckb o_intf_enableGrowl_ckb o_intf_fspanel_ckb + o_intf_language_pop + o_intf_language_txt o_intf_last_update_lbl o_intf_luahttp_box o_intf_luahttppwd_fld @@ -13247,6 +13099,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_intf_mediakeys_ckb o_intf_nativefullscreen_ckb o_intf_network_box + o_intf_pauseitunes_lbl + o_intf_pauseitunes_pop o_intf_pauseminimized_ckb o_intf_style_bright_bcell o_intf_style_dark_bcell @@ -13307,8 +13161,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_video_enable_ckb o_video_fullscreen_ckb o_video_onTop_ckb - o_video_output_pop - o_video_output_txt o_video_skipFrames_ckb o_video_snap_box o_video_snap_folder_btn @@ -13470,6 +13322,9 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id id id + id + id + id @@ -13533,12 +13388,15 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_input_view o_intf_appleremote_ckb o_intf_appleremote_sysvol_ckb - o_intf_art_pop - o_intf_art_txt + o_intf_art_ckb o_intf_autoresize_ckb + o_intf_continueplayback_lbl + o_intf_continueplayback_pop o_intf_embedded_ckb o_intf_enableGrowl_ckb o_intf_fspanel_ckb + o_intf_language_pop + o_intf_language_txt o_intf_last_update_lbl o_intf_luahttp_box o_intf_luahttppwd_fld @@ -13546,6 +13404,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_intf_mediakeys_ckb o_intf_nativefullscreen_ckb o_intf_network_box + o_intf_pauseitunes_lbl + o_intf_pauseitunes_pop o_intf_pauseminimized_ckb o_intf_style_bright_bcell o_intf_style_dark_bcell @@ -13606,8 +13466,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_video_enable_ckb o_video_fullscreen_ckb o_video_onTop_ckb - o_video_output_pop - o_video_output_txt o_video_skipFrames_ckb o_video_snap_box o_video_snap_folder_btn @@ -13853,15 +13711,19 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 id - o_intf_art_pop + o_intf_art_ckb id - o_intf_art_txt + o_intf_autoresize_ckb id - o_intf_autoresize_ckb + o_intf_continueplayback_lbl + id + + + o_intf_continueplayback_pop id @@ -13876,6 +13738,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_intf_fspanel_ckb id + + o_intf_language_pop + id + + + o_intf_language_txt + id + o_intf_last_update_lbl id @@ -13904,6 +13774,14 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_intf_network_box id + + o_intf_pauseitunes_lbl + id + + + o_intf_pauseitunes_pop + id + o_intf_pauseminimized_ckb id @@ -14144,14 +14022,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 o_video_onTop_ckb id - - o_video_output_pop - id - - - o_video_output_txt - id - o_video_skipFrames_ckb id @@ -14230,1561 +14100,8 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 - + YES - - VLCHotkeyChangeWindow - NSWindow - - IBDocumentRelativeSource - ../../../../../modules/gui/macosx/simple_prefs.h - - - - VLCSimplePrefs - NSObject - - YES - - YES - audioSettingChanged: - buttonAction: - changeFont: - hotkeySettingChanged: - inputSettingChanged: - interfaceSettingChanged: - osdSettingChanged: - resetPreferences: - showFontPicker: - urlHandlerAction: - videoSettingChanged: - - - YES - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - audioSettingChanged: - buttonAction: - changeFont: - hotkeySettingChanged: - inputSettingChanged: - interfaceSettingChanged: - osdSettingChanged: - resetPreferences: - showFontPicker: - urlHandlerAction: - videoSettingChanged: - - - YES - - audioSettingChanged: - id - - - buttonAction: - id - - - changeFont: - id - - - hotkeySettingChanged: - id - - - inputSettingChanged: - id - - - interfaceSettingChanged: - id - - - osdSettingChanged: - id - - - resetPreferences: - id - - - showFontPicker: - id - - - urlHandlerAction: - id - - - videoSettingChanged: - id - - - - - YES - - YES - o_audio_autosavevol_matrix - o_audio_autosavevol_no_bcell - o_audio_autosavevol_yes_bcell - o_audio_dolby_pop - o_audio_dolby_txt - o_audio_effects_box - o_audio_enable_ckb - o_audio_general_box - o_audio_lang_fld - o_audio_lang_txt - o_audio_last_box - o_audio_last_ckb - o_audio_lastpwd_sfld - o_audio_lastpwd_txt - o_audio_lastuser_fld - o_audio_lastuser_txt - o_audio_spdif_ckb - o_audio_view - o_audio_visual_pop - o_audio_visual_txt - o_audio_vol_fld - o_audio_vol_sld - o_currentlyShownCategoryView - o_hotkeys_change_btn - o_hotkeys_change_cancel_btn - o_hotkeys_change_keys_lbl - o_hotkeys_change_lbl - o_hotkeys_change_ok_btn - o_hotkeys_change_taken_lbl - o_hotkeys_change_win - o_hotkeys_clear_btn - o_hotkeys_lbl - o_hotkeys_listbox - o_hotkeys_view - o_input_avcodec_hw_pop - o_input_avcodec_hw_txt - o_input_avi_pop - o_input_avi_txt - o_input_cachelevel_custom_txt - o_input_cachelevel_pop - o_input_cachelevel_txt - o_input_caching_box - o_input_mkv_preload_dir_ckb - o_input_mux_box - o_input_net_box - o_input_postproc_fld - o_input_postproc_txt - o_input_record_box - o_input_record_btn - o_input_record_fld - o_input_rtsp_ckb - o_input_skipLoop_pop - o_input_skipLoop_txt - o_input_urlhandler_btn - o_input_view - o_intf_appleremote_ckb - o_intf_appleremote_sysvol_ckb - o_intf_art_pop - o_intf_art_txt - o_intf_autoresize_ckb - o_intf_continueplayback_lbl - o_intf_continueplayback_pop - o_intf_embedded_ckb - o_intf_enableGrowl_ckb - o_intf_fspanel_ckb - o_intf_language_pop - o_intf_language_txt - o_intf_last_update_lbl - o_intf_luahttp_box - o_intf_luahttppwd_fld - o_intf_luahttppwd_lbl - o_intf_mediakeys_ckb - o_intf_nativefullscreen_ckb - o_intf_network_box - o_intf_pauseitunes_lbl - o_intf_pauseitunes_pop - o_intf_pauseminimized_ckb - o_intf_style_bright_bcell - o_intf_style_dark_bcell - o_intf_style_txt - o_intf_update_ckb - o_intf_view - o_osd_encoding_pop - o_osd_encoding_txt - o_osd_font_box - o_osd_font_btn - o_osd_font_color_pop - o_osd_font_color_txt - o_osd_font_fld - o_osd_font_size_pop - o_osd_font_size_txt - o_osd_font_txt - o_osd_forcebold_ckb - o_osd_lang_box - o_osd_lang_fld - o_osd_lang_txt - o_osd_opacity_fld - o_osd_opacity_sld - o_osd_opacity_txt - o_osd_osd_box - o_osd_osd_ckb - o_osd_outline_color_pop - o_osd_outline_color_txt - o_osd_outline_thickness_pop - o_osd_outline_thickness_txt - o_osd_view - o_sprefs_cancel_btn - o_sprefs_controls_box - o_sprefs_reset_btn - o_sprefs_save_btn - o_sprefs_showAll_btn - o_sprefs_win - o_urlhandler_cancel_btn - o_urlhandler_ftp_pop - o_urlhandler_mms_pop - o_urlhandler_rtmp_pop - o_urlhandler_rtp_pop - o_urlhandler_rtsp_pop - o_urlhandler_save_btn - o_urlhandler_sftp_pop - o_urlhandler_smb_pop - o_urlhandler_subtitle_txt - o_urlhandler_title_txt - o_urlhandler_udp_pop - o_urlhandler_win - o_video_black_ckb - o_video_deinterlace_mode_pop - o_video_deinterlace_mode_txt - o_video_deinterlace_pop - o_video_deinterlace_txt - o_video_device_pop - o_video_device_txt - o_video_display_box - o_video_enable_ckb - o_video_fullscreen_ckb - o_video_onTop_ckb - o_video_skipFrames_ckb - o_video_snap_box - o_video_snap_folder_btn - o_video_snap_folder_fld - o_video_snap_folder_txt - o_video_snap_format_pop - o_video_snap_format_txt - o_video_snap_prefix_fld - o_video_snap_prefix_txt - o_video_snap_seqnum_ckb - o_video_video_box - o_video_videodeco_ckb - o_video_view - - - YES - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - id - - - - YES - - YES - o_audio_autosavevol_matrix - o_audio_autosavevol_no_bcell - o_audio_autosavevol_yes_bcell - o_audio_dolby_pop - o_audio_dolby_txt - o_audio_effects_box - o_audio_enable_ckb - o_audio_general_box - o_audio_lang_fld - o_audio_lang_txt - o_audio_last_box - o_audio_last_ckb - o_audio_lastpwd_sfld - o_audio_lastpwd_txt - o_audio_lastuser_fld - o_audio_lastuser_txt - o_audio_spdif_ckb - o_audio_view - o_audio_visual_pop - o_audio_visual_txt - o_audio_vol_fld - o_audio_vol_sld - o_currentlyShownCategoryView - o_hotkeys_change_btn - o_hotkeys_change_cancel_btn - o_hotkeys_change_keys_lbl - o_hotkeys_change_lbl - o_hotkeys_change_ok_btn - o_hotkeys_change_taken_lbl - o_hotkeys_change_win - o_hotkeys_clear_btn - o_hotkeys_lbl - o_hotkeys_listbox - o_hotkeys_view - o_input_avcodec_hw_pop - o_input_avcodec_hw_txt - o_input_avi_pop - o_input_avi_txt - o_input_cachelevel_custom_txt - o_input_cachelevel_pop - o_input_cachelevel_txt - o_input_caching_box - o_input_mkv_preload_dir_ckb - o_input_mux_box - o_input_net_box - o_input_postproc_fld - o_input_postproc_txt - o_input_record_box - o_input_record_btn - o_input_record_fld - o_input_rtsp_ckb - o_input_skipLoop_pop - o_input_skipLoop_txt - o_input_urlhandler_btn - o_input_view - o_intf_appleremote_ckb - o_intf_appleremote_sysvol_ckb - o_intf_art_pop - o_intf_art_txt - o_intf_autoresize_ckb - o_intf_continueplayback_lbl - o_intf_continueplayback_pop - o_intf_embedded_ckb - o_intf_enableGrowl_ckb - o_intf_fspanel_ckb - o_intf_language_pop - o_intf_language_txt - o_intf_last_update_lbl - o_intf_luahttp_box - o_intf_luahttppwd_fld - o_intf_luahttppwd_lbl - o_intf_mediakeys_ckb - o_intf_nativefullscreen_ckb - o_intf_network_box - o_intf_pauseitunes_lbl - o_intf_pauseitunes_pop - o_intf_pauseminimized_ckb - o_intf_style_bright_bcell - o_intf_style_dark_bcell - o_intf_style_txt - o_intf_update_ckb - o_intf_view - o_osd_encoding_pop - o_osd_encoding_txt - o_osd_font_box - o_osd_font_btn - o_osd_font_color_pop - o_osd_font_color_txt - o_osd_font_fld - o_osd_font_size_pop - o_osd_font_size_txt - o_osd_font_txt - o_osd_forcebold_ckb - o_osd_lang_box - o_osd_lang_fld - o_osd_lang_txt - o_osd_opacity_fld - o_osd_opacity_sld - o_osd_opacity_txt - o_osd_osd_box - o_osd_osd_ckb - o_osd_outline_color_pop - o_osd_outline_color_txt - o_osd_outline_thickness_pop - o_osd_outline_thickness_txt - o_osd_view - o_sprefs_cancel_btn - o_sprefs_controls_box - o_sprefs_reset_btn - o_sprefs_save_btn - o_sprefs_showAll_btn - o_sprefs_win - o_urlhandler_cancel_btn - o_urlhandler_ftp_pop - o_urlhandler_mms_pop - o_urlhandler_rtmp_pop - o_urlhandler_rtp_pop - o_urlhandler_rtsp_pop - o_urlhandler_save_btn - o_urlhandler_sftp_pop - o_urlhandler_smb_pop - o_urlhandler_subtitle_txt - o_urlhandler_title_txt - o_urlhandler_udp_pop - o_urlhandler_win - o_video_black_ckb - o_video_deinterlace_mode_pop - o_video_deinterlace_mode_txt - o_video_deinterlace_pop - o_video_deinterlace_txt - o_video_device_pop - o_video_device_txt - o_video_display_box - o_video_enable_ckb - o_video_fullscreen_ckb - o_video_onTop_ckb - o_video_skipFrames_ckb - o_video_snap_box - o_video_snap_folder_btn - o_video_snap_folder_fld - o_video_snap_folder_txt - o_video_snap_format_pop - o_video_snap_format_txt - o_video_snap_prefix_fld - o_video_snap_prefix_txt - o_video_snap_seqnum_ckb - o_video_video_box - o_video_videodeco_ckb - o_video_view - - - YES - - o_audio_autosavevol_matrix - id - - - o_audio_autosavevol_no_bcell - id - - - o_audio_autosavevol_yes_bcell - id - - - o_audio_dolby_pop - id - - - o_audio_dolby_txt - id - - - o_audio_effects_box - id - - - o_audio_enable_ckb - id - - - o_audio_general_box - id - - - o_audio_lang_fld - id - - - o_audio_lang_txt - id - - - o_audio_last_box - id - - - o_audio_last_ckb - id - - - o_audio_lastpwd_sfld - id - - - o_audio_lastpwd_txt - id - - - o_audio_lastuser_fld - id - - - o_audio_lastuser_txt - id - - - o_audio_spdif_ckb - id - - - o_audio_view - id - - - o_audio_visual_pop - id - - - o_audio_visual_txt - id - - - o_audio_vol_fld - id - - - o_audio_vol_sld - id - - - o_currentlyShownCategoryView - id - - - o_hotkeys_change_btn - id - - - o_hotkeys_change_cancel_btn - id - - - o_hotkeys_change_keys_lbl - id - - - o_hotkeys_change_lbl - id - - - o_hotkeys_change_ok_btn - id - - - o_hotkeys_change_taken_lbl - id - - - o_hotkeys_change_win - id - - - o_hotkeys_clear_btn - id - - - o_hotkeys_lbl - id - - - o_hotkeys_listbox - id - - - o_hotkeys_view - id - - - o_input_avcodec_hw_pop - id - - - o_input_avcodec_hw_txt - id - - - o_input_avi_pop - id - - - o_input_avi_txt - id - - - o_input_cachelevel_custom_txt - id - - - o_input_cachelevel_pop - id - - - o_input_cachelevel_txt - id - - - o_input_caching_box - id - - - o_input_mkv_preload_dir_ckb - id - - - o_input_mux_box - id - - - o_input_net_box - id - - - o_input_postproc_fld - id - - - o_input_postproc_txt - id - - - o_input_record_box - id - - - o_input_record_btn - id - - - o_input_record_fld - id - - - o_input_rtsp_ckb - id - - - o_input_skipLoop_pop - id - - - o_input_skipLoop_txt - id - - - o_input_urlhandler_btn - id - - - o_input_view - id - - - o_intf_appleremote_ckb - id - - - o_intf_appleremote_sysvol_ckb - id - - - o_intf_art_pop - id - - - o_intf_art_txt - id - - - o_intf_autoresize_ckb - id - - - o_intf_continueplayback_lbl - id - - - o_intf_continueplayback_pop - id - - - o_intf_embedded_ckb - id - - - o_intf_enableGrowl_ckb - id - - - o_intf_fspanel_ckb - id - - - o_intf_language_pop - id - - - o_intf_language_txt - id - - - o_intf_last_update_lbl - id - - - o_intf_luahttp_box - id - - - o_intf_luahttppwd_fld - id - - - o_intf_luahttppwd_lbl - id - - - o_intf_mediakeys_ckb - id - - - o_intf_nativefullscreen_ckb - id - - - o_intf_network_box - id - - - o_intf_pauseitunes_lbl - id - - - o_intf_pauseitunes_pop - id - - - o_intf_pauseminimized_ckb - id - - - o_intf_style_bright_bcell - id - - - o_intf_style_dark_bcell - id - - - o_intf_style_txt - id - - - o_intf_update_ckb - id - - - o_intf_view - id - - - o_osd_encoding_pop - id - - - o_osd_encoding_txt - id - - - o_osd_font_box - id - - - o_osd_font_btn - id - - - o_osd_font_color_pop - id - - - o_osd_font_color_txt - id - - - o_osd_font_fld - id - - - o_osd_font_size_pop - id - - - o_osd_font_size_txt - id - - - o_osd_font_txt - id - - - o_osd_forcebold_ckb - id - - - o_osd_lang_box - id - - - o_osd_lang_fld - id - - - o_osd_lang_txt - id - - - o_osd_opacity_fld - id - - - o_osd_opacity_sld - id - - - o_osd_opacity_txt - id - - - o_osd_osd_box - id - - - o_osd_osd_ckb - id - - - o_osd_outline_color_pop - id - - - o_osd_outline_color_txt - id - - - o_osd_outline_thickness_pop - id - - - o_osd_outline_thickness_txt - id - - - o_osd_view - id - - - o_sprefs_cancel_btn - id - - - o_sprefs_controls_box - id - - - o_sprefs_reset_btn - id - - - o_sprefs_save_btn - id - - - o_sprefs_showAll_btn - id - - - o_sprefs_win - id - - - o_urlhandler_cancel_btn - id - - - o_urlhandler_ftp_pop - id - - - o_urlhandler_mms_pop - id - - - o_urlhandler_rtmp_pop - id - - - o_urlhandler_rtp_pop - id - - - o_urlhandler_rtsp_pop - id - - - o_urlhandler_save_btn - id - - - o_urlhandler_sftp_pop - id - - - o_urlhandler_smb_pop - id - - - o_urlhandler_subtitle_txt - id - - - o_urlhandler_title_txt - id - - - o_urlhandler_udp_pop - id - - - o_urlhandler_win - id - - - o_video_black_ckb - id - - - o_video_deinterlace_mode_pop - id - - - o_video_deinterlace_mode_txt - id - - - o_video_deinterlace_pop - id - - - o_video_deinterlace_txt - id - - - o_video_device_pop - id - - - o_video_device_txt - id - - - o_video_display_box - id - - - o_video_enable_ckb - id - - - o_video_fullscreen_ckb - id - - - o_video_onTop_ckb - id - - - o_video_skipFrames_ckb - id - - - o_video_snap_box - id - - - o_video_snap_folder_btn - id - - - o_video_snap_folder_fld - id - - - o_video_snap_folder_txt - id - - - o_video_snap_format_pop - id - - - o_video_snap_format_txt - id - - - o_video_snap_prefix_fld - id - - - o_video_snap_prefix_txt - id - - - o_video_snap_seqnum_ckb - id - - - o_video_video_box - id - - - o_video_videodeco_ckb - id - - - o_video_view - id - - - - - - - VLCSimplePrefsWindow - NSWindow - - - - - 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 - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSWindowRestoration.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.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 - - - - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSLayoutConstraint.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.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 - - - - NSNumberFormatter - NSFormatter - - IBFrameworkSource - Foundation.framework/Headers/NSNumberFormatter.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/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 @@ -15792,341 +14109,6 @@ y7bMNcy1zTXNtc42zrbPN8+40DnQutE80b7SP9LB00TTxtRJ1MvVTtXR1lXW2Ndc1+DYZNjo2WzZ8dp2 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 - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSPanel - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSPanel.h - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSPopUpButtonCell - NSMenuItemCell - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButtonCell.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSResponder - - - - NSScrollView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSScrollView.h - - - - NSScroller - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSScroller.h - - - - NSSecureTextField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSecureTextField.h - - - - NSSlider - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSlider.h - - - - NSSliderCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSliderCell.h - - - - NSSplitView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSSplitView.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 - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSOpenGLView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - 0 diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 5dfa8b300a..9e74f699e1 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -341,7 +341,7 @@ static VLCMainWindow *_o_sharedInstance = nil; NSAlert *albumArtAlert = [NSAlert alertWithMessageText:_NS("Check for album art and metadata?") defaultButton:_NS("Enable Metadata Retrieval") alternateButton:_NS("No, Thanks") otherButton:nil informativeTextWithFormat:@"%@",_NS("VLC can check online for album art and metadata to enrich your playback experience, e.g. by providing track information when playing Audio CDs. To provide this functionality, VLC will send information about your contents to trusted services in an anonymized form.")]; NSInteger returnValue = [albumArtAlert runModal]; - config_PutInt(VLCIntf, "album-art", returnValue == 1 ? ALBUM_ART_ALL : ALBUM_ART_WHEN_ASKED); + config_PutInt(VLCIntf, "metadata-network-access", returnValue == NSAlertDefaultReturn); } // select playlist item by default diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h index 3ec972aa08..1f044d5281 100644 --- a/modules/gui/macosx/simple_prefs.h +++ b/modules/gui/macosx/simple_prefs.h @@ -89,8 +89,7 @@ IBOutlet id o_intf_style_txt; IBOutlet id o_intf_style_dark_bcell; IBOutlet id o_intf_style_bright_bcell; - IBOutlet id o_intf_art_pop; - IBOutlet id o_intf_art_txt; + IBOutlet id o_intf_art_ckb; IBOutlet id o_intf_embedded_ckb; IBOutlet id o_intf_fspanel_ckb; IBOutlet id o_intf_appleremote_ckb; diff --git a/modules/gui/macosx/simple_prefs.m b/modules/gui/macosx/simple_prefs.m index 0371fa2359..6c6958ea64 100644 --- a/modules/gui/macosx/simple_prefs.m +++ b/modules/gui/macosx/simple_prefs.m @@ -356,7 +356,6 @@ create_toolbar_item(NSString * o_itemIdent, NSString * o_name, NSString * o_desc [o_intf_style_txt setStringValue: _NS("Interface style")]; [o_intf_style_dark_bcell setTitle: _NS("Dark")]; [o_intf_style_bright_bcell setTitle: _NS("Bright")]; - [o_intf_art_txt setStringValue: _NS("Album art download policy")]; [o_intf_embedded_ckb setTitle: _NS("Show video within the main window")]; [o_intf_nativefullscreen_ckb setTitle: _NS("Use the native fullscreen mode")]; [o_intf_fspanel_ckb setTitle: _NS("Show Fullscreen Controller")]; @@ -557,7 +556,7 @@ static inline char * __config_GetLabel(vlc_object_t *p_this, const char *psz_nam } [o_intf_language_pop selectItemAtIndex:sel]; - [self setupButton: o_intf_art_pop forIntList: "album-art"]; + [self setupButton: o_intf_art_ckb forBoolValue: "metadata-network-access"]; [self setupButton: o_intf_fspanel_ckb forBoolValue: "macosx-fspanel"]; @@ -910,7 +909,7 @@ static inline void save_string_list(intf_thread_t * p_intf, id object, const cha [defaults setObject:[NSString stringWithUTF8String:ppsz_language[index]] forKey:@"language"]; [defaults synchronize]; - SaveIntList(o_intf_art_pop, "album-art"); + config_PutInt(p_intf, "metadata-network-access", [o_intf_art_ckb state]); config_PutInt(p_intf, "macosx-fspanel", [o_intf_fspanel_ckb state]); config_PutInt(p_intf, "embedded-video", [o_intf_embedded_ckb state]); -- GitLab