WinGui:

- Some more code code cleanup done. Nothing major.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index e298bea..8390441 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -21,7 +21,7 @@ namespace Handbrake.Functions
                 string build = rssRead.build();\r
 \r
                 int latest = int.Parse(build);\r
-                int current = Properties.Settings.Default.build;\r
+                int current = Properties.Settings.Default.hb_build;\r
                 int skip = Properties.Settings.Default.skipversion;\r
 \r
                 if (latest == skip)\r

diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs
index 95d9f30..2977a99 100644 (file)
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -106,9 +106,7 @@ namespace Handbrake.Parsing
                 return thisTrack;\r
             }\r
             else\r
-            {\r
                 return null;\r
-            }\r
         }\r
 \r
         public static AudioTrack[] ParseList(StringReader output)\r
@@ -118,13 +116,9 @@ namespace Handbrake.Parsing
             {\r
                 AudioTrack thisTrack = AudioTrack.Parse(output);\r
                 if (thisTrack != null)\r
-                {\r
                     tracks.Add(thisTrack);\r
-                }\r
                 else\r
-                {\r
                     break;\r
-                }\r
             }\r
             return tracks.ToArray();\r
         }\r

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index caea54b..f2d10f5 100644 (file)
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -54,9 +54,7 @@ namespace Handbrake.Parsing
                 return thisChapter;\r
             }\r
             else\r
-            {\r
                 return null;\r
-            }\r
         }\r
 \r
         public static Chapter[] ParseList(StringReader output)\r
@@ -73,13 +71,9 @@ namespace Handbrake.Parsing
                 Chapter thisChapter = Chapter.Parse(output);\r
 \r
                 if (thisChapter != null)\r
-                {\r
                     chapters.Add(thisChapter);\r
-                }\r
                 else\r
-                {\r
                     break;\r
-                }\r
             }\r
             return chapters.ToArray();\r
         }\r

diff --git a/win/C#/Parsing/DVD.cs b/win/C#/Parsing/DVD.cs
index f0982a4..c06244a 100644 (file)
--- a/win/C#/Parsing/DVD.cs
+++ b/win/C#/Parsing/DVD.cs
@@ -40,13 +40,9 @@ namespace Handbrake.Parsing
                 while (!output.EndOfStream)\r
                 {\r
                     if ((char)output.Peek() == '+')\r
-                    {\r
                         thisDVD.m_titles.AddRange(Title.ParseList(output.ReadToEnd()));\r
-                    }\r
                     else\r
-                    {\r
                         output.ReadLine();\r
-                    }\r
                 }\r
             }\r
             catch (Exception exc)\r

diff --git a/win/C#/Parsing/Parser.cs b/win/C#/Parsing/Parser.cs
index 799e8a3..7e00ddc 100644 (file)
--- a/win/C#/Parsing/Parser.cs
+++ b/win/C#/Parsing/Parser.cs
@@ -72,13 +72,10 @@ namespace Handbrake.Parsing
                 this.m_buffer += tmp;\r
                 Match m = Regex.Match(tmp, "^Scanning title ([0-9]*) of ([0-9]*)");\r
                 if (OnReadLine != null)\r
-                {\r
                     OnReadLine(this, tmp);\r
-                }\r
+\r
                 if (m.Success && OnScanProgress != null)\r
-                {\r
                     OnScanProgress(this, int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value));\r
-                }\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -92,12 +89,10 @@ namespace Handbrake.Parsing
             string tmp = base.ReadToEnd();\r
             try\r
             {\r
-                \r
                 this.m_buffer += tmp;\r
                 if (OnReadToEnd != null)\r
-                {\r
                     OnReadToEnd(this, tmp);\r
-                }\r
+\r
             }\r
             catch (Exception exc)\r
             {\r

diff --git a/win/C#/Parsing/Subtitle.cs b/win/C#/Parsing/Subtitle.cs
index 6d83d26..defcb5b 100644 (file)
--- a/win/C#/Parsing/Subtitle.cs
+++ b/win/C#/Parsing/Subtitle.cs
@@ -55,9 +55,7 @@ namespace Handbrake.Parsing
                 return thisSubtitle;\r
             }\r
             else\r
