WinGui: Initial support for SSA file import.

diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
index d7cc5090afb25ca9cd1b78c2267d2debcecc1dae..5bf710caaab2d7270b4eb5c5a634fc865ffd6d01 100644 (file)
--- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
+++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj
@@ -105,7 +105,7 @@
     <Compile Include="Interop\Json\Encode\Range.cs" />
     <Compile Include="Interop\Json\Encode\SubtitleSearch.cs" />
     <Compile Include="Interop\Json\Encode\Source.cs" />
-    <Compile Include="Interop\Json\Encode\SRT.cs" />
+    <Compile Include="Interop\Json\Encode\SubImport.cs" />
     <Compile Include="Interop\Json\Encode\Subtitles.cs" />
     <Compile Include="Interop\Json\Encode\SubtitleTrack.cs" />
     <Compile Include="Interop\Json\Encode\Video.cs" />

diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/SRT.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubImport.cs
similarity index 93%
rename from win/CS/HandBrake.Interop/Interop/Json/Encode/SRT.cs
rename to win/CS/HandBrake.Interop/Interop/Json/Encode/SubImport.cs
index 96f42a52fab5ae9b20b93a1ccfebdad9023d7997..8399daa69d3dc7e51009e851d219718defa22bc1 100644 (file)
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/SRT.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubImport.cs
@@ -12,7 +12,7 @@ namespace HandBrake.Interop.Interop.Json.Encode
     /// <summary>
     /// The srt.
     /// </summary>
-    public class SRT
+    public class SubImport
     {
         /// <summary>
         /// Gets or sets the codeset.
@@ -28,5 +28,7 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// Gets or sets the language.
         /// </summary>
         public string Language { get; set; }
+
+        public string Format { get; set; }
     }
 }
\ No newline at end of file

diff --git a/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs
index ab51a1db96a2b6f1db7eb7d82e16850d489de847..9c4456e9bfeda903508365f39089389d4d65f660 100644 (file)
--- a/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs
+++ b/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs
@@ -47,6 +47,6 @@ namespace HandBrake.Interop.Interop.Json.Encode
         /// <summary>
         /// Gets or sets the srt.
         /// </summary>
-        public SRT SRT { get; set; }
+        public SubImport Import { get; set; }
     }
 }
\ No newline at end of file

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
index f63893372db36e6cd08b3b92a90b11107ff8f546..df97f4a66f24d50eaa61ec3c04a9fc07fbb4c9d8 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs
@@ -4660,11 +4660,11 @@ namespace HandBrakeWPF.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Import SRT.
+        ///   Looks up a localized string similar to Import Subtitle.
         /// </summary>
