WinGui:

- More refactoring.

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

diff --git a/win/C#/Controls/Filters.cs b/win/C#/Controls/Filters.cs
index 757536c..6f8d3af 100644 (file)
--- a/win/C#/Controls/Filters.cs
+++ b/win/C#/Controls/Filters.cs
@@ -1,12 +1,24 @@
-using System;\r
+/*  Filters.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
+using System;\r
 using System.Windows.Forms;\r
 \r
 namespace Handbrake.Controls\r
 {\r
     public partial class Filters : UserControl\r
     {\r
+        /// <summary>\r
+        /// The Filter settings have changed\r
+        /// </summary>\r
         public event EventHandler FilterSettingsChanged;\r
 \r
+        /// <summary>\r
+        /// Creates a new instance of Filters\r
+        /// </summary>\r
         public Filters()\r
         {\r
             InitializeComponent();\r
@@ -16,53 +28,10 @@ namespace Handbrake.Controls
             drop_detelecine.SelectedIndex = 0;\r
         }\r
 \r
-        // Controls\r
-        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_customDT.Visible = drop_detelecine.Text == "Custom";\r
-            // A Filter has changed so raise a FilterSettingsChanged event.\r
-            if (this.FilterSettingsChanged != null)\r
-                this.FilterSettingsChanged(this, new EventArgs());\r
-        }\r
-        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_customDC.Visible = drop_decomb.Text == "Custom";\r
-            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
-                drop_deinterlace.SelectedIndex = 0;\r
-\r
-            // A Filter has changed so raise a FilterSettingsChanged event.\r
-            if (this.FilterSettingsChanged != null)\r
-                this.FilterSettingsChanged(this, new EventArgs());\r
-        }\r
-        private void drop_deinterlace_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_customDI.Visible = drop_deinterlace.Text == "Custom";\r
-            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
-                drop_decomb.SelectedIndex = 0;\r
-\r
-            // A Filter has changed so raise a FilterSettingsChanged event.\r
-            if (this.FilterSettingsChanged != null)\r
-                this.FilterSettingsChanged(this, new EventArgs());\r
-        }\r
-        private void drop_denoise_SelectedIndexChanged(object sender, EventArgs e)\r
-        {\r
-            text_customDN.Visible = drop_denoise.Text == "Custom";\r
-\r
-            // A Filter has changed so raise a FilterSettingsChanged event.\r
-            if (this.FilterSettingsChanged != null)\r
-                this.FilterSettingsChanged(this, new EventArgs());\r
-        }\r
-        private void slider_deblock_Scroll(object sender, EventArgs e)\r
-        {\r
-            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();\r
-\r
-            // A Filter has changed so raise a FilterSettingsChanged event.\r
-            if (this.FilterSettingsChanged != null)\r
-                this.FilterSettingsChanged(this, new EventArgs());\r
-        }\r
-\r
-        // Returns the CLI query for the query generator.\r
-        public string getCLIQuery\r
+        /// <summary>\r
+        /// Returns the CLI query for the query generator.\r
+        /// </summary>\r
+        public string GetCLIQuery\r
         {\r
             get\r
             {\r
@@ -155,8 +124,11 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
-        // Setup for each component for the preset loader.\r
-        public void setDeTelecine(string value)\r
+        /// <summary>\r
+        /// Set the Detelecine control\r
+        /// </summary>\r
+        /// <param name="value">The value part of the CLI string</param>\r
+        public void SetDeTelecine(string value)\r
         {\r
             text_customDT.Text = "";\r
             text_customDT.Visible = false;\r
@@ -175,7 +147,12 @@ namespace Handbrake.Controls
                     break;\r
             }\r
         }\r
-        public void setDeNoise(string value)\r
+\r
+        /// <summary>\r
+        /// Set the Denoise control\r
+        /// </summary>\r
+        /// <param name="value">The value part of the CLI string</param>\r
+        public void SetDeNoise(string value)\r
         {\r
             text_customDN.Text = "";\r
             text_customDN.Visible = false;\r
@@ -200,7 +177,12 @@ namespace Handbrake.Controls
                     break;\r
             }\r
         }\r
-        public void setDeInterlace(string value)\r
+\r
+        /// <summary>\r
+        /// Set the Deinterlace Control\r
+        /// </summary>\r
+        /// <param name="value">The value part of the CLI string</param>\r
+        public void SetDeInterlace(string value)\r
         {\r
             text_customDI.Text = "";\r
             text_customDI.Visible = false;\r
@@ -227,7 +209,12 @@ namespace Handbrake.Controls
                     break;\r
             }\r
         }\r
-        public void setDecomb(string value)\r
+\r
+        /// <summary>\r
+        /// Set the Decomb Control\r
+        /// </summary>\r
+        /// <param name="value">The value part of the CLI string</param>\r
+        public void SetDecomb(string value)\r
         {\r
             text_customDC.Text = "";\r
             text_customDC.Visible = false;\r
@@ -246,7 +233,12 @@ namespace Handbrake.Controls
                     break;\r
             }\r
         }\r
-        public void setDeBlock(int value)\r
+\r
+        /// <summary>\r
+        /// Set the Deblock Control\r
+        /// </summary>\r
+        /// <param name="value">The deblock value</param>\r
+        public void SetDeBlock(int value)\r
         {\r
             if (value != 0)\r
             {\r
@@ -259,9 +251,59 @@ namespace Handbrake.Controls
                 lbl_deblockVal.Text = "Off";\r
             }\r
         }\r
-        public void setGrayScale(bool value)\r
+\r
+        /// <summary>\r
+        /// Set the grayscale control\r
+        /// </summary>\r
+        /// <param name="value">Boolean value</param>\r
+        public void SetGrayScale(bool value)\r
         {\r
             check_grayscale.CheckState = value ? CheckState.Checked : CheckState.Unchecked;\r
         }\r
+\r
+        // Controls\r
+        private void drop_detelecine_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDT.Visible = drop_detelecine.Text == "Custom";\r
+            // A Filter has changed so raise a FilterSettingsChanged event.\r
+            if (this.FilterSettingsChanged != null)\r
+                this.FilterSettingsChanged(this, new EventArgs());\r
+        }\r
+        private void drop_decomb_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDC.Visible = drop_decomb.Text == "Custom";\r
+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
+                drop_deinterlace.SelectedIndex = 0;\r
+\r
+            // A Filter has changed so raise a FilterSettingsChanged event.\r
+            if (this.FilterSettingsChanged != null)\r
+                this.FilterSettingsChanged(this, new EventArgs());\r
+        }\r
+        private void drop_deinterlace_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDI.Visible = drop_deinterlace.Text == "Custom";\r
+            if (drop_decomb.SelectedIndex != 0 && drop_deinterlace.SelectedIndex != 0)\r
+                drop_decomb.SelectedIndex = 0;\r
+\r
+            // A Filter has changed so raise a FilterSettingsChanged event.\r
+            if (this.FilterSettingsChanged != null)\r
+                this.FilterSettingsChanged(this, new EventArgs());\r
+        }\r
+        private void drop_denoise_SelectedIndexChanged(object sender, EventArgs e)\r
+        {\r
+            text_customDN.Visible = drop_denoise.Text == "Custom";\r
+\r
+            // A Filter has changed so raise a FilterSettingsChanged event.\r
+            if (this.FilterSettingsChanged != null)\r
+                this.FilterSettingsChanged(this, new EventArgs());\r
+        }\r
+        private void slider_deblock_Scroll(object sender, EventArgs e)\r
+        {\r
+            lbl_deblockVal.Text = slider_deblock.Value == 4 ? "Off" : slider_deblock.Value.ToString();\r
+\r
+            // A Filter has changed so raise a FilterSettingsChanged event.\r
+            if (this.FilterSettingsChanged != null)\r
+                this.FilterSettingsChanged(this, new EventArgs());\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Controls/PictureSettings.cs b/win/C#/Controls/PictureSettings.cs
index cf8f022..d5d088b 100644 (file)
--- a/win/C#/Controls/PictureSettings.cs
+++ b/win/C#/Controls/PictureSettings.cs
@@ -1,3 +1,9 @@
+/*  PictureSetting.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
 using System;\r
 using System.ComponentModel;\r
 using System.Drawing;\r

diff --git a/win/C#/Controls/Subtitles.cs b/win/C#/Controls/Subtitles.cs
index 4fac297..fb179bb 100644 (file)
--- a/win/C#/Controls/Subtitles.cs
+++ b/win/C#/Controls/Subtitles.cs
@@ -1,8 +1,15 @@
-using System;\r
+/*  Subtitles.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+\r
+using System;\r
 using System.Collections.Generic;\r
 using System.IO;\r
 using System.Windows.Forms;\r
 using Handbrake.Functions;\r
+using Handbrake.Model;\r
 \r
 namespace Handbrake.Controls\r
 {\r
@@ -10,7 +17,7 @@ namespace Handbrake.Controls
     {\r
         readonly IDictionary<string, string> LangMap = new Dictionary<string, string>();\r
         List<SubtitleInfo> SubList = new List<SubtitleInfo>();\r
-        private int _fileContainer;\r
+        private int FileContainer;\r
 \r
         public Subtitles()\r
         {\r
@@ -43,17 +50,17 @@ 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
+                if (defaultSub == "Yes") SetNoSrtDefault();\r
             } else\r
             {\r
                 if (defaultSub == "Yes") SetNoDefault();\r
                 if (burnedVal == "Yes") SetNoBurned();\r
 \r
-                if (_fileContainer == 0)\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
+            if (FileContainer == 0) // MP4 and M4V file extension\r
             {\r
                 // Make sure we only have 1 bitmap track.\r
                 if (drp_subtitleTracks.SelectedItem != null && drp_subtitleTracks.SelectedItem.ToString().Contains("Bitmap"))\r
@@ -208,7 +215,7 @@ namespace Handbrake.Controls
 \r
             if (check_default.Checked) // Make sure we only have 1 default track\r
                 if (lv_subList.Items[lv_subList.SelectedIndices[0]].SubItems[0].Text.Contains(".srt"))\r
-                    setNoSrtDefault();\r
+                    SetNoSrtDefault();\r
                 else\r
                     SetNoDefault();\r
 \r
@@ -305,7 +312,7 @@ namespace Handbrake.Controls
             }\r
         }\r
 \r
-        private void setNoSrtDefault()\r
+        private void SetNoSrtDefault()\r
         {\r
             int c = 0;\r
             foreach (ListViewItem item in lv_subList.Items)\r
@@ -411,9 +418,9 @@ namespace Handbrake.Controls
         }\r
         public void SetContainer(int value)\r
         {\r
-            _fileContainer = value;\r
+            FileContainer = value;\r
             Boolean trigger = false;\r
-            if (_fileContainer != 1)\r
+            if (FileContainer != 1)\r
                 foreach (ListViewItem item in lv_subList.Items)\r
                 {\r
                     if (item.SubItems[1].Text.Contains("Bitmap"))\r
@@ -429,32 +436,4 @@ namespace Handbrake.Controls
             return SubList;\r
         }\r
     }\r
-\r
-    public class SubtitleInfo\r
-    {\r
-        public string Track { get; set; }\r
-        public string Forced { get; set; }\r
-        public string Burned { get; set; }\r
-        public string Default { get; set; }\r
-        public string SrtLang { get; set; }\r
-        public string SrtCharCode { get; set; }\r
-        public int SrtOffset { get; set; }\r
-        public string SrtPath { get; set; }\r
-        public string SrtFileName { get; set; }\r
-\r
-        public ListViewItem ListView\r
-        {\r
-            get\r
-            {\r
-                ListViewItem listTrack = new ListViewItem(Track);\r
-                listTrack.SubItems.Add(Forced);\r
-                listTrack.SubItems.Add(Burned);\r
-                listTrack.SubItems.Add(Default);\r
-                listTrack.SubItems.Add(SrtLang);\r
-                listTrack.SubItems.Add(SrtCharCode);\r
-                listTrack.SubItems.Add(SrtOffset.ToString());\r
-                return listTrack;\r
-            }\r
-        }\r
-    }\r
 }
\ No newline at end of file

diff --git a/win/C#/Functions/PresetLoader.cs b/win/C#/Functions/PresetLoader.cs
index a653f96..c88ff2d 100644 (file)
--- a/win/C#/Functions/PresetLoader.cs
+++ b/win/C#/Functions/PresetLoader.cs
@@ -132,12 +132,12 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Filters\r
-            mainWindow.Filters.setDecomb(presetQuery.Decomb);\r
-            mainWindow.Filters.setDeInterlace(presetQuery.DeInterlace);\r
-            mainWindow.Filters.setDeNoise(presetQuery.DeNoise);\r
-            mainWindow.Filters.setDeTelecine(presetQuery.DeTelecine);\r
-            mainWindow.Filters.setDeBlock(presetQuery.DeBlock);\r
-            mainWindow.Filters.setGrayScale(presetQuery.Grayscale);\r
+            mainWindow.Filters.SetDecomb(presetQuery.Decomb);\r
+            mainWindow.Filters.SetDeInterlace(presetQuery.DeInterlace);\r
+            mainWindow.Filters.SetDeNoise(presetQuery.DeNoise);\r
+            mainWindow.Filters.SetDeTelecine(presetQuery.DeTelecine);\r
+            mainWindow.Filters.SetDeBlock(presetQuery.DeBlock);\r
+            mainWindow.Filters.SetGrayScale(presetQuery.Grayscale);\r
             #endregion\r
 \r
             #region Video\r

diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index 050e9b7..03fa22c 100644 (file)
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -182,7 +182,7 @@ namespace Handbrake.Functions
             #endregion\r
 \r
             #region Filters\r
-            query += mainWindow.Filters.getCLIQuery;\r
+            query += mainWindow.Filters.GetCLIQuery;\r
             #endregion\r
 \r
             #region Video Settings Tab\r

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 70aaa81..46b3926 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -224,6 +224,7 @@
     </Compile>\r
     <Compile Include="Model\AudioTrack.cs" />\r
     <Compile Include="Model\DriveInformation.cs" />\r
+    <Compile Include="Model\SourceType.cs" />\r
     <Compile Include="Presets\PlistPresetHandler.cs" />\r
     <Compile Include="Presets\Preset.cs" />\r
     <Compile Include="Presets\PresetsHandler.cs" />\r

diff --git a/win/C#/Model/Subtitle.cs b/win/C#/Model/Subtitle.cs
new file mode 100644 (file)
index 0000000..69ddbbd
--- /dev/null
+++ b/win/C#/Model/Subtitle.cs
@@ -0,0 +1,78 @@
+/*  Subtitle.cs $\r
+       \r
+          This file is part of the HandBrake source code.\r
+          Homepage: <http://handbrake.fr>.\r
+          It may be used under the terms of the GNU General Public License. */\r
+using System.Windows.Forms;\r
+\r
+namespace Handbrake.Model\r
+{\r
+    /// <summary>\r
+    /// Subtitle Information\r
+    /// </summary>\r
+    public class SubtitleInfo\r
+    {\r
+        /// <summary>\r
+        /// Subtitle Track\r
+        /// </summary>\r
+        public string Track { get; set; }\r
+\r
+        /// <summary>\r
+        /// Forced Subtitle\r
+        /// </summary>\r
+        public string Forced { get; set; }\r
+\r
+        /// <summary>\r
+        /// Burned In Subtitle\r
+        /// </summary>\r
+        public string Burned { get; set; }\r
+\r
+        /// <summary>\r
+        /// Default Subtitle Track\r
+        /// </summary>\r
+        public string Default { get; set; }\r
+\r
+        /// <summary>\r
+        /// SRT Language\r
+        /// </summary>\r
+        public string SrtLang { get; set; }\r
+\r
+        /// <summary>\r
+        /// SRT Character Code\r
+        /// </summary>\r
+        public string SrtCharCode { get; set; }\r
+\r
+        /// <summary>\r
+        /// SRT Offset\r
+        /// </summary>\r
+        public int SrtOffset { get; set; }\r
+\r
+        /// <summary>\r
+        /// Path to the SRT file\r
+        /// </summary>\r
+        public string SrtPath { get; set; }\r
+\r
+        /// <summary>\r
+        /// SRT Filename\r
+        /// </summary>\r
+        public string SrtFileName { get; set; }\r
+\r
+        /// <summary>\r
+        /// A ListViewItem Containing information about this subitlte\r
+        /// </summary>\r
+        public ListViewItem ListView\r
+        {\r
+            get\r
+            {\r
+                ListViewItem listTrack = new ListViewItem(Track);\r
+                listTrack.SubItems.Add(Forced);\r
+                listTrack.SubItems.Add(Burned);\r
+                listTrack.SubItems.Add(Default);\r
+                listTrack.SubItems.Add(SrtLang);\r
+                listTrack.SubItems.Add(SrtCharCode);\r
+                listTrack.SubItems.Add(SrtOffset.ToString());\r
+                return listTrack;\r
+            }\r
+        }\r
+    }\r
+}\r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index b588e64..e13858f 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -74,6 +74,9 @@ namespace Handbrake.Parsing
             get { return m_titleNumber; }\r
         }\r
 \r
+        /// <summary>\r
+        /// Source Name\r
+        /// </summary>\r
         public string SourceName\r
         {\r
             get { return source;  }\r
@@ -150,6 +153,11 @@ namespace Handbrake.Parsing
                                  m_duration.Minutes, m_duration.Seconds);\r
         }\r
 \r
+        /// <summary>\r
+        /// Parse the Title Information\r
+        /// </summary>\r
+        /// <param name="output"></param>\r
+        /// <returns></returns>\r
         public static Title Parse(StringReader output)\r
         {\r
             var thisTitle = new Title();\r
@@ -216,6 +224,11 @@ namespace Handbrake.Parsing
             return thisTitle;\r
         }\r
 \r
+        /// <summary>\r
+        /// Return a list of parsed titles\r
+        /// </summary>\r
+        /// <param name="output"></param>\r
+        /// <returns></returns>\r
         public static Title[] ParseList(string output)\r
         {\r
             var titles = new List<Title>();\r