diff --git a/Makefile.am b/Makefile.am index 6d4f47667b..29ef3c3305 100644 --- a/Makefile.am +++ b/Makefile.am @@ -111,6 +111,7 @@ EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/MediaInfo.xib \ extras/package/macosx/Resources/English.lproj/Open.xib \ extras/package/macosx/Resources/English.lproj/Preferences.xib \ + extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \ extras/package/macosx/Resources/English.lproj/SyncTracks.xib \ extras/package/macosx/Resources/English.lproj/VideoEffects.xib \ extras/package/macosx/Resources/English.lproj/Wizard.xib \ diff --git a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib index 0aba3ba5a4..87bd69c90e 100644 --- a/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib +++ b/extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib @@ -2,34 +2,27 @@ 1060 - 12B19 + 11G45 851 - 1187 - 624.00 + 1138.51 + 569.00 com.apple.InterfaceBuilder.CocoaPlugin 851 YES - - + - YES com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + PluginDependencyRecalculationVersion + YES @@ -100,7 +93,6 @@ 0 NO - NO YES @@ -138,7 +130,6 @@ - NO @@ -164,7 +155,6 @@ 200 25 - NO {{1, 1}, {627, 215}} @@ -227,7 +217,6 @@ - NO @@ -237,7 +226,7 @@ _NS:791 YES - -2076180416 + -2076049856 2048 _NS:791 @@ -302,7 +291,6 @@ YES 2 - NO @@ -325,7 +313,6 @@ 200 25 - NO {{1, 1}, {627, 90}} @@ -379,7 +366,6 @@ - NO @@ -401,7 +387,6 @@ 200 25 - NO @@ -423,7 +408,6 @@ 200 25 - NO @@ -446,7 +430,6 @@ 200 25 - NO {{1, 1}, {627, 98}} @@ -496,7 +479,6 @@ 200 25 - NO {663, 490} @@ -535,7 +517,6 @@ - NO @@ -567,7 +548,6 @@ 0 NO - NO YES @@ -615,7 +595,6 @@ _NS:736 YES - NO 4 4 @@ -1032,7 +1011,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1057,7 +1035,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1076,7 +1053,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1095,7 +1071,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1105,7 +1080,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _NS:791 YES - -2076180416 + -2076049856 133120 _NS:791 @@ -1164,7 +1139,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 - NO @@ -1189,7 +1163,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1208,7 +1181,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 YES - NO @@ -1227,7 +1199,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1247,7 +1218,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1266,7 +1236,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 YES - NO @@ -1296,7 +1265,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1315,7 +1283,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1335,7 +1302,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1354,7 +1320,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1373,7 +1338,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1392,7 +1356,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1402,7 +1365,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _NS:791 YES - -2076180416 + -2076049856 133120 _NS:791 @@ -1461,7 +1424,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 - NO {{1, 1.453125}, {392, 122}} @@ -1528,7 +1490,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1553,7 +1514,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1572,7 +1532,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1591,7 +1550,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1601,7 +1559,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _NS:791 YES - -2076180416 + -2076049856 133120 _NS:791 @@ -1660,7 +1618,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 - NO @@ -1670,7 +1627,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _NS:791 YES - -2076180416 + -2076049856 133120 _NS:791 @@ -1729,7 +1686,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 - NO @@ -1749,7 +1705,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1768,7 +1723,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 YES - NO @@ -1787,7 +1741,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1806,7 +1759,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1826,7 +1778,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -1845,7 +1796,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 1 YES - NO {{10, 33}, {512, 277}} @@ -1885,7 +1835,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1910,7 +1859,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -1920,7 +1868,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _NS:791 YES - -2076180416 + -2076049856 133120 _NS:791 @@ -1979,7 +1927,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 2 - NO {{10, 33}, {512, 277}} @@ -2020,7 +1967,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2043,7 +1989,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2066,7 +2011,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO {558, 370} @@ -2118,7 +2062,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2136,7 +2079,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2153,7 +2095,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2173,7 +2114,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - NO @@ -2190,7 +2130,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2199,7 +2138,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - -2076180416 + -2076049856 1024 @@ -2276,7 +2215,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES 1 - NO @@ -2293,7 +2231,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2311,7 +2248,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2328,7 +2264,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2349,7 +2284,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - NO @@ -2366,7 +2300,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO {{1, 1}, {496, 120}} @@ -2425,7 +2358,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2443,7 +2375,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2464,7 +2395,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2481,7 +2411,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2499,7 +2428,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2521,7 +2449,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2543,7 +2470,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2565,7 +2491,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO @@ -2582,7 +2507,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO {{2, 2}, {494, 152}} @@ -2630,7 +2554,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO {532, 355} @@ -2661,7 +2584,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2686,7 +2608,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - NO @@ -2715,7 +2636,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 0 NO - NO YES @@ -2744,7 +2664,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO {531, 72} @@ -2776,7 +2695,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA MC42AA - NO @@ -2800,314 +2718,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 200 25 - NO {571, 72} _NS:1109 NSView - - 1 - 2 - {{265, 520}, {612, 159}} - 1886912512 - Save as new profile - NSWindow - - View - - - {612, 159} - - - 256 - - YES - - - 266 - {{17, 122}, {578, 17}} - - YES - - 69206017 - 272629760 - Save as new profile - - LucidaGrande-Bold - 13 - 2064 - - - - - - NO - - - - 266 - {{17, 97}, {578, 17}} - - YES - - 69206017 - 272629824 - Enter a name for the new profile - - - - - - NO - - - - 257 - {{475, 12}, {123, 32}} - - YES - - 67108864 - 134217728 - Save - - - -2038284288 - 1 - - - DQ - 200 - 25 - - NO - - - - 257 - {{352, 12}, {123, 32}} - - YES - - 67108864 - 134217728 - Cancel - - - -2038284288 - 1 - - - Gw - 200 - 25 - - NO - - - - 268 - {{20, 67}, {572, 22}} - - _NS:817 - YES - - -1804599231 - 272630784 - - - _NS:817 - - YES - - - - NO - - - {612, 159} - - - {{0, 0}, {2560, 1418}} - {612, 181} - YES - - - 1 - 2 - {{265, 520}, {612, 159}} - 1886912512 - Remove a profile - NSWindow - - View - - - {612, 159} - {612, 159} - - - 256 - - YES - - - 266 - {{17, 122}, {578, 17}} - - YES - - 69206017 - 272629760 - Remove a profile - - - - - - NO - - - - 266 - {{17, 97}, {578, 17}} - - YES - - 69206017 - 272629824 - Select the profile you would like to remove: - - - - - - NO - - - - 257 - {{475, 12}, {123, 32}} - - YES - - -2080374784 - 134217728 - Remove - - - -2038284288 - 1 - - - DQ - 200 - 25 - - NO - - - - 257 - {{352, 12}, {123, 32}} - - YES - - 67108864 - 134217728 - Cancel - - - -2038284288 - 1 - - - Gw - 200 - 25 - - NO - - - - 268 - {{17, 64}, {578, 26}} - - _NS:791 - YES - - -2076180416 - 2048 - - _NS:791 - - 109199360 - 129 - - - 400 - 75 - - - Item 1 - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - OtherViews - - YES - - - - Item 2 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - Item 3 - - 1048576 - 2147483647 - - - _popUpItemAction: - - - - - - 1 - YES - YES - 2 - - NO - - - {612, 159} - - - {{0, 0}, {2560, 1418}} - {612, 181} - {612, 181} - YES - @@ -3888,54 +3504,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 417 - - - _addProfile_cancel_btn - - - - 446 - - - - _addProfile_name_fld - - - - 447 - - - - _addProfile_ok_btn - - - - 448 - - - - _addProfile_panel - - - - 449 - - - - _addProfile_subtitle_lbl - - - - 450 - - - - _addProfile_title_lbl - - - - 451 - _customize_newProfile_btn @@ -3944,54 +3512,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 452 - - - _deleteProfile_cancel_btn - - - - 453 - - - - _deleteProfile_ok_btn - - - - 454 - - - - _deleteProfile_panel - - - - 455 - - - - _deleteProfile_pop - - - - 456 - - - - _deleteProfile_subtitle_lbl - - - - 457 - - - - _deleteProfile_title_lbl - - - - 458 - newProfileAction: @@ -4000,45 +3520,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 459 - - - newProfileAction: - - - - 460 - - - - newProfileAction: - - - - 461 - - - - deleteProfileAction: - - - - 462 - - - - deleteProfileAction: - - - - 463 - YES 0 - + + YES + @@ -5734,230 +5224,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA - - 418 - - - YES - - - - New Profile - - - 419 - - - YES - - - - Remove Profile - - - 420 - - - YES - - - - - - - - - - 421 - - - YES - - - - - - 422 - - - YES - - - - - - 423 - - - YES - - - - - - 424 - - - YES - - - - - - 425 - - - YES - - - - - - 426 - - - - - 427 - - - - - 428 - - - - - 429 - - - - - 430 - - - YES - - - - - - 431 - - - YES - - - - - - - - 432 - - - - - 433 - - - - - 434 - - - - - 435 - - - YES - - - - - - - - - - 436 - - - YES - - - - - - 437 - - - YES - - - - - - 438 - - - YES - - - - - - 439 - - - YES - - - - - - 440 - - - YES - - - - - - 441 - - - - - 442 - - - - - 443 - - - - - 444 - - - - - 445 - - - YES YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency @@ -5993,7 +5265,21 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 14.IBPluginDependency 140.IBPluginDependency 141.IBPluginDependency + 142.IBPluginDependency + 143.IBPluginDependency + 144.IBPluginDependency + 145.IBPluginDependency + 146.IBPluginDependency + 147.IBPluginDependency + 148.IBPluginDependency + 149.IBPluginDependency 15.IBPluginDependency + 150.IBPluginDependency + 151.IBPluginDependency + 152.IBPluginDependency + 153.IBPluginDependency + 154.IBPluginDependency + 155.IBPluginDependency 156.IBPluginDependency 156.IBViewBoundsToFrameTransform 157.IBPluginDependency @@ -6001,6 +5287,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 158.IBPluginDependency 159.IBPluginDependency 16.IBPluginDependency + 162.IBPluginDependency + 163.IBPluginDependency + 164.IBPluginDependency + 165.IBPluginDependency 166.IBPluginDependency 166.IBViewBoundsToFrameTransform 167.IBPluginDependency @@ -6059,6 +5349,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 202.IBPluginDependency 202.IBViewBoundsToFrameTransform 205.IBPluginDependency + 206.IBPluginDependency 206.IBViewBoundsToFrameTransform 207.IBPluginDependency 207.IBViewBoundsToFrameTransform @@ -6191,6 +5482,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 332.IBPluginDependency 333.IBPluginDependency 334.IBPluginDependency + 336.IBPluginDependency 336.IBViewBoundsToFrameTransform 337.IBPluginDependency 337.IBViewBoundsToFrameTransform @@ -6248,68 +5540,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 404.IBPluginDependency 404.IBViewBoundsToFrameTransform 405.IBPluginDependency - 418.IBEditorWindowLastContentRect - 418.IBPluginDependency - 418.IBWindowTemplateEditedContentRect - 418.ImportedFromIB2 - 418.windowTemplate.hasMaxSize - 418.windowTemplate.hasMinSize - 418.windowTemplate.maxSize - 418.windowTemplate.minSize - 419.IBEditorWindowLastContentRect - 419.IBPluginDependency - 419.IBWindowTemplateEditedContentRect - 419.ImportedFromIB2 - 419.windowTemplate.hasMaxSize - 419.windowTemplate.hasMinSize - 419.windowTemplate.maxSize - 419.windowTemplate.minSize - 420.IBPluginDependency - 420.ImportedFromIB2 - 421.IBPluginDependency - 421.IBViewBoundsToFrameTransform - 422.IBPluginDependency - 422.IBViewBoundsToFrameTransform - 422.ImportedFromIB2 - 423.IBPluginDependency - 423.IBViewBoundsToFrameTransform - 423.ImportedFromIB2 - 424.IBPluginDependency - 424.IBViewBoundsToFrameTransform - 424.ImportedFromIB2 - 425.IBPluginDependency - 425.IBViewBoundsToFrameTransform - 425.ImportedFromIB2 - 426.IBPluginDependency - 427.IBPluginDependency - 428.IBPluginDependency - 429.IBPluginDependency - 430.IBPluginDependency - 431.IBPluginDependency - 432.IBPluginDependency - 433.IBPluginDependency - 434.IBPluginDependency - 435.IBPluginDependency - 435.ImportedFromIB2 - 436.IBPluginDependency - 436.IBViewBoundsToFrameTransform - 436.ImportedFromIB2 - 437.IBPluginDependency - 437.IBViewBoundsToFrameTransform - 437.ImportedFromIB2 - 438.IBPluginDependency - 438.IBViewBoundsToFrameTransform - 439.IBPluginDependency - 439.IBViewBoundsToFrameTransform - 439.ImportedFromIB2 - 440.IBPluginDependency - 440.IBViewBoundsToFrameTransform - 440.ImportedFromIB2 - 441.IBPluginDependency - 442.IBPluginDependency - 443.IBPluginDependency - 444.IBPluginDependency - 445.IBPluginDependency 47.IBPluginDependency 47.IBViewBoundsToFrameTransform 48.IBPluginDependency @@ -6328,15 +5558,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA 7.CustomClassName 7.IBPluginDependency 7.IBViewBoundsToFrameTransform - 79.IBPluginDependency 8.IBPluginDependency 9.IBPluginDependency YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin {{329, 74}, {663, 490}} com.apple.InterfaceBuilder.CocoaPlugin {{329, 74}, {663, 490}} @@ -6383,6 +5610,20 @@ 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 P4AAAL+AAABEFYAAwkQAAA @@ -6394,6 +5635,10 @@ 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 P4AAAL+AAABBYAAAw4kAAA @@ -6485,6 +5730,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA P4AAAL+AAABDdwAAwowAAA com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin AUJsAABBcAAAA @@ -6687,6 +5933,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin AT+AAABDPQAAA @@ -6780,88 +6027,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA P4AAAL+AAABBgAAAwkAAAA com.apple.InterfaceBuilder.CocoaPlugin - {{340, 909}, {612, 159}} - com.apple.InterfaceBuilder.CocoaPlugin - {{340, 909}, {612, 159}} - - - - {612, 159} - {0, 0} - {{340, 694}, {612, 159}} - com.apple.InterfaceBuilder.CocoaPlugin - {{340, 694}, {612, 159}} - - - - {612, 159} - {612, 159} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABBsAAAwmwAAA - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCsgAAw5aAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCsgAAw4oAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABD7YAAw2EAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABDsAAAw2EAAA - - - 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 - - P4AAAL+AAABDsAAAw2EAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABD7YAAw2EAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABC3AAAwz8AAA - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCsgAAw4oAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCsgAAw5aAAA - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin P4AAAL+AAABD3QAAwsoAAA @@ -6894,7 +6059,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -6945,7 +6109,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA closeCustomizationSheet: closeStreamPanel: customizeProfile: - deleteProfileAction: finalizePanel: iWantAFile: iWantAStream: @@ -6972,7 +6135,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id - id @@ -6984,7 +6146,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA closeCustomizationSheet: closeStreamPanel: customizeProfile: - deleteProfileAction: finalizePanel: iWantAFile: iWantAStream: @@ -7017,10 +6178,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA customizeProfile: id - - deleteProfileAction: - id - finalizePanel: id @@ -7063,12 +6220,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES YES - _addProfile_cancel_btn - _addProfile_name_fld - _addProfile_ok_btn - _addProfile_panel - _addProfile_subtitle_lbl - _addProfile_title_lbl _customize_aud_bitrate_fld _customize_aud_bitrate_lbl _customize_aud_channels_fld @@ -7104,12 +6255,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _customize_vid_scale_pop _customize_vid_width_fld _customize_vid_width_lbl - _deleteProfile_cancel_btn - _deleteProfile_ok_btn - _deleteProfile_panel - _deleteProfile_pop - _deleteProfile_subtitle_lbl - _deleteProfile_title_lbl _destination_box _destination_browse_btn _destination_cancel_btn @@ -7236,30 +6381,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA id id id - id - id - id - id - id - id - id - id - id - id - id - id YES YES - _addProfile_cancel_btn - _addProfile_name_fld - _addProfile_ok_btn - _addProfile_panel - _addProfile_subtitle_lbl - _addProfile_title_lbl _customize_aud_bitrate_fld _customize_aud_bitrate_lbl _customize_aud_channels_fld @@ -7295,12 +6422,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _customize_vid_scale_pop _customize_vid_width_fld _customize_vid_width_lbl - _deleteProfile_cancel_btn - _deleteProfile_ok_btn - _deleteProfile_panel - _deleteProfile_pop - _deleteProfile_subtitle_lbl - _deleteProfile_title_lbl _destination_box _destination_browse_btn _destination_cancel_btn @@ -7348,30 +6469,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA YES - - _addProfile_cancel_btn - id - - - _addProfile_name_fld - id - - - _addProfile_ok_btn - id - - - _addProfile_panel - id - - - _addProfile_subtitle_lbl - id - - - _addProfile_title_lbl - id - _customize_aud_bitrate_fld id @@ -7512,30 +6609,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA _customize_vid_width_lbl id - - _deleteProfile_cancel_btn - id - - - _deleteProfile_ok_btn - id - - - _deleteProfile_panel - id - - - _deleteProfile_pop - id - - - _deleteProfile_subtitle_lbl - id - - - _deleteProfile_title_lbl - id - _destination_box id diff --git a/modules/gui/macosx/ConvertAndSave.h b/modules/gui/macosx/ConvertAndSave.h index a1c18c1604..6351bb6578 100644 --- a/modules/gui/macosx/ConvertAndSave.h +++ b/modules/gui/macosx/ConvertAndSave.h @@ -22,6 +22,7 @@ *****************************************************************************/ #import +#import "SharedDialogs.h" @interface VLCConvertAndSave : NSObject { @@ -91,20 +92,6 @@ IBOutlet id _customize_subs_pop; IBOutlet id _customize_subs_overlay_ckb; - IBOutlet id _addProfile_panel; - IBOutlet id _addProfile_title_lbl; - IBOutlet id _addProfile_subtitle_lbl; - IBOutlet id _addProfile_name_fld; - IBOutlet id _addProfile_cancel_btn; - IBOutlet id _addProfile_ok_btn; - - IBOutlet id _deleteProfile_panel; - IBOutlet id _deleteProfile_title_lbl; - IBOutlet id _deleteProfile_subtitle_lbl; - IBOutlet id _deleteProfile_pop; - IBOutlet id _deleteProfile_cancel_btn; - IBOutlet id _deleteProfile_ok_btn; - IBOutlet id _stream_panel; IBOutlet id _stream_ok_btn; IBOutlet id _stream_destination_lbl; @@ -152,7 +139,6 @@ - (IBAction)customizeProfile:(id)sender; - (IBAction)closeCustomizationSheet:(id)sender; - (IBAction)newProfileAction:(id)sender; -- (IBAction)deleteProfileAction:(id)sender; - (IBAction)iWantAFile:(id)sender; - (IBAction)iWantAStream:(id)sender; - (IBAction)cancelDestination:(id)sender; @@ -162,6 +148,9 @@ - (IBAction)streamTypeToggle:(id)sender; - (IBAction)streamAnnouncementToggle:(id)sender; +- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text; +- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item; + - (void)updateDropView; @end diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m index 10201a1f08..d367d4997e 100644 --- a/modules/gui/macosx/ConvertAndSave.m +++ b/modules/gui/macosx/ConvertAndSave.m @@ -185,14 +185,6 @@ static VLCConvertAndSave *_o_sharedInstance = nil; [_customize_aud_samplerate_lbl setStringValue: _NS("Sample Rate")]; [_customize_subs_ckb setTitle: _NS("Subtitles")]; [_customize_subs_overlay_ckb setTitle: _NS("Overlay subtitles on the video")]; - [_addProfile_title_lbl setStringValue:_NS("Save as new profile")]; - [_addProfile_subtitle_lbl setStringValue:_NS("Enter a name for the new profile:")]; - [_addProfile_cancel_btn setTitle:_NS("Cancel")]; - [_addProfile_ok_btn setTitle:_NS("Save")]; - [_deleteProfile_title_lbl setStringValue:_NS("Remove a profile")]; - [_deleteProfile_subtitle_lbl setStringValue:_NS("Select the profile you would like to remove:")]; - [_deleteProfile_cancel_btn setTitle:_NS("Cancel")]; - [_deleteProfile_ok_btn setTitle:_NS("Remove")]; [_stream_ok_btn setTitle:_NS("Close")]; [_stream_destination_lbl setStringValue:_NS("Stream Destination")]; [_stream_announcement_lbl setStringValue:_NS("Stream Announcement")]; @@ -348,77 +340,29 @@ static VLCConvertAndSave *_o_sharedInstance = nil; - (IBAction)newProfileAction:(id)sender { - if (sender == _customize_newProfile_btn) { - [_addProfile_name_fld setStringValue:@""]; - [NSApp beginSheet:_addProfile_panel modalForWindow:_customize_panel modalDelegate:self didEndSelector:NULL contextInfo:nil]; - } else { - [_addProfile_panel orderOut:sender]; - [NSApp endSheet: _addProfile_panel]; + /* show panel */ + VLCEnterTextPanel * panel = [VLCEnterTextPanel sharedInstance]; + [panel setTitle: _NS("Save as new profile")]; + [panel setSubTitle: _NS("Enter a name for the new profile:")]; + [panel setCancelButtonLabel: _NS("Cancel")]; + [panel setOKButtonLabel: _NS("Save")]; + [panel setTarget:self]; - if (sender == _addProfile_ok_btn && [[_addProfile_name_fld stringValue] length] > 0) { - /* prepare current data */ - [self updateCurrentProfile]; - - /* add profile to arrays */ - NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; - [workArray addObject:[_addProfile_name_fld stringValue]]; - [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; - [workArray release]; - workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; - [workArray addObject:[[[NSArray alloc] initWithArray:self.currentProfile] autorelease]]; - [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; - [workArray release]; - - /* update UI */ - [self recreateProfilePopup]; - [_profile_pop selectItemWithTitle:[_addProfile_name_fld stringValue]]; - - /* update internals */ - [self switchProfile:sender]; - [self storeProfilesOnDisk]; - } - } + [panel runModalForWindow:_customize_panel]; } - (IBAction)deleteProfileAction:(id)sender { - if (sender == _deleteProfile_cancel_btn) { - /* close panel */ - [_deleteProfile_panel orderOut:sender]; - [NSApp endSheet: _deleteProfile_panel]; - } else if (sender == _deleteProfile_ok_btn) { - /* close panel */ - [_deleteProfile_panel orderOut:sender]; - [NSApp endSheet: _deleteProfile_panel]; + /* show panel */ + VLCSelectItemInPopupPanel * panel = [VLCSelectItemInPopupPanel sharedInstance]; + [panel setTitle:_NS("Remove a profile")]; + [panel setSubTitle:_NS("Select the profile you would like to remove:")]; + [panel setOKButtonLabel:_NS("Remove")]; + [panel setCancelButtonLabel:_NS("Cancel")]; + [panel setPopupButtonContent:self.profileNames]; + [panel setTarget:self]; - /* remove requested profile from the arrays */ - NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; - [workArray removeObjectAtIndex:[_deleteProfile_pop indexOfSelectedItem]]; - [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; - [workArray release]; - workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; - [workArray removeObjectAtIndex:[_deleteProfile_pop indexOfSelectedItem]]; - [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; - [workArray release]; - - /* update UI */ - [_profile_pop removeAllItems]; - [_profile_pop addItemsWithTitles:self.profileNames]; - [_profile_pop addItemWithTitle:_NS("Custom")]; - [[_profile_pop menu] addItem:[NSMenuItem separatorItem]]; - [_profile_pop addItemWithTitle:_NS("Organize Profiles")]; - [[_profile_pop lastItem] setTarget: self]; - [[_profile_pop lastItem] setAction: @selector(deleteProfileAction:)]; - - /* update internals */ - [self switchProfile:sender]; - [self storeProfilesOnDisk]; - } else { - /* show panel */ - [_deleteProfile_pop removeAllItems]; - [_deleteProfile_pop addItemsWithTitles:self.profileNames]; - [NSApp beginSheet:_deleteProfile_panel modalForWindow:_window modalDelegate:self didEndSelector:NULL contextInfo:nil]; - } + [panel runModalForWindow:_window]; } - (IBAction)iWantAFile:(id)sender @@ -617,6 +561,62 @@ static VLCConvertAndSave *_o_sharedInstance = nil; return NO; } +- (void)panel:(VLCEnterTextPanel *)panel returnValue:(NSUInteger)value text:(NSString *)text +{ + if (value == NSOKButton) { + if ([text length] > 0) { + /* prepare current data */ + [self updateCurrentProfile]; + + /* add profile to arrays */ + NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; + [workArray addObject:text]; + [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; + [workArray addObject:[[[NSArray alloc] initWithArray:self.currentProfile] autorelease]]; + [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + + /* update UI */ + [self recreateProfilePopup]; + [_profile_pop selectItemWithTitle:text]; + + /* update internals */ + [self switchProfile:self]; + [self storeProfilesOnDisk]; + } + } +} + +- (void)panel:(VLCSelectItemInPopupPanel *)panel returnValue:(NSUInteger)value item:(NSUInteger)item +{ + if (value == NSOKButton) { + /* remove requested profile from the arrays */ + NSMutableArray * workArray = [[NSMutableArray alloc] initWithArray:self.profileNames]; + [workArray removeObjectAtIndex:item]; + [self setProfileNames:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + workArray = [[NSMutableArray alloc] initWithArray:self.profileValueList]; + [workArray removeObjectAtIndex:item]; + [self setProfileValueList:[[[NSArray alloc] initWithArray:workArray] autorelease]]; + [workArray release]; + + /* update UI */ + [_profile_pop removeAllItems]; + [_profile_pop addItemsWithTitles:self.profileNames]; + [_profile_pop addItemWithTitle:_NS("Custom")]; + [[_profile_pop menu] addItem:[NSMenuItem separatorItem]]; + [_profile_pop addItemWithTitle:_NS("Organize Profiles...")]; + [[_profile_pop lastItem] setTarget: self]; + [[_profile_pop lastItem] setAction: @selector(deleteProfileAction:)]; + + /* update internals */ + [self switchProfile:self]; + [self storeProfilesOnDisk]; + } +} + # pragma mark - # pragma mark Private Functionality - (void)updateDropView