From 61ee3250a66a273d3bf7b7594b5b8656993bc33f Mon Sep 17 00:00:00 2001 From: dynaflash Date: Sat, 13 Jun 2009 19:50:12 +0000 Subject: MacGui: Multiple subtitle tracks initial implementation - Subtitles now get their own tab - "None" track is an empty track, add a new subtitle track by switching it to a valid source track. - First track allows for "Foreign Language Search" which replaces the old "Auto Select". - Remove a previously selected track by setting it back to "None" - Sanity Checks: -- Allow only one Burned In track. -- Text tracks do not allow burned in to be set. -- MP4 specific: --- Allow only one VobSub and force burned in to be set. ---- Trying to set more than one vobsub in mp4 results in a warning, and the first vobsub track is retained. - Presets: Currently subtitles are not recorded into presets (which they never have been). - Live Preview: -- Foreign Language Search is borked for live preview, so is ignored -- Burned in subtitles work for both mp4 and mkv -- Text subtitles work for mp4 if set to default (preview has no way to turn soft subs on/off) -- Text subtitles do not show up in preview window even if checked as default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2530 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/English.lproj/MainMenu.xib | 893 +++++++++++++++++++++++--------------- 1 file changed, 531 insertions(+), 362 deletions(-) (limited to 'macosx/English.lproj') diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index be20ff85f..542f3453f 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -2,14 +2,13 @@ 1050 - 9G55 + 9J61 677 - 949.43 + 949.46 353.00 YES - - + YES @@ -109,7 +108,7 @@ 1 - + 256 YES @@ -550,7 +549,6 @@ {{10, 25}, {714, 305}} - Video @@ -673,7 +671,6 @@ 256 {{578, 221}, {66, 22}} - YES -2076049856 @@ -717,72 +714,6 @@ 1 - - - 256 - {{-10, 48}, {70, 14}} - - - YES - - 67239424 - 71303168 - Subtitles: - - - - - - - - - 256 - {{65, 42}, {157, 22}} - - - YES - - -2076049856 - 132096 - - - 109199615 - 1 - - - - - - 400 - 75 - - - - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - - OtherViews - - - YES - - - - 3 - YES - YES - 1 - - 256 @@ -899,27 +830,6 @@ 1 - - - 256 - {{229, 46}, {147, 17}} - - YES - - 67239424 - 131072 - Forced Subtitles Only - - - 1211912703 - 2 - - - - 200 - 25 - - 268 @@ -930,7 +840,7 @@ 67239488 272761856 Audio Tracks - + LucidaGrande-Bold 1.100000e+01 16 @@ -979,44 +889,6 @@ - - - 268 - {{86, 84}, {624, 5}} - - {0, 0} - - 67239424 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxAA - - - 3 - 2 - 0 - NO - - - - 268 - {{17, 79}, {54, 14}} - - YES - - 67239488 - 272761856 - Subtitles - - - - - - 256 @@ -2045,12 +1917,351 @@ {{10, 25}, {714, 305}} - QXVkaW8gJiBTdWJ0aXRsZXM + Audio - + 3 + + + 256 + + YES + + + 268 + + YES + + + 2304 + + YES + + + 256 + {700, 265} + + YES + + + 256 + {700, 17} + + + + + + -2147483392 + {{-26, 0}, {16, 17}} + + + + YES + + track + 3.140000e+02 + 4.000000e+01 + 1.000000e+03 + + 75628032 + 0 + Track + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + + + + -2076049856 + 264192 + + + 100679935 + 129 + + + 400 + 75 + + + Pop Up + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + YES + YES + 2 + + 3 + YES + + + + forced + 1.390000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 134217728 + Forced Only + + + 6 + System + headerColor + + + + + + 67239424 + 131072 + Check + + + 1215582719 + 130 + + + + + 200 + 25 + + 3 + YES + YES + + + + burned + 1.210000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 134217728 + Burned In + + + + + + 67239424 + 131072 + Check + + + 1215582719 + 130 + + + + + 200 + 25 + + 3 + YES + YES + + + + default + 1.140000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 134217728 + Default + + + + + + 67239424 + 131072 + Check + + + 1215582719 + 130 + + + + + 200 + 25 + + 3 + YES + YES + + + + 3.000000e+00 + 2.000000e+00 + + 1 + MC45MDE5NjA3OSAwLjkwMTk2MDc5IDAuOTAxOTYwNzkAA + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.700000e+01 + 1111490560 + 4 + 15 + 0 + NO + + + {{0, 17}, {700, 265}} + + + + + 6 + System + controlBackgroundColor + + + 4 + + + + -2147483392 + {{-100, -100}, {15, 206}} + + + _doScroller: + 3.700000e+01 + 1.947368e-01 + + + + 256 + {{-100, -100}, {685, 15}} + + 1 + + _doScroller: + 5.714286e-01 + + + + 2304 + + YES + + + {700, 17} + + + + + 4 + + + + {{9, 7}, {700, 282}} + + + 512 + + + + + + QSAAAEEgAABBmAAAQZgAAA + + + {{10, 25}, {714, 305}} + + + Subtitles + + + + + 5 + + + 256 + + YES + + + 256 + + YES + + + 256 + {700, 290} + + + + {{7, 8}, {700, 290}} + + {0, 0} + + 67239424 + 0 + Box + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 0 + 3 + 0 + NO + + + {{10, 25}, {714, 305}} + + Advanced + + + + + 4 256 @@ -2104,12 +2315,7 @@ 3 MC4zMzMzMzI5OQA - - 6 - System - headerTextColor - - + 337772096 @@ -2117,12 +2323,7 @@ Text Cell - - 6 - System - controlBackgroundColor - - + 3 @@ -2160,15 +2361,7 @@ 3.000000e+00 2.000000e+00 - - 6 - System - gridColor - - 3 - MC41AA - - + 1.700000e+01 -700448768 4 @@ -2262,61 +2455,15 @@ - - 4 - - - 256 - - YES - - - 256 - - YES - - - 256 - {700, 290} - - - - {{7, 8}, {700, 290}} - - {0, 0} - - 67239424 - 0 - Box - - - - 3 - MCAwLjgwMDAwMDAxAA - - - - 0 - 3 - 0 - NO - - - {{10, 25}, {714, 305}} - - Advanced - - - - + 134217728 YES YES YES - + @@ -4953,22 +5100,6 @@ 1620 - - - fSubPopUp - - - - 1637 - - - - fSubField - - - - 1758 - performFindPanelAction: @@ -5409,22 +5540,6 @@ 2496 - - - fSubForcedCheck - - - - 2505 - - - - subtitleSelectionChanged: - - - - 2506 - performClose: @@ -6193,6 +6308,14 @@ 5193 + + + fSubtitlesTable + + + + 5214 + @@ -6293,8 +6416,9 @@ YES - + + @@ -6317,17 +6441,12 @@ - - - - - @@ -6432,24 +6551,6 @@ - - 1634 - - - YES - - - - - - 1638 - - - YES - - - - 1962 @@ -6486,15 +6587,6 @@ - - 2504 - - - YES - - - - 3075 @@ -6509,20 +6601,6 @@ - - 3081 - - - - - 3082 - - - YES - - - - 1477 @@ -7939,20 +8017,6 @@ - - 4855 - - - YES - - - - - - 4856 - - - 4857 @@ -7981,21 +8045,11 @@ - - 4861 - - - 4862 - - 4864 - - - 4872 @@ -8385,20 +8439,6 @@ - - 1635 - - - YES - - - - - - 1636 - - - 1963 @@ -9377,6 +9417,137 @@ + + 5194 + + + YES + + + + + + 5195 + + + YES + + + + + + 5196 + + + YES + + + + + + + + + 5197 + + + + + 5198 + + + + + 5199 + + + YES + + + + + + + + + 5201 + + + YES + + + + + + 5215 + + + YES + + + + + + 5217 + + + YES + + + + + + 5219 + + + YES + + + + + + 5225 + + + YES + + + + + + 5226 + + + YES + + + + + + 5227 + + + + + 5232 + + + + + 5233 + + + + + 5234 + + + + + 5244 + + + @@ -9556,14 +9727,6 @@ 1628.ImportedFromIB2 1629.IBPluginDependency 1629.ImportedFromIB2 - 1634.IBPluginDependency - 1634.ImportedFromIB2 - 1635.IBPluginDependency - 1635.ImportedFromIB2 - 1636.IBPluginDependency - 1636.ImportedFromIB2 - 1638.IBPluginDependency - 1638.ImportedFromIB2 1795.IBPluginDependency 1795.ImportedFromIB2 1796.IBPluginDependency @@ -9749,8 +9912,6 @@ 2488.ImportedFromIB2 2494.IBPluginDependency 2494.ImportedFromIB2 - 2504.IBPluginDependency - 2504.ImportedFromIB2 2507.IBPluginDependency 2507.ImportedFromIB2 2508.IBPluginDependency @@ -9817,10 +9978,6 @@ 3075.ImportedFromIB2 3077.IBPluginDependency 3077.ImportedFromIB2 - 3081.IBPluginDependency - 3081.ImportedFromIB2 - 3082.IBPluginDependency - 3082.ImportedFromIB2 3203.IBPluginDependency 3203.ImportedFromIB2 3205.IBPluginDependency @@ -9865,15 +10022,11 @@ 4852.IBPluginDependency 4853.IBPluginDependency 4854.IBPluginDependency - 4855.IBPluginDependency - 4856.IBPluginDependency 4857.IBPluginDependency 4858.IBPluginDependency 4859.IBPluginDependency 4860.IBPluginDependency - 4861.IBPluginDependency 4862.IBPluginDependency - 4864.IBPluginDependency 4872.IBPluginDependency 4873.IBPluginDependency 4874.IBPluginDependency @@ -10125,6 +10278,23 @@ 5185.IBPluginDependency 5188.IBPluginDependency 5192.IBPluginDependency + 5194.IBPluginDependency + 5195.IBPluginDependency + 5196.IBPluginDependency + 5197.IBPluginDependency + 5198.IBPluginDependency + 5199.IBPluginDependency + 5201.IBPluginDependency + 5215.IBPluginDependency + 5217.IBPluginDependency + 5219.IBPluginDependency + 5225.IBPluginDependency + 5226.IBEditorWindowLastContentRect + 5226.IBPluginDependency + 5227.IBPluginDependency + 5232.IBPluginDependency + 5233.IBPluginDependency + 5234.IBPluginDependency 56.IBPluginDependency 56.ImportedFromIB2 57.IBPluginDependency @@ -10379,14 +10549,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{454, 306}, {270, 550}} com.apple.InterfaceBuilder.CocoaPlugin @@ -10480,9 +10642,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{248, 306}, {760, 550}} + {{59, 306}, {760, 550}} - {{248, 306}, {760, 550}} + {{59, 306}, {760, 550}} {{65, 541}, {760, 550}} @@ -10541,8 +10703,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{72, 851}, {392, 144}} {{72, 851}, {392, 144}} @@ -10595,10 +10755,6 @@ com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - HBPresetsOutlineView com.apple.InterfaceBuilder.CocoaPlugin @@ -10709,10 +10865,6 @@ 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 @@ -10912,6 +11064,23 @@ 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 + {{154, 542}, {700, 18}} + 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 @@ -10946,7 +11115,7 @@ - 5193 + 5244 @@ -11005,7 +11174,6 @@ showPreviewWindow: showQueueWindow: showSourceTitleScanPanel: - subtitleSelectionChanged: titlePopUpChanged: twoPassCheckboxChanged: videoEncoderPopUpChanged: @@ -11066,7 +11234,6 @@ id id id - id @@ -11160,6 +11327,7 @@ fSubField fSubForcedCheck fSubPopUp + fSubtitlesTable fVidBitrateCell fVidBitrateField fVidConstantCell @@ -11268,6 +11436,7 @@ NSTextField NSButton NSPopUpButton + NSTableView NSButtonCell NSTextField NSButtonCell -- cgit v1.2.3