WinGui:

- Fixed --srt-default and Subtitle default selection checkbox.
It's now possible to select a default srt and default subtitle track.

git-svn-id: svn://localhost/HandBrake/trunk@2931 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index f8c38cd..80c7edb 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -43,6 +43,14 @@ namespace Handbrake.Controls
                 srtLangVal = srt_lang.SelectedItem.ToString();\r
                 srtCode = srt_charcode.SelectedItem.ToString();\r
                 srtOffsetMs = (int)srt_offset.Value;\r
+                if (defaultSub == "Yes") setNoSrtDefault();\r
+            } else\r
+            {\r
+                if (defaultSub == "Yes") SetNoDefault();\r
+                if (burnedVal == "Yes") SetNoBurned();\r
+\r
+                if (_fileContainer == 0)\r
+                    burnedVal = "Yes";  // MP4 must have bitmap subs burned in.\r
             }\r
 \r
             if (_fileContainer == 0) // MP4 and M4V file extension\r
@@ -62,12 +70,6 @@ namespace Handbrake.Controls
                 }\r
             }\r
 \r
-            if (defaultSub == "Yes") SetNoDefault();\r
-            if (burnedVal == "Yes") SetNoBurned();\r
-\r
-            if (_fileContainer == 0 && !drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))\r
-                burnedVal = "Yes";  // MP4 must have bitmap subs burned in.\r
-\r
             string trackName = (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))\r
                                ? srtLangVal + " (" + srtFile + ")"\r
                                : drp_subtitleTracks.SelectedItem.ToString();\r
@@ -165,8 +167,17 @@ namespace Handbrake.Controls
             // Update an item in the  list if required.\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
 \r
-            lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text = drp_subtitleTracks.SelectedItem.ToString();\r
-            lv_subList.Select();\r
+            if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))\r
+            {\r
+                lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text = srt_lang.SelectedItem + "(" +\r
+                    drp_subtitleTracks.SelectedItem + ")";\r
+                lv_subList.Select();\r
+            } else\r
+            {\r
+                lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text =\r
+                    drp_subtitleTracks.SelectedItem.ToString();\r
+                lv_subList.Select();\r
+            }\r
 \r
             SubList[lv_subList.SelectedIndices[0]].Track = drp_subtitleTracks.SelectedItem.ToString(); // Update SubList List<SubtitleInfo>\r
         }\r
@@ -196,7 +207,10 @@ namespace Handbrake.Controls
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
 \r
             if (check_default.Checked) // Make sure we only have 1 default track\r
-                SetNoDefault();\r
+                if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text.Contains(".srt"))\r
+                    setNoSrtDefault();\r
+                else\r
+                    SetNoDefault();\r
 \r
             lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[3].Text = check_default.Checked ? "Yes" : "No";\r
             lv_subList.Select();\r
@@ -279,10 +293,30 @@ namespace Handbrake.Controls
             int c = 0;\r
             foreach (ListViewItem item in lv_subList.Items)\r
             {\r
-                if (item.SubItems[3].Text == "Yes")\r
+                if (SubList[c].SrtPath == "-")\r
+                {\r
+                    if (item.SubItems[3].Text == "Yes")\r
+                    {\r
+                        item.SubItems[3].Text = "No";\r
+                        SubList[c].Default = "No";\r
+                    }     \r
+                }\r
+                c++;\r
+            }\r
+        }\r
+\r
+        private void setNoSrtDefault()\r
+        {\r
+            int c = 0;\r
+            foreach (ListViewItem item in lv_subList.Items)\r
+            {\r
+                if (SubList[c].SrtPath != "-")\r
                 {\r
-                    item.SubItems[3].Text = "No";\r
-                    SubList[c].Default = "No";\r
+                    if (item.SubItems[3].Text == "Yes")\r
+                    {\r
+                        item.SubItems[3].Text = "No";\r
+                        SubList[c].Default = "No";\r
+                    }\r
                 }\r
                 c++;\r
             }\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index cd558f6..7491036 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -376,7 +376,7 @@ namespace Handbrake.Functions
                 string subtitleForced = String.Empty;\r
                 string subtitleBurn = String.Empty;\r
                 string subtitleDefault = String.Empty;\r
-\r
+ \r
                 // SRT\r
                 string srtFile = String.Empty;\r
                 string srtCodeset = String.Empty;\r
@@ -471,7 +471,7 @@ namespace Handbrake.Functions
                     if (srtLang != "")\r
                         query += " --srt-lang " + srtLang;\r
                     if (srtDefault != "")\r
-                        query += " --subtitle-default " + srtDefault;\r
+                        query += " --srt-default=" + srtDefault;\r
                 }\r
 \r
             }\r

diff --git a/win/C#/frmPreview.Designer.cs b/win/C#/frmPreview.Designer.cs
index 14a90a9..0868193 100644 (file)
--- a/win/C#/frmPreview.Designer.cs
+++ b/win/C#/frmPreview.Designer.cs
@@ -68,7 +68,7 @@
             // \r
             this.lbl_preview.BackColor = System.Drawing.Color.Transparent;\r
             this.lbl_preview.Name = "lbl_preview";\r
-            this.lbl_preview.Size = new System.Drawing.Size(89, 22);\r
+            this.lbl_preview.Size = new System.Drawing.Size(91, 22);\r
             this.lbl_preview.Text = "Start at Preview:";\r
             // \r
             // cb_preview\r
@@ -95,7 +95,7 @@
             // \r
             this.toolStripLabel2.BackColor = System.Drawing.Color.Transparent;\r
             this.toolStripLabel2.Name = "toolStripLabel2";\r
-            this.toolStripLabel2.Size = new System.Drawing.Size(98, 22);\r
+            this.toolStripLabel2.Size = new System.Drawing.Size(107, 22);\r
             this.toolStripLabel2.Text = "Duration (seconds)";\r
             // \r
             // cb_duration\r
@@ -127,7 +127,7 @@
             this.btn_playQT.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_playQT.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_playQT.Name = "btn_playQT";\r
-            this.btn_playQT.Size = new System.Drawing.Size(89, 22);\r
+            this.btn_playQT.Size = new System.Drawing.Size(96, 22);\r
             this.btn_playQT.Text = "Play with QT";\r
             this.btn_playQT.Click += new System.EventHandler(this.btn_playQT_Click);\r
             // \r
@@ -137,7 +137,7 @@
             this.btn_playVLC.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_playVLC.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_playVLC.Name = "btn_playVLC";\r
-            this.btn_playVLC.Size = new System.Drawing.Size(93, 22);\r
+            this.btn_playVLC.Size = new System.Drawing.Size(101, 22);\r
             this.btn_playVLC.Text = "Play with VLC";\r
             this.btn_playVLC.Click += new System.EventHandler(this.btn_playVLC_Click);\r
             // \r