-        public static string SubtitlesView_ImportSRT {
+        public static string SubtitlesView_ImportSubtitle {
             get {
-                return ResourceManager.GetString("SubtitlesView_ImportSRT", resourceCulture);
+                return ResourceManager.GetString("SubtitlesView_ImportSubtitle", resourceCulture);
             }
         }
         

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.de.resx b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
index ae572bb56c6903aa052c71c68bd850c31d873f9a..de7a2208594f415110543e8eaf5dffdb86cd92a0 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.de.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.de.resx
@@ -1641,8 +1641,8 @@ Dies beeinflusst nicht die momentanen Einstellungen im Untertitel-Tab. </value>
   <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
     <value>Einbrennverhalten:</value>
   </data>
-  <data name="SubtitlesView_ImportSRT" xml:space="preserve">
-    <value>SRT importieren</value>
+  <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+    <value>SRT / SSA importieren</value>
   </data>
   <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
     <value>Spurverhalten:</value>

diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx
index f611f00205853f0249920ac8097a124c83098c76..baf8533d928c18fe8c8ffa73cd953cee583296d6 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/Resources.resx
+++ b/win/CS/HandBrakeWPF/Properties/Resources.resx
@@ -1642,8 +1642,8 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">\r
     <value>Burn-In Behaviour:</value>\r
   </data>\r
-  <data name="SubtitlesView_ImportSRT" xml:space="preserve">\r
-    <value>Import SRT</value>\r
+  <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">\r
+    <value>Import Subtitle</value>\r
   </data>\r
   <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">\r
     <value>Track Selection Behaviour:</value>\r

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
index 46ff1e97a0ff7640bf115bb2f6e737fd6abd7136..3c6e4d35c9ee3f420d1a7b76f164c7570ee16781 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs
@@ -234,9 +234,10 @@ namespace HandBrakeWPF.Services.Encode.Factories
                         Default = item.Default,
                         Offset = item.SrtOffset,
                         Burn = item.Burned,
-                        SRT =
-                            new SRT
+                        Import =
+                            new SubImport
                             {
+                                Format = item.SrtPath.EndsWith("srt") ? "SRT" : "SSA",
                                 Filename = item.SrtPath,
                                 Codeset = item.SrtCharCode,
                                 Language = item.SrtLangCode

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskImportFactory.cs b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskImportFactory.cs
index ea19c367ec7593c72b8d4de06a8697794fb3be5f..3daf6b353e644640411bea4cdb7b6ac402f85153 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskImportFactory.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskImportFactory.cs
@@ -260,12 +260,12 @@ namespace HandBrakeWPF.Services.Encode.Factories
                 subtitleTrack.Default = subtitle.Default;
                 subtitleTrack.Forced = subtitle.Forced;
 
-                if (!string.IsNullOrEmpty(subtitle.SRT.Filename))
+                if (!string.IsNullOrEmpty(subtitle.Import.Filename))
                 {
-                    subtitleTrack.SubtitleType = SubtitleType.SRT;
-                    subtitleTrack.SrtCharCode = subtitle.SRT.Codeset;
-                    subtitleTrack.SrtFileName = subtitle.SRT.Filename;
-                    subtitleTrack.SrtLangCode = subtitle.SRT.Language;
+                    subtitleTrack.SubtitleType =  subtitle.Import.Filename.EndsWith("srt") ?  SubtitleType.SRT : SubtitleType.SSA;
+                    subtitleTrack.SrtCharCode = subtitle.Import.Codeset;
+                    subtitleTrack.SrtFileName = subtitle.Import.Filename;
+                    subtitleTrack.SrtLangCode = subtitle.Import.Language;
                     subtitleTrack.SrtLang = HandBrakeLanguagesHelper.Get(subtitleTrack.SrtLangCode).EnglishName;
                     subtitleTrack.SrtOffset = subtitleTrack.SrtOffset;
                 }

diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
index a847bc0607ab51ef5aff9da166c59ef208c03d0d..e164f11922de5ccf880396650df9f4bcd50afc0a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs
@@ -238,11 +238,11 @@ namespace HandBrakeWPF.ViewModels
         public void Import()\r
         {\r
             OpenFileDialog dialog = new OpenFileDialog\r
-                {\r
-                    Filter = "SRT files (*.srt)|*.srt",\r
-                    CheckFileExists = true,\r
-                    Multiselect = true\r
-                };\r
+            {\r
+                Filter = "Subtitle files (*.srt, *.ssa)|*.srt;*.ssa",\r
+                CheckFileExists = true,\r
+                Multiselect = true\r
+            };\r
 \r
             if (this.Task != null && this.Task.Source != null)\r
             {\r

diff --git a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
index 9bec61cc48715bb0b0ccc6d37dc688c0c0beb80c..01195259a679d733be7c9aba008ac99ede16be44 100644 (file)
--- a/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
+++ b/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml
@@ -84,7 +84,7 @@
 \r
             <Button MinWidth="75" Grid.Column="1"\r
                     cal:Message.Attach="[Event Click] = [Action Import]"\r
-                    Content="{x:Static Properties:Resources.SubtitlesView_ImportSRT}"\r
+                    Content="{x:Static Properties:Resources.SubtitlesView_ImportSubtitle}"\r
                     Margin="0,0,10,0"/>\r
             <Button MinWidth="65" Grid.Column="2"\r
                     Margin="0,0,10,0"\r