-            {\r
                 return null;\r
-            }\r
         }\r
 \r
         public static Subtitle[] ParseList(StringReader output)\r
@@ -68,13 +66,9 @@ namespace Handbrake.Parsing
                 Subtitle thisSubtitle = Subtitle.Parse(output);\r
 \r
                 if (thisSubtitle != null)\r
-                {\r
                     subtitles.Add(thisSubtitle);\r
-                }\r
                 else\r
-                {\r
                     break;\r
-                }\r
             }\r
             return subtitles.ToArray();\r
         }\r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index b1f02d9..8f5d0c0 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -129,8 +129,8 @@ namespace Handbrake.Parsing
         /// <returns>A string representing this track in the format: {title #} (00:00:00)</returns>\r
         public override string ToString()\r
         {\r
-                   return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours,\r
-                    this.m_duration.Minutes, this.m_duration.Seconds);\r
+            return string.Format("{0} ({1:00}:{2:00}:{3:00})", this.m_titleNumber, this.m_duration.Hours,\r
+             this.m_duration.Minutes, this.m_duration.Seconds);\r
         }\r
 \r
 \r
@@ -151,18 +151,11 @@ namespace Handbrake.Parsing
                 {\r
                     // Match track number for this title\r
                     if (m.Success)\r
-                    {\r
-                        //MessageBox.Show(m.Groups[1].Value);\r
-                        thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value.Trim().ToString()); \r
-                        //.Trim().ToString() Not sure why this is needed but some systems seem to get a rogue \r
-                    }\r
-                                    }\r
+                        thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
+                }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Track Number " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Track Number " + exc.ToString());\r
                 }\r
 \r
                 output.ReadLine();\r
@@ -172,16 +165,11 @@ namespace Handbrake.Parsing
                 {\r
                     m = Regex.Match(output.ReadLine(), @"^  \+ duration: ([0-9]{2}:[0-9]{2}:[0-9]{2})");\r
                     if (m.Success)\r
-                    {\r
                         thisTitle.m_duration = TimeSpan.Parse(m.Groups[1].Value);\r
-                    }\r
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Duration " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Duration " + exc.ToString());\r
                 }\r
 \r
                 try\r
@@ -196,10 +184,7 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Resolution and Aspect " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Resolution and Aspect " + exc.ToString());\r
                 }\r
 \r
                 try\r
@@ -207,16 +192,11 @@ namespace Handbrake.Parsing
                     // Get autocrop region for this title\r
                     m = Regex.Match(output.ReadLine(), @"^  \+ autocrop: ([0-9]*)/([0-9]*)/([0-9]*)/([0-9]*)");\r
                     if (m.Success)\r
-                    {\r
                         thisTitle.m_autoCrop = new int[4] { int.Parse(m.Groups[1].Value), int.Parse(m.Groups[2].Value), int.Parse(m.Groups[3].Value), int.Parse(m.Groups[4].Value) };\r
-                    }\r
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Auto Crop " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Auto Crop " + exc.ToString());\r
                 }\r
 \r
 \r
@@ -226,10 +206,7 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Chapters EXC " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Chapters EXC " + exc.ToString());\r
                 }\r
 \r
                 try\r
@@ -238,10 +215,7 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Audio EXC " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Audio EXC " + exc.ToString());\r
                 }\r
 \r
                 try\r
@@ -250,21 +224,15 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                    {\r
-                        MessageBox.Show("Title.cs - Subtitles EXC " + exc.ToString());\r
-                    }\r
+                    MessageBox.Show("Title.cs - Subtitles EXC " + exc.ToString());\r
                 }\r
             }\r
             catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("Title.cs - Parse " + exc.ToString());\r
-                }\r
+                MessageBox.Show("Title.cs - Parse " + exc.ToString());\r
             }\r
-     \r
-        \r
+\r
+\r
             return thisTitle;\r
         }\r
 \r
@@ -281,10 +249,7 @@ namespace Handbrake.Parsing
             }\r
             catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("Title.cs - ParseList " + exc.ToString());\r
