WinGui:

- Some additional cleanup to the Subtitles files.

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

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index d3f8795..e923598 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -34,11 +34,6 @@ namespace Handbrake.Controls
         private readonly List<SubtitleInfo> subList = new List<SubtitleInfo>();\r
 \r
         /// <summary>\r
-        /// The File Container\r
-        /// </summary>\r
-        private int fileContainer;\r
-\r
-        /// <summary>\r
         /// Initializes a new instance of the <see cref="Subtitles"/> class.\r
         /// </summary>\r
         public Subtitles()\r
@@ -259,11 +254,29 @@ namespace Handbrake.Controls
             srtFiles.Add(Path.GetFileName(openFileDialog.FileName), openFileDialog.FileName);\r
         }\r
 \r
+        /// <summary>\r
+        /// Remove a subtitle track\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void BtnRemoveSubTrackClick(object sender, EventArgs e)\r
         {\r
             RemoveTrack();\r
         }\r
 \r
+        /// <summary>\r
+        /// The Subtitle List selected index has changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void LbSubListSelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             // Set the dropdown controls based on the selected item in the List.\r
@@ -308,6 +321,15 @@ namespace Handbrake.Controls
 \r
         /* Bitmap / CC / SRT Controls */\r
 \r
+        /// <summary>\r
+        /// Handle the Subtitle track dropdown changed event\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void DrpSubtitleTracksSelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (drp_subtitleTracks.SelectedItem.ToString().Contains(".srt"))\r
@@ -349,6 +371,15 @@ namespace Handbrake.Controls
             subList[lv_subList.SelectedIndices[0]].Track = drp_subtitleTracks.SelectedItem.ToString();\r
         }\r
 \r
+        /// <summary>\r
+        /// Foreced Subtitles checkbox changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void CheckForcedCheckedChanged(object sender, EventArgs e)\r
         {\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
@@ -360,6 +391,15 @@ namespace Handbrake.Controls
                 // Update SubList List<SubtitleInfo> \r
         }\r
 \r
+        /// <summary>\r
+        /// Burned in subtitles checkbox changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void CheckBurnedCheckedChanged(object sender, EventArgs e)\r
         {\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
@@ -374,6 +414,15 @@ namespace Handbrake.Controls
                 // Update SubList List<SubtitleInfo> \r
         }\r
 \r
+        /// <summary>\r
+        /// Default Subitle track check changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void CheckDefaultCheckedChanged(object sender, EventArgs e)\r
         {\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
@@ -391,6 +440,15 @@ namespace Handbrake.Controls
                 // Update SubList List<SubtitleInfo>\r
         }\r
 \r
+        /// <summary>\r
+        /// Srt Offset Numeric Control Changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void SrtOffsetValueChanged(object sender, EventArgs e)\r
         {\r
             // Update an item in the  list if required.\r
@@ -404,6 +462,15 @@ namespace Handbrake.Controls
                 // Update SubList List<SubtitleInfo>\r
         }\r
 \r
+        /// <summary>\r
+        /// The SRT Charcode changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void SrtCharcodeSelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
@@ -415,6 +482,15 @@ namespace Handbrake.Controls
                 // Update SubList List<SubtitleInfo>\r
         }\r
 \r
+        /// <summary>\r
+        /// The Srt Language code changed\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void SrtLangSelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             if (lv_subList.Items.Count == 0 || lv_subList.SelectedIndices.Count == 0) return;\r
@@ -428,6 +504,15 @@ namespace Handbrake.Controls
 \r
         /* Right Click Menu */\r
 \r
+        /// <summary>\r
+        /// Move an item in the subtitle list up\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void MnuMoveupClick(object sender, EventArgs e)\r
         {\r
             if (lv_subList.SelectedIndices.Count != 0)\r
@@ -446,6 +531,15 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Move an item in the subtitle list down\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void MnuMovedownClick(object sender, EventArgs e)\r
         {\r
             if (lv_subList.SelectedIndices.Count != 0)\r
@@ -464,6 +558,15 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
+        /// <summary>\r
+        /// Remove a selected subtitle track.\r
+        /// </summary>\r
+        /// <param name="sender">\r
+        /// The sender.\r
+        /// </param>\r
+        /// <param name="e">\r
+        /// The e.\r
+        /// </param>\r
         private void MnuRemoveClick(object sender, EventArgs e)\r
         {\r
             RemoveTrack();\r
@@ -571,15 +674,7 @@ namespace Handbrake.Controls
         /// <returns>True if Yes</returns>\r
         public bool RequiresM4V()\r
         {\r
-            foreach (ListViewItem item in lv_subList.Items)\r
-            {\r
-                if (item.SubItems.Count != 5)\r
-                    return true;\r
-\r
-                if (item.SubItems[1].Text.Contains("(Text)"))\r
-                    return true;\r
-            }\r
-            return false;\r
+            return this.lv_subList.Items.Cast<ListViewItem>().Any(item => item.SubItems.Count != 5 || item.SubItems[1].Text.Contains("(Text)"));\r
         }\r
 \r
         /// <summary>\r
@@ -615,15 +710,6 @@ namespace Handbrake.Controls
         }\r
 \r
         /// <summary>\r
-        /// Set the file container which is currently in use.\r
-        /// </summary>\r
-        /// <param name="value">The File Container</param>\r
-        public void SetContainer(int value)\r
-        {\r
-            fileContainer = value;\r
-        }\r
-\r
-        /// <summary>\r
         /// Get the list of subtitles.\r
         /// </summary>\r
         /// <returns>A List of SubtitleInfo Object</returns>\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 79be56d..1a1cfae 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1660,7 +1660,6 @@ namespace Handbrake
             }\r
 \r
             AudioSettings.SetContainer(drop_format.Text);\r
-            Subtitles.SetContainer(drop_format.SelectedIndex);\r
 \r
             if (drop_format.Text.Contains("MP4"))\r
             {\r