From 8bb7d25bba2dc06e8541f07583897c4030a1bc3c Mon Sep 17 00:00:00 2001 From: dynaflash Date: Thu, 16 Jul 2009 18:36:08 +0000 Subject: MacGui: srt subtitle support initial implementation - Allows adding an external srt sub file as a subtitle source. -- Adds fields for srt language, char code and offset in ms. - Known issues: adding the srt file to the sources list also adds a new subtitle track for that source, however to "set" it you have to click on it. - srt subtitles do not seem to work in preview even if set to default. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2699 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/English.lproj/MainMenu.xib | 323 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 307 insertions(+), 16 deletions(-) (limited to 'macosx/English.lproj') diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 48d64461b..8c5b68454 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -8,8 +8,7 @@ 353.00 YES - - + YES @@ -1942,7 +1941,7 @@ 256 - {700, 265} + {700, 252} YES @@ -1962,7 +1961,7 @@ YES track - 3.140000e+02 + 1.670000e+02 4.000000e+01 1.000000e+03 @@ -2022,7 +2021,7 @@ forced - 1.390000e+02 + 7.500000e+01 1.000000e+01 3.402823e+38 @@ -2060,7 +2059,7 @@ burned - 1.210000e+02 + 6.500000e+01 1.000000e+01 3.402823e+38 @@ -2093,7 +2092,7 @@ default - 1.140000e+02 + 6.800000e+01 1.000000e+01 3.402823e+38 @@ -2124,6 +2123,141 @@ YES + + srt_lang + 1.120000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 0 + Srt Language + + + + + + -2076049856 + 133120 + + + 100679935 + 129 + + + 400 + 75 + + + Pop Up + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + 3 + YES + YES + 1 + + 3 + YES + YES + + + + srt_charcode + 1.230000e+02 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 0 + Srt Char Code + + + + + + -2076049856 + 133120 + + + 100679935 + 129 + + + 400 + 75 + + + Pop Up + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + 3 + YES + YES + 1 + + 3 + YES + YES + + + + srt_offset + 6.900000e+01 + 1.000000e+01 + 3.402823e+38 + + 75628032 + 0 + Srt Offset + + + + + + 337772096 + 272630784 + Text + + + + + + 3 + YES + YES + + 3.000000e+00 2.000000e+00 @@ -2148,9 +2282,8 @@ NO - {{0, 17}, {700, 265}} + {{0, 17}, {700, 252}} - 6 @@ -2189,16 +2322,14 @@ {700, 17} - 4 - {{9, 7}, {700, 282}} + {{9, 7}, {700, 269}} - 512 @@ -2207,6 +2338,26 @@ QSAAAEEgAABBmAAAQZgAAA + + + 268 + {{16, 283}, {116, 16}} + + YES + + 67239424 + 134479872 + Add External SRT ... + + + -2038284033 + 129 + + + 200 + 25 + + {{10, 25}, {714, 305}} @@ -2746,7 +2897,7 @@ 264 - {{27, 440}, {47, 14}} + {{27, 437}, {47, 17}} YES @@ -6317,6 +6468,22 @@ 5245 + + + fBrowseSrtFileButton + + + + 5248 + + + + browseImportSrtFile: + + + + 5249 + @@ -9433,6 +9600,7 @@ YES + @@ -9467,6 +9635,9 @@ + + + @@ -9549,6 +9720,98 @@ + + 5246 + + + YES + + + + + + 5247 + + + + + 5250 + + + YES + + + + + + 5252 + + + YES + + + + + + 5254 + + + YES + + + + + + 5268 + + + YES + + + + + + 5269 + + + YES + + + + + + 5270 + + + + + 5271 + + + YES + + + + + + 5272 + + + YES + + + + + + 5273 + + + + + 5278 + + + @@ -10297,6 +10560,18 @@ 5233.IBPluginDependency 5234.IBPluginDependency 5244.IBPluginDependency + 5246.IBPluginDependency + 5247.IBPluginDependency + 5250.IBPluginDependency + 5252.IBPluginDependency + 5254.IBPluginDependency + 5268.IBPluginDependency + 5269.IBPluginDependency + 5270.IBPluginDependency + 5271.IBPluginDependency + 5272.IBPluginDependency + 5273.IBPluginDependency + 5278.IBPluginDependency 56.IBPluginDependency 56.ImportedFromIB2 57.IBEditorWindowLastContentRect @@ -10645,9 +10920,9 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{59, 306}, {760, 550}} + {{210, 306}, {760, 550}} - {{59, 306}, {760, 550}} + {{210, 306}, {760, 550}} {{65, 541}, {760, 550}} @@ -11085,6 +11360,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 + 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 {{13, 672}, {235, 153}} com.apple.InterfaceBuilder.CocoaPlugin @@ -11120,7 +11407,7 @@ - 5245 + 5278 @@ -11149,6 +11436,7 @@ browseExportPresetFile: browseFile: browseImportPresetFile: + browseImportSrtFile: browseSources: calculateBitrate: calculatePictureSizing: @@ -11241,6 +11529,7 @@ id id id + id @@ -11287,6 +11576,7 @@ fAudTrack4Label fAudTrack4MixPopUp fAudTrack4RatePopUp + fBrowseSrtFileButton fChapterTable fCreateChapterMarkers fDstBrowseButton @@ -11396,6 +11686,7 @@ NSTextField NSPopUpButton NSPopUpButton + NSButton NSTableView NSButton NSButton -- cgit v1.2.3