-                }\r
+                MessageBox.Show("Title.cs - ParseList " + exc.ToString());\r
             }\r
             return titles.ToArray();\r
         }\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index b5af0d7..e764a1c 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -23,9 +23,6 @@ namespace Handbrake
         [STAThread]\r
         static void Main()\r
         {\r
-            // 633265950858281250 = 16:52 28-Sep-07  //864000000000 nanoseconds per day\r
-            //long start = DateTime.Now.Ticks;\r
-            //if (start > 633274593039531250) {MessageBox.Show("Sorry, This development build of Handbrake has expired."); return; } // Will Expire Oct 8th\r
 \r
             // Check the system meets the system requirements.\r
             Boolean launch = true;\r
@@ -42,19 +39,16 @@ namespace Handbrake
                 // Make sure the system has enough RAM. 384MB or greater\r
                 uint memory = MemoryCheck.CheckMemeory();\r
                 memory = memory / 1024 / 1024;\r
-               \r
-                if (memory < 320)\r
+\r
+                if (memory < 256)\r
                 {\r
-                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n Insufficient RAM. 512MB or greater required. You have: " + memory.ToString() + "MB", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
+                    MessageBox.Show("Your system does not meet the minimum requirements for HandBrake. \n Insufficient RAM. 384MB or greater required. You have: " + memory.ToString() + "MB", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);\r
                     launch = false;\r
                 }\r
             }\r
             catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("frmMain.cs - systemCheck() " + exc.ToString());\r
-                }\r
+                MessageBox.Show("frmMain.cs - systemCheck() " + exc.ToString());\r
             }\r
 \r
 \r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index 505af03..47a916c 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -30,6 +30,6 @@ using System.Resources;
 //      Build Number\r
 //      Revision\r
 //\r
-[assembly: AssemblyVersion("2.4.0.1")]\r
-[assembly: AssemblyFileVersion("2.4.0.1")]\r
+[assembly: AssemblyVersion("0.9.2.0")]\r
+[assembly: AssemblyFileVersion("0.9.2.0")]\r
 [assembly: NeutralResourcesLanguageAttribute("")]\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index 7c112d8..8eb65e2 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -86,37 +86,12 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("0.9.2")]\r
-        public string CliVersion {\r
+        public string hb_version {\r
             get {\r
-                return ((string)(this["CliVersion"]));\r
+                return ((string)(this["hb_version"]));\r
             }\r
             set {\r
-                this["CliVersion"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
-        public string GuiDebug {\r
-            get {\r
-                return ((string)(this["GuiDebug"]));\r
-            }\r
-            set {\r
-                this["GuiDebug"] = value;\r
-            }\r
-        }\r
-        \r
-        [global::System.Configuration.UserScopedSettingAttribute()]\r
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("Program Error. Please enable debug more in: Tools > Options. If the error re-occu" +\r
-            "rs, please report it on the forums.")]\r
-        public string defaultError {\r
-            get {\r
-                return ((string)(this["defaultError"]));\r
-            }\r
-            set {\r
-                this["defaultError"] = value;\r
+                this["hb_version"] = value;\r
             }\r
         }\r
         \r
@@ -146,7 +121,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string defaultUserSettings {\r
             get {\r
                 return ((string)(this["defaultUserSettings"]));\r
@@ -159,12 +134,12 @@ namespace Handbrake.Properties {
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
         [global::System.Configuration.DefaultSettingValueAttribute("1000")]\r
-        public int build {\r
+        public int hb_build {\r
             get {\r
-                return ((int)(this["build"]));\r
+                return ((int)(this["hb_build"]));\r
             }\r
             set {\r
-                this["build"] = value;\r
+                this["hb_build"] = value;\r
             }\r
         }\r
         \r
@@ -182,7 +157,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string updatePresets {\r
             get {\r
                 return ((string)(this["updatePresets"]));\r
@@ -194,7 +169,7 @@ namespace Handbrake.Properties {
         \r
         [global::System.Configuration.UserScopedSettingAttribute()]\r
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]\r
-        [global::System.Configuration.DefaultSettingValueAttribute("")]\r
+        [global::System.Configuration.DefaultSettingValueAttribute("Checked")]\r
         public string autoNaming {\r
             get {\r
                 return ((string)(this["autoNaming"]));\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 2479d16..9b60aea 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -17,15 +17,9 @@
     <Setting Name="verbose" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
-    <Setting Name="CliVersion" Type="System.String" Scope="User">\r
+    <Setting Name="hb_version" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">0.9.2</Value>\r
     </Setting>\r
-    <Setting Name="GuiDebug" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">Checked</Value>\r
-    </Setting>\r
-    <Setting Name="defaultError" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)">Program Error. Please enable debug more in: Tools &gt; Options. If the error re-occurs, please report it on the forums.</Value>\r
-    </Setting>\r
     <Setting Name="tooltipEnable" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
@@ -33,19 +27,19 @@
       <Value Profile="(Default)">Do Nothing</Value>\r
     </Setting>\r
     <Setting Name="defaultUserSettings" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
-    <Setting Name="build" Type="System.Int32" Scope="User">\r
+    <Setting Name="hb_build" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">1000</Value>\r
     </Setting>\r
     <Setting Name="skipversion" Type="System.Int32" Scope="User">\r
       <Value Profile="(Default)">0</Value>\r
     </Setting>\r
     <Setting Name="updatePresets" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="autoNaming" Type="System.String" Scope="User">\r
-      <Value Profile="(Default)" />\r
+      <Value Profile="(Default)">Checked</Value>\r
     </Setting>\r
     <Setting Name="autoNamePath" Type="System.String" Scope="User">\r
       <Value Profile="(Default)" />\r

diff --git a/win/C#/app.config b/win/C#/app.config
index e019fd4..a35ba75 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -22,15 +22,9 @@
             <setting name="verbose" serializeAs="String">\r
                 <value>Checked</value>\r
             </setting>\r
-            <setting name="CliVersion" serializeAs="String">\r
+            <setting name="hb_version" serializeAs="String">\r
                 <value>0.9.2</value>\r
             </setting>\r
-            <setting name="GuiDebug" serializeAs="String">\r
-                <value>Checked</value>\r
-            </setting>\r
-            <setting name="defaultError" serializeAs="String">\r
-                <value>Program Error. Please enable debug more in: Tools &gt; Options. If the error re-occurs, please report it on the forums.</value>\r
-            </setting>\r
             <setting name="tooltipEnable" serializeAs="String">\r
                 <value>Checked</value>\r
             </setting>\r
@@ -38,19 +32,19 @@
                 <value>Do Nothing</value>\r
             </setting>\r
             <setting name="defaultUserSettings" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
-            <setting name="build" serializeAs="String">\r
+            <setting name="hb_build" serializeAs="String">\r
                 <value>1000</value>\r
             </setting>\r
             <setting name="skipversion" serializeAs="String">\r
                 <value>0</value>\r
             </setting>\r
             <setting name="updatePresets" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="autoNaming" serializeAs="String">\r
-                <value />\r
+                <value>Checked</value>\r
             </setting>\r
             <setting name="autoNamePath" serializeAs="String">\r
                 <value />\r

diff --git a/win/C#/frmAbout.cs b/win/C#/frmAbout.cs
index fabcea6..ab1ed26 100644 (file)
--- a/win/C#/frmAbout.cs
+++ b/win/C#/frmAbout.cs
@@ -14,8 +14,8 @@ namespace Handbrake
         public frmAbout()\r
         {\r
             InitializeComponent();\r
-            Version.Text = Properties.Settings.Default.CliVersion;\r
-            lbl_build.Text = Properties.Settings.Default.build.ToString();\r
+            Version.Text = Properties.Settings.Default.hb_version;\r
+            lbl_build.Text = Properties.Settings.Default.hb_build.ToString();\r
         }\r
 \r
         private void btn_close_Click(object sender, EventArgs e)\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index cdfe818..8f7486c 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -31,7 +31,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();\r
             System.Windows.Forms.Label Label38;\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.File_Save = new System.Windows.Forms.SaveFileDialog();\r
             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);\r
@@ -315,7 +315,7 @@ namespace Handbrake
             this.btn_Browse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_Browse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Browse.Location = new System.Drawing.Point(549, 20);\r
+            this.btn_Browse.Location = new System.Drawing.Point(540, 19);\r
             this.btn_Browse.Name = "btn_Browse";\r
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 5;\r
@@ -330,7 +330,7 @@ namespace Handbrake
             this.btn_destBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_destBrowse.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_destBrowse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_destBrowse.Location = new System.Drawing.Point(549, 19);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(540, 18);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);\r
             this.btn_destBrowse.TabIndex = 2;\r
@@ -522,7 +522,7 @@ namespace Handbrake
             this.btn_setDefault.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_setDefault.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_setDefault.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_setDefault.Location = new System.Drawing.Point(113, 482);\r
+            this.btn_setDefault.Location = new System.Drawing.Point(115, 486);\r
             this.btn_setDefault.Name = "btn_setDefault";\r
             this.btn_setDefault.Size = new System.Drawing.Size(72, 22);\r
             this.btn_setDefault.TabIndex = 1;\r
@@ -1915,9 +1915,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle4.Format = "N0";\r
-            dataGridViewCellStyle4.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle4;\r
+            dataGridViewCellStyle1.Format = "N0";\r
+            dataGridViewCellStyle1.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -2049,7 +2049,7 @@ namespace Handbrake
             this.treeView_presets.FullRowSelect = true;\r
             this.treeView_presets.HideSelection = false;\r
             this.treeView_presets.ItemHeight = 17;\r
-            this.treeView_presets.Location = new System.Drawing.Point(8, 22);\r
+            this.treeView_presets.Location = new System.Drawing.Point(10, 23);\r
             this.treeView_presets.Name = "treeView_presets";\r
             this.treeView_presets.ShowLines = false;\r
             this.treeView_presets.Size = new System.Drawing.Size(177, 457);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 03e48ef..7a9a97d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -58,7 +58,7 @@ namespace Handbrake
             Application.DoEvents();\r
 \r
             // Set the Version number lable to the corect version.\r
-            Version.Text = "Version " + Properties.Settings.Default.CliVersion;\r
+            Version.Text = "Version " + Properties.Settings.Default.hb_version;\r
 \r
             // update the status\r
             if (Properties.Settings.Default.updateStatus == "Checked")\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index a3fb17a..39bc81a 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -30,7 +30,6 @@ namespace Handbrake
         {\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmOptions));\r
             this.check_verbose = new System.Windows.Forms.CheckBox();\r
-            this.check_guiDebug = new System.Windows.Forms.CheckBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
             this.drp_completeOption = new System.Windows.Forms.ComboBox();\r
             this.label5 = new System.Windows.Forms.Label();\r
@@ -49,16 +48,16 @@ namespace Handbrake
             this.label9 = new System.Windows.Forms.Label();\r
             this.label2 = new System.Windows.Forms.Label();\r
             this.tab_debug = new System.Windows.Forms.TabPage();\r
+            this.label3 = new System.Windows.Forms.Label();\r
+            this.drp_Priority = new System.Windows.Forms.ComboBox();\r
+            this.Label11 = new System.Windows.Forms.Label();\r
             this.label6 = new System.Windows.Forms.Label();\r
+            this.drp_processors = new System.Windows.Forms.ComboBox();\r
+            this.Label4 = new System.Windows.Forms.Label();\r
             this.label8 = new System.Windows.Forms.Label();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
             this.label7 = new System.Windows.Forms.Label();\r
             this.pathFinder = new System.Windows.Forms.FolderBrowserDialog();\r
-            this.drp_processors = new System.Windows.Forms.ComboBox();\r
-            this.Label4 = new System.Windows.Forms.Label();\r
-            this.Label11 = new System.Windows.Forms.Label();\r
-            this.drp_Priority = new System.Windows.Forms.ComboBox();\r
-            this.label3 = new System.Windows.Forms.Label();\r
             this.tab_options.SuspendLayout();\r
             this.tab_general.SuspendLayout();\r
             this.tabPage1.SuspendLayout();\r
@@ -70,26 +69,14 @@ namespace Handbrake
             // \r
             this.check_verbose.AutoSize = true;\r
             this.check_verbose.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_verbose.Location = new System.Drawing.Point(16, 152);\r
+            this.check_verbose.Location = new System.Drawing.Point(16, 127);\r
             this.check_verbose.Name = "check_verbose";\r
-            this.check_verbose.Size = new System.Drawing.Size(139, 17);\r
+            this.check_verbose.Size = new System.Drawing.Size(32, 17);\r
             this.check_verbose.TabIndex = 51;\r
-            this.check_verbose.Text = "Enable Verbose CLI";\r
+            this.check_verbose.Text = "s";\r
             this.check_verbose.UseVisualStyleBackColor = true;\r
             this.check_verbose.CheckedChanged += new System.EventHandler(this.check_verbose_CheckedChanged);\r
             // \r
-            // check_guiDebug\r
-            // \r
-            this.check_guiDebug.AutoSize = true;\r
-            this.check_guiDebug.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_guiDebug.Location = new System.Drawing.Point(16, 129);\r
-            this.check_guiDebug.Name = "check_guiDebug";\r
-            this.check_guiDebug.Size = new System.Drawing.Size(131, 17);\r
-            this.check_guiDebug.TabIndex = 52;\r
-            this.check_guiDebug.Text = "Enable GUI Debug";\r
-            this.check_guiDebug.UseVisualStyleBackColor = true;\r
-            this.check_guiDebug.CheckedChanged += new System.EventHandler(this.check_guiDebug_CheckedChanged);\r
-            // \r
             // btn_close\r
             // \r
             this.btn_close.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -308,7 +295,6 @@ namespace Handbrake
             this.tab_debug.Controls.Add(this.label3);\r
             this.tab_debug.Controls.Add(this.drp_Priority);\r
             this.tab_debug.Controls.Add(this.check_verbose);\r
-            this.tab_debug.Controls.Add(this.check_guiDebug);\r
             this.tab_debug.Controls.Add(this.Label11);\r
             this.tab_debug.Controls.Add(this.label6);\r
             this.tab_debug.Controls.Add(this.drp_processors);\r
@@ -320,6 +306,44 @@ namespace Handbrake
             this.tab_debug.Text = "Debug && Process";\r
             this.tab_debug.UseVisualStyleBackColor = true;\r
             // \r
+            // label3\r
+            // \r
+            this.label3.AutoSize = true;\r
+            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label3.Location = new System.Drawing.Point(13, 13);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(176, 13);\r
+            this.label3.TabIndex = 44;\r
+            this.label3.Text = "Process(or) Configuration";\r
+            // \r
+            // drp_Priority\r
+            // \r
+            this.drp_Priority.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.drp_Priority.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.drp_Priority.FormattingEnabled = true;\r
+            this.drp_Priority.Items.AddRange(new object[] {\r
+            "Realtime",\r
+            "High",\r
+            "Above Normal",\r
+            "Normal",\r
+            "Below Normal",\r
+            "Low"});\r
+            this.drp_Priority.Location = new System.Drawing.Point(163, 68);\r
+            this.drp_Priority.Name = "drp_Priority";\r
+            this.drp_Priority.Size = new System.Drawing.Size(111, 21);\r
+            this.drp_Priority.TabIndex = 43;\r
+            this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);\r
+            // \r
+            // Label11\r
+            // \r
+            this.Label11.AutoSize = true;\r
+            this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.Label11.Location = new System.Drawing.Point(15, 44);\r
+            this.Label11.Name = "Label11";\r
+            this.Label11.Size = new System.Drawing.Size(142, 13);\r
+            this.Label11.TabIndex = 40;\r
+            this.Label11.Text = "Number of processors: ";\r
+            // \r
             // label6\r
             // \r
             this.label6.AutoSize = true;\r
@@ -330,34 +354,6 @@ namespace Handbrake
             this.label6.TabIndex = 1;\r
             this.label6.Text = "Verbose and Debug mode";\r
             // \r
-            // label8\r
-            // \r
-            this.label8.AutoSize = true;\r
-            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(50, 24);\r
-            this.label8.Name = "label8";\r
-            this.label8.Size = new System.Drawing.Size(131, 13);\r
-            this.label8.TabIndex = 61;\r
-            this.label8.Text = "Handbrake Options";\r
-            // \r
-            // pictureBox2\r
-            // \r
-            this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
-            this.pictureBox2.Location = new System.Drawing.Point(12, 12);\r
-            this.pictureBox2.Name = "pictureBox2";\r
-            this.pictureBox2.Size = new System.Drawing.Size(32, 32);\r
-            this.pictureBox2.TabIndex = 60;\r
-            this.pictureBox2.TabStop = false;\r
-            // \r
-            // label7\r
-            // \r
-            this.label7.AutoSize = true;\r
-            this.label7.Location = new System.Drawing.Point(50, 39);\r
-            this.label7.Name = "label7";\r
-            this.label7.Size = new System.Drawing.Size(146, 13);\r
-            this.label7.TabIndex = 59;\r
-            this.label7.Text = "Modify program options.";\r
-            // \r
             // drp_processors\r
             // \r
             this.drp_processors.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
@@ -389,43 +385,33 @@ namespace Handbrake
             this.Label4.TabIndex = 42;\r
             this.Label4.Text = "Default Priority Level:";\r
             // \r
-            // Label11\r
+            // label8\r
             // \r
-            this.Label11.AutoSize = true;\r
-            this.Label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label11.Location = new System.Drawing.Point(15, 44);\r
-            this.Label11.Name = "Label11";\r
-            this.Label11.Size = new System.Drawing.Size(142, 13);\r
-            this.Label11.TabIndex = 40;\r
-            this.Label11.Text = "Number of processors: ";\r
+            this.label8.AutoSize = true;\r
+            this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label8.Location = new System.Drawing.Point(50, 24);\r
+            this.label8.Name = "label8";\r
+            this.label8.Size = new System.Drawing.Size(131, 13);\r
+            this.label8.TabIndex = 61;\r
+            this.label8.Text = "Handbrake Options";\r
             // \r
-            // drp_Priority\r
+            // pictureBox2\r
             // \r
-            this.drp_Priority.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.drp_Priority.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.drp_Priority.FormattingEnabled = true;\r
-            this.drp_Priority.Items.AddRange(new object[] {\r
-            "Realtime",\r
-            "High",\r
-            "Above Normal",\r
-            "Normal",\r
-            "Below Normal",\r
-            "Low"});\r
-            this.drp_Priority.Location = new System.Drawing.Point(163, 68);\r
-            this.drp_Priority.Name = "drp_Priority";\r
-            this.drp_Priority.Size = new System.Drawing.Size(111, 21);\r
-            this.drp_Priority.TabIndex = 43;\r
-            this.drp_Priority.SelectedIndexChanged += new System.EventHandler(this.drp_Priority_SelectedIndexChanged);\r
+            this.pictureBox2.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
+            this.pictureBox2.Location = new System.Drawing.Point(12, 12);\r
+            this.pictureBox2.Name = "pictureBox2";\r
+            this.pictureBox2.Size = new System.Drawing.Size(32, 32);\r
+            this.pictureBox2.TabIndex = 60;\r
+            this.pictureBox2.TabStop = false;\r
             // \r
-            // label3\r
+            // label7\r
             // \r
-            this.label3.AutoSize = true;\r
-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(13, 13);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(176, 13);\r
-            this.label3.TabIndex = 44;\r
-            this.label3.Text = "Process(or) Configuration";\r
+            this.label7.AutoSize = true;\r
+            this.label7.Location = new System.Drawing.Point(50, 39);\r
+            this.label7.Name = "label7";\r
+            this.label7.Size = new System.Drawing.Size(146, 13);\r
+            this.label7.TabIndex = 59;\r
+            this.label7.Text = "Modify program options.";\r
             // \r
             // frmOptions\r
             // \r
@@ -461,7 +447,6 @@ namespace Handbrake
 \r
         internal System.Windows.Forms.CheckBox check_verbose;\r
         internal System.Windows.Forms.Button btn_close;\r
-        internal System.Windows.Forms.CheckBox check_guiDebug;\r
         internal System.Windows.Forms.ComboBox drp_completeOption;\r
         internal System.Windows.Forms.Label label5;\r
         private System.Windows.Forms.TabControl tab_options;\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index 7d12e1d..42e5b04 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -34,11 +34,6 @@ namespace Handbrake
                 check_verbose.CheckState = CheckState.Checked;\r
             }\r
 \r
-            if (Properties.Settings.Default.GuiDebug == "Checked")\r
-            {\r
-                check_guiDebug.CheckState = CheckState.Checked;\r
-            }\r
-\r
             if (Properties.Settings.Default.tooltipEnable == "Checked")\r
             {\r
                 check_tooltip.CheckState = CheckState.Checked;\r
@@ -92,11 +87,6 @@ namespace Handbrake
             this.Close();\r
         }\r
 \r
-        private void check_guiDebug_CheckedChanged(object sender, EventArgs e)\r
-        {\r
-            Properties.Settings.Default.GuiDebug = check_guiDebug.CheckState.ToString();\r
-        }\r
-\r
         private void check_tooltip_CheckedChanged(object sender, EventArgs e)\r
         {\r
             Properties.Settings.Default.tooltipEnable = check_tooltip.CheckState.ToString();\r
@@ -136,7 +126,7 @@ namespace Handbrake
 \r
 \r
 \r
-        \r
+\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 49197ea..6ab8205 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -27,7 +27,7 @@ namespace Handbrake
             this.mainWindow = parent;\r
             this.dvdInfo = dvdInfoWindow;\r
             startScan();\r
-            \r
+\r
         }\r
 \r
         private void startScan()\r
@@ -39,17 +39,10 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("frmReadDVD.cs - startScan " + exc.ToString());\r
-                }\r
-                else\r
-                {\r
-                    MessageBox.Show(Properties.Settings.Default.defaultError.ToString());\r
-                }\r
+                MessageBox.Show("frmReadDVD.cs - startScan " + exc.ToString());\r
             }\r
         }\r
-   \r
+\r
         private void updateUIElements()\r
         {\r
             try\r
@@ -67,19 +60,12 @@ namespace Handbrake
                 mainWindow.drp_dvdtitle.Text = "Automatic";\r
                 mainWindow.drop_chapterFinish.Text = "Auto";\r
                 mainWindow.drop_chapterStart.Text = "Auto";\r
-  \r
+\r
                 this.Close();\r
             }\r
-            catch(Exception exc)\r
+            catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("frmReadDVD.cs - updateUIElements " + exc.ToString());\r
-                }\r
-                else\r
-                {\r
-                    MessageBox.Show(Properties.Settings.Default.defaultError.ToString());\r
-                }\r
+                MessageBox.Show("frmReadDVD.cs - updateUIElements " + exc.ToString());\r
             }\r
         }\r
 \r
@@ -89,14 +75,14 @@ namespace Handbrake
         {\r
             try\r
             {\r
-                string appPath = Application.StartupPath.ToString()+ "\\";\r
+                string appPath = Application.StartupPath.ToString() + "\\";\r
                 string strCmdLine = "cmd /c " + '"' + '"' + appPath + "HandBrakeCLI.exe" + '"' + " -i " + '"' + inputFile + '"' + " -t0 -v >" + '"' + appPath + "dvdinfo.dat" + '"' + " 2>&1" + '"';\r
                 Process hbproc = Process.Start("CMD.exe", strCmdLine);\r
                 hbproc.WaitForExit();\r
                 hbproc.Dispose();\r
                 hbproc.Close();\r
 \r
-          \r
+\r
                 StreamReader sr = new StreamReader(appPath + "dvdinfo.dat");\r
                 thisDvd = Parsing.DVD.Parse(sr);\r
                 sr.Close();\r
@@ -105,14 +91,7 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                if (Properties.Settings.Default.GuiDebug == "Checked")\r
-                {\r
-                    MessageBox.Show("frmReadDVD.cs - startProc " + exc.ToString());\r
-                }\r
-                else\r
-                {\r
-                    MessageBox.Show(Properties.Settings.Default.defaultError.ToString());\r
-                }\r
+                MessageBox.Show("frmReadDVD.cs - startProc " + exc.ToString());\r
             }\r
 \r
         }\r

diff --git a/win/C#/frmUpdater.cs b/win/C#/frmUpdater.cs
index 82fe2f3..05598b3 100644 (file)
--- a/win/C#/frmUpdater.cs
+++ b/win/C#/frmUpdater.cs
@@ -24,7 +24,7 @@ namespace Handbrake
 \r
         private void setVersions()\r
         {\r
-            lbl_oldVersion.Text = "(you have: " + Properties.Settings.Default.CliVersion + " / " + Properties.Settings.Default.build  + ").";\r
+            lbl_oldVersion.Text = "(you have: " + Properties.Settings.Default.hb_version + " / " + Properties.Settings.Default.hb_build  + ").";\r
             lbl_newVersion.Text = rssRead.version() + " (" + rssRead.build() + ")";\r
         }\r
 \r