WinGui:

- Gui debug more added to tools > options.
- More exception handling added
- frmReadDVD is now automatic. User no longer has to manually start scan process.
- Re-enabled onwindow scan status message. Removed Message box which alerts scan status.
- Few other small code tweaks.

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 33ad098..2898dbc 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -25,14 +25,17 @@
     <LangVersion>default</LangVersion>\r
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>\r
     <NoStdLib>false</NoStdLib>\r
+    <DocumentationFile>\r
+    </DocumentationFile>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
+    <Optimize>false</Optimize>\r
     <OutputPath>bin\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>\r
   </PropertyGroup>\r
   <ItemGroup>\r
     <Reference Include="System" />\r

diff --git a/win/C#/Parsing/AudioTrack.cs b/win/C#/Parsing/AudioTrack.cs
index 98114a5..22861b9 100644 (file)
--- a/win/C#/Parsing/AudioTrack.cs
+++ b/win/C#/Parsing/AudioTrack.cs
@@ -98,12 +98,12 @@ namespace Handbrake.Parsing
             if (m.Success)\r
             {\r
                 AudioTrack thisTrack = new AudioTrack();\r
-                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value);\r
+                thisTrack.m_trackNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
                 thisTrack.m_language = m.Groups[2].Value;\r
                 thisTrack.m_format = m.Groups[3].Value;\r
                 thisTrack.m_subFormat = m.Groups[4].Value;\r
-                thisTrack.m_frequency = int.Parse(m.Groups[5].Value);\r
-                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value);\r
+                thisTrack.m_frequency = int.Parse(m.Groups[5].Value.Trim().ToString());\r
+                thisTrack.m_bitrate = int.Parse(m.Groups[6].Value.Trim().ToString());\r
                 return thisTrack;\r
             }\r
             else\r

diff --git a/win/C#/Parsing/Chapter.cs b/win/C#/Parsing/Chapter.cs
index 665841e..6496354 100644 (file)
--- a/win/C#/Parsing/Chapter.cs
+++ b/win/C#/Parsing/Chapter.cs
@@ -50,7 +50,7 @@ namespace Handbrake.Parsing
             if (m.Success)\r
             {\r
                 Chapter thisChapter = new Chapter();\r
-                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value);\r
+                thisChapter.m_chapterNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
                 thisChapter.m_duration = TimeSpan.Parse(m.Groups[5].Value);\r
                 return thisChapter;\r
             }\r

diff --git a/win/C#/Parsing/Subtitle.cs b/win/C#/Parsing/Subtitle.cs
index a30fd78..8fb889f 100644 (file)
--- a/win/C#/Parsing/Subtitle.cs
+++ b/win/C#/Parsing/Subtitle.cs
@@ -51,7 +51,7 @@ namespace Handbrake.Parsing
             if (m.Success && !curLine.Contains("HandBrake has exited."))\r
             {\r
                 Subtitle thisSubtitle = new Subtitle();\r
-                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value);\r
+                thisSubtitle.m_trackNumber = int.Parse(m.Groups[1].Value.Trim().ToString());\r
                 thisSubtitle.m_language = m.Groups[2].Value;\r
                 return thisSubtitle;\r
             }\r

diff --git a/win/C#/Parsing/Title.cs b/win/C#/Parsing/Title.cs
index 1611f5c..16c032e 100644 (file)
--- a/win/C#/Parsing/Title.cs
+++ b/win/C#/Parsing/Title.cs
@@ -134,6 +134,14 @@ namespace Handbrake.Parsing
                     this.m_duration.Minutes, this.m_duration.Seconds);\r
         }\r
 \r
+\r
+        /*\r
+         * \r
+         * There is some pretty extensive exception handling in here. A number of people have been seeing random problems.\r
+         * It just helps pinpointing which line of code is causing the issue.\r
+         * Can be cut down at a later date.\r
+         * \r
+         */\r
         public static Title Parse(StringReader output)\r
         {\r
             Title thisTitle = new Title();\r
@@ -145,15 +153,20 @@ namespace Handbrake.Parsing
                     // Match track number for this title\r
                     if (m.Success)\r
                     {\r
-                        thisTitle.m_titleNumber = int.Parse(m.Groups[1].Value);\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
-                    output.ReadLine();\r
-                }\r
+                                    }\r
                 catch (Exception exc)\r
                 {\r
-                    MessageBox.Show("Title.cs - Track Number " + exc.ToString());\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Track Number " + exc.ToString());\r
+                    }\r
                 }\r
-  \r
+\r
+                output.ReadLine();\r
 \r
                 // Get duration for this title\r
                 try\r
@@ -166,7 +179,10 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    MessageBox.Show("Title.cs - Duration " + exc.ToString());\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Duration " + exc.ToString());\r
+                    }\r
                 }\r
 \r
                 try\r
@@ -182,7 +198,10 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    MessageBox.Show("Title.cs - Resolution and Aspect " + exc.ToString());\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Resolution and Aspect " + exc.ToString());\r
+                    }\r
                 }\r
 \r
                 try\r
@@ -196,24 +215,55 @@ namespace Handbrake.Parsing
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    MessageBox.Show("Title.cs - Auto Crop " + exc.ToString());\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Auto Crop " + exc.ToString());\r
+                    }\r
                 }\r
 \r
 \r
                 try\r
                 {\r
                     thisTitle.m_chapters.AddRange(Chapter.ParseList(output));\r
+                }\r
+                catch (Exception exc)\r
+                {\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Chapters EXC " + exc.ToString());\r
+                    }\r
+                }\r
+\r
+                try\r
+                {\r
                     thisTitle.m_audioTracks.AddRange(AudioTrack.ParseList(output));\r
+                }\r
+                catch (Exception exc)\r
+                {\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Audio EXC " + exc.ToString());\r
+                    }\r
+                }\r
+\r
+                try\r
+                {\r
                     thisTitle.m_subtitles.AddRange(Subtitle.ParseList(output));\r
                 }\r
                 catch (Exception exc)\r
                 {\r
-                    MessageBox.Show("Title.cs - Chapters / Audio / Subtitles " + exc.ToString());\r
+                    if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                    {\r
+                        MessageBox.Show("Title.cs - Subtitles EXC " + exc.ToString());\r
+                    }\r
                 }\r
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("Title.cs - Parse " + exc.ToString());\r
+                if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                {\r
+                    MessageBox.Show("Title.cs - Parse " + exc.ToString());\r
+                }\r
             }\r
      \r
         \r
@@ -233,7 +283,10 @@ namespace Handbrake.Parsing
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("Title.cs - ParseList " + exc.ToString());\r
+                if (Properties.Settings.Default.GuiDebug == "Checked")\r
+                {\r
+                    MessageBox.Show("Title.cs - ParseList " + exc.ToString());\r
+                }\r
             }\r
             return titles.ToArray();\r
         }\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index 6af0e19..ed9c1d1 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Resources;
 //\r
 [assembly: AssemblyVersion("2.4.0.1")]\r
 [assembly: AssemblyFileVersion("2.4.0.1")]\r
-[assembly: NeutralResourcesLanguageAttribute("en-GB")]\r
+[assembly: NeutralResourcesLanguageAttribute("")]\r

diff --git a/win/C#/Properties/Settings.Designer.cs b/win/C#/Properties/Settings.Designer.cs
index fb25c38..aecb259 100644 (file)
--- a/win/C#/Properties/Settings.Designer.cs
+++ b/win/C#/Properties/Settings.Designer.cs
@@ -537,5 +537,30 @@ namespace Handbrake.Properties {
                 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
+            }\r
+        }\r
     }\r
 }\r

diff --git a/win/C#/Properties/Settings.settings b/win/C#/Properties/Settings.settings
index 8cdfa64..d518d78 100644 (file)
--- a/win/C#/Properties/Settings.settings
+++ b/win/C#/Properties/Settings.settings
@@ -131,5 +131,11 @@
     <Setting Name="CliVersion" Type="System.String" Scope="User">\r
       <Value Profile="(Default)">0.9.1</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
   </Settings>\r
 </SettingsFile>
\ No newline at end of file

diff --git a/win/C#/app.config b/win/C#/app.config
index 9453e43..46f1a7d 100644 (file)
--- a/win/C#/app.config
+++ b/win/C#/app.config
@@ -133,6 +133,12 @@
             <setting name="CliVersion" serializeAs="String">\r
                 <value>0.9.1</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
         </Handbrake.Properties.Settings>\r
     </userSettings>\r
 </configuration>
\ No newline at end of file

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 04b0c45..76e8b36 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -268,7 +268,7 @@ namespace Handbrake
             // \r
             this.RadioISO.AutoSize = true;\r
             this.RadioISO.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioISO.Location = new System.Drawing.Point(358, 34);\r
+            this.RadioISO.Location = new System.Drawing.Point(487, 33);\r
             this.RadioISO.Name = "RadioISO";\r
             this.RadioISO.Size = new System.Drawing.Size(44, 17);\r
             this.RadioISO.TabIndex = 19;\r
@@ -282,7 +282,7 @@ namespace Handbrake
             this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_source.Location = new System.Drawing.Point(99, 22);\r
             this.text_source.Name = "text_source";\r
-            this.text_source.Size = new System.Drawing.Size(253, 21);\r
+            this.text_source.Size = new System.Drawing.Size(294, 21);\r
             this.text_source.TabIndex = 1;\r
             this.text_source.Text = "Click \'Browse\' to continue";\r
             this.ToolTip.SetToolTip(this.text_source, "The input source location.");\r
@@ -293,7 +293,7 @@ namespace Handbrake
             this.text_destination.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_destination.Location = new System.Drawing.Point(99, 21);\r
             this.text_destination.Name = "text_destination";\r
-            this.text_destination.Size = new System.Drawing.Size(262, 21);\r
+            this.text_destination.Size = new System.Drawing.Size(294, 21);\r
             this.text_destination.TabIndex = 4;\r
             this.ToolTip.SetToolTip(this.text_destination, "Location where the enoceded file will be saved.");\r
             // \r
@@ -303,7 +303,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(424, 22);\r
+            this.btn_Browse.Location = new System.Drawing.Point(399, 22);\r
             this.btn_Browse.Name = "btn_Browse";\r
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 2;\r
@@ -341,7 +341,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(370, 21);\r
+            this.btn_destBrowse.Location = new System.Drawing.Point(399, 21);\r
             this.btn_destBrowse.Name = "btn_destBrowse";\r
             this.btn_destBrowse.Size = new System.Drawing.Size(83, 22);\r
             this.btn_destBrowse.TabIndex = 4;\r
@@ -460,7 +460,7 @@ namespace Handbrake
             // ISO_Open\r
             // \r
             this.ISO_Open.DefaultExt = "ISO";\r
-            this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.mpeg;*.vob;*.ts";\r
+            this.ISO_Open.Filter = "All Supported Files|*.iso;*.mpg;*.m2t;*.vob;*.ts;*.mpeg;";\r
             this.ISO_Open.SupportMultiDottedExtensions = true;\r
             // \r
             // FileToolStripMenuItem\r
@@ -822,7 +822,7 @@ namespace Handbrake
             // \r
             // frmMainMenu\r
             // \r
-            this.frmMainMenu.BackColor = System.Drawing.SystemColors.Control;\r
+            this.frmMainMenu.BackColor = System.Drawing.SystemColors.ControlLight;\r
             this.frmMainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.FileToolStripMenuItem,\r
             this.ToolsToolStripMenuItem,\r
@@ -830,7 +830,7 @@ namespace Handbrake
             this.HelpToolStripMenuItem});\r
             this.frmMainMenu.Location = new System.Drawing.Point(0, 0);\r
             this.frmMainMenu.Name = "frmMainMenu";\r
-            this.frmMainMenu.Size = new System.Drawing.Size(675, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(676, 24);\r
             this.frmMainMenu.TabIndex = 1;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
@@ -883,7 +883,7 @@ namespace Handbrake
             this.RadioDVD.AutoSize = true;\r
             this.RadioDVD.Checked = true;\r
             this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioDVD.Location = new System.Drawing.Point(358, 18);\r
+            this.RadioDVD.Location = new System.Drawing.Point(487, 17);\r
             this.RadioDVD.Name = "RadioDVD";\r
             this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
             this.RadioDVD.TabIndex = 20;\r
@@ -1081,10 +1081,10 @@ namespace Handbrake
             // lbl_encode\r
             // \r
             this.lbl_encode.AutoSize = true;\r
-            this.lbl_encode.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_encode.Location = new System.Drawing.Point(12, 571);\r
             this.lbl_encode.Name = "lbl_encode";\r
-            this.lbl_encode.Size = new System.Drawing.Size(96, 13);\r
+            this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
             this.lbl_encode.TabIndex = 418;\r
             this.lbl_encode.Text = "Encoding started...";\r
             this.lbl_encode.Visible = false;\r
@@ -1938,7 +1938,7 @@ namespace Handbrake
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(675, 621);\r
+            this.ClientSize = new System.Drawing.Size(676, 621);\r
             this.Controls.Add(this.btn_eCancel);\r
             this.Controls.Add(this.lbl_encode);\r
             this.Controls.Add(this.lbl_update);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 1df5d7f..58ccc7d 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -1019,10 +1019,8 @@ namespace Handbrake
 \r
         private void btn_encode_Click(object sender, EventArgs e)\r
         {\r
-            btn_eCancel.Enabled = true;\r
-            String query = "";\r
-            lbl_encode.Visible = false;\r
- \r
+            //btn_eCancel.Enabled = true;\r
+            String query = "";            \r
             if (QueryEditorText.Text == "")\r
             {\r
                 query = GenerateTheQuery();\r
@@ -1033,7 +1031,8 @@ namespace Handbrake
             }\r
 \r
             ThreadPool.QueueUserWorkItem(procMonitor, query);\r
-            lbl_encode.Text = "Encoding Started";\r
+            lbl_encode.Visible = true;\r
+            lbl_encode.Text = "Encoding in Progress";\r
         }\r
 \r
         private void btn_eCancel_Click(object sender, EventArgs e)\r
@@ -1053,7 +1052,6 @@ namespace Handbrake
             else\r
             {\r
                 hbProc = process.runCli(this, (string)state, false, false, false, false);\r
-                MessageBox.Show("The encode process has now started.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
                 hbProc.WaitForExit();\r
 \r
                 try\r
@@ -1083,13 +1081,25 @@ namespace Handbrake
                     // Do nothing\r
                 }\r
 \r
-                MessageBox.Show("The encode process has now ended.", "Status", MessageBoxButtons.OK, MessageBoxIcon.Asterisk);\r
+\r
+                setEncodeLabel();\r
                 hbProc = null;\r
             }\r
         }\r
+        private delegate void UpdateUIHandler();\r
+        private void setEncodeLabel()\r
+        {\r
+            if (this.InvokeRequired)\r
+            {\r
+                this.BeginInvoke(new UpdateUIHandler(setEncodeLabel));\r
+                return;\r
+            }\r
+            lbl_encode.Text = "Encoding Finished";\r
+        }\r
 \r
-        private void encode_OnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
+        /*private void encode_OnEncodeProgress(object Sender, int CurrentTask, int TaskCount, float PercentComplete, float CurrentFps, float AverageFps, TimeSpan TimeRemaining)\r
         {\r
+            \r
             if (this.InvokeRequired)\r
             {\r
                 this.BeginInvoke(new Parsing.EncodeProgressEventHandler(encode_OnEncodeProgress),\r
@@ -1097,7 +1107,7 @@ namespace Handbrake
                 return;\r
             }\r
             lbl_encode.Text = string.Format("Encode Progress: {0}%,       FPS: {1},       Avg FPS: {2},       Time Remaining: {3} ", PercentComplete, CurrentFps, AverageFps, TimeRemaining);\r
-        }\r
+        }*/\r
 \r
         #endregion\r
 \r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 40b2e2d..e868095 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -42,6 +42,7 @@ namespace Handbrake
             this.Label11 = new System.Windows.Forms.Label();\r
             this.GroupBox3 = new System.Windows.Forms.GroupBox();\r
             this.GroupBox1 = new System.Windows.Forms.GroupBox();\r
+            this.check_guiDebug = new System.Windows.Forms.CheckBox();\r
             this.btn_close = new System.Windows.Forms.Button();\r
             this.GroupBox2.SuspendLayout();\r
             this.GroupBox3.SuspendLayout();\r
@@ -141,9 +142,9 @@ namespace Handbrake
             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(20, 31);\r
             this.check_verbose.Name = "check_verbose";\r
-            this.check_verbose.Size = new System.Drawing.Size(71, 17);\r
+            this.check_verbose.Size = new System.Drawing.Size(139, 17);\r
             this.check_verbose.TabIndex = 51;\r
-            this.check_verbose.Text = "Enabled";\r
+            this.check_verbose.Text = "Enable Verbose CLI";\r
             this.check_verbose.UseVisualStyleBackColor = true;\r
             this.check_verbose.CheckedChanged += new System.EventHandler(this.check_verbose_CheckedChanged);\r
             // \r
@@ -201,6 +202,7 @@ namespace Handbrake
             // GroupBox1\r
             // \r
             this.GroupBox1.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.GroupBox1.Controls.Add(this.check_guiDebug);\r
             this.GroupBox1.Controls.Add(this.check_verbose);\r
             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox1.Location = new System.Drawing.Point(13, 283);\r
@@ -208,7 +210,19 @@ namespace Handbrake
             this.GroupBox1.Size = new System.Drawing.Size(386, 70);\r
             this.GroupBox1.TabIndex = 54;\r
             this.GroupBox1.TabStop = false;\r
-            this.GroupBox1.Text = "Verbose Mode";\r
+            this.GroupBox1.Text = "Verbose && Debug Mode";\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(187, 31);\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
@@ -266,5 +280,6 @@ namespace Handbrake
         internal System.Windows.Forms.GroupBox GroupBox3;\r
         internal System.Windows.Forms.GroupBox GroupBox1;\r
         internal System.Windows.Forms.Button btn_close;\r
+        internal System.Windows.Forms.CheckBox check_guiDebug;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index fc2e152..b0bab68 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -32,6 +32,11 @@ namespace Handbrake
             {\r
                 check_verbose.CheckState = CheckState.Checked;\r
             }\r
+\r
+            if (Properties.Settings.Default.GuiDebug == "Checked")\r
+            {\r
+                check_guiDebug.CheckState = CheckState.Checked;\r
+            }\r
         }\r
 \r
         private void check_updateCheck_CheckedChanged(object sender, EventArgs e)\r
@@ -64,5 +69,12 @@ namespace Handbrake
             Properties.Settings.Default.Save(); // Small hack for Vista. Seems to work fine on XP without this\r
             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
+\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 62e32d3..8e59e11 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -71,6 +71,7 @@ namespace Handbrake
                 return;\r
             }\r
             this.list_queue.Items.RemoveAt(0);\r
+\r
             progressBar.PerformStep();\r
             lbl_progressValue.Text = string.Format("{0} %", progressBar.Value);\r
             progressBar.Update();\r
@@ -93,6 +94,8 @@ namespace Handbrake
          * Code to Re-arrange / Delete items from the Queue\r
          * \r
          */\r
+        #region Queue Management\r
+\r
         private void btn_up_Click(object sender, EventArgs e)\r
         {\r
             int count = list_queue.Items.Count;\r
@@ -133,6 +136,7 @@ namespace Handbrake
             if (started == true)\r
                 initialListCount--;\r
         }\r
+        #endregion\r
 \r
         /*\r
          * Hide the Queue Window\r

diff --git a/win/C#/frmReadDVD.Designer.cs b/win/C#/frmReadDVD.Designer.cs
index c71d46d..6c3a254 100644 (file)
--- a/win/C#/frmReadDVD.Designer.cs
+++ b/win/C#/frmReadDVD.Designer.cs
@@ -29,41 +29,12 @@ namespace Handbrake
         private void InitializeComponent()\r
         {\r
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmReadDVD));\r
-            this.lbl_pressOk = new System.Windows.Forms.Label();\r
-            this.btn_ok = new System.Windows.Forms.Button();\r
             this.Label3 = new System.Windows.Forms.Label();\r
             this.Label2 = new System.Windows.Forms.Label();\r
             this.lbl_status = new System.Windows.Forms.Label();\r
             this.lbl_progress = new System.Windows.Forms.Label();\r
-            this.btn_skip = new System.Windows.Forms.Button();\r
             this.SuspendLayout();\r
             // \r
-            // lbl_pressOk\r
-            // \r
-            this.lbl_pressOk.AutoSize = true;\r
-            this.lbl_pressOk.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_pressOk.Location = new System.Drawing.Point(77, 61);\r
-            this.lbl_pressOk.Name = "lbl_pressOk";\r
-            this.lbl_pressOk.Size = new System.Drawing.Size(178, 13);\r
-            this.lbl_pressOk.TabIndex = 29;\r
-            this.lbl_pressOk.Text = "Press OK to start the process.";\r
-            // \r
-            // btn_ok\r
-            // \r
-            this.btn_ok.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_ok.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_ok.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_ok.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_ok.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_ok.Location = new System.Drawing.Point(351, 56);\r
-            this.btn_ok.Name = "btn_ok";\r
-            this.btn_ok.Size = new System.Drawing.Size(71, 22);\r
-            this.btn_ok.TabIndex = 28;\r
-            this.btn_ok.TabStop = false;\r
-            this.btn_ok.Text = "OK";\r
-            this.btn_ok.UseVisualStyleBackColor = false;\r
-            this.btn_ok.Click += new System.EventHandler(this.btn_ok_Click);\r
-            // \r
             // Label3\r
             // \r
             this.Label3.AutoSize = true;\r
@@ -106,36 +77,15 @@ namespace Handbrake
             this.lbl_progress.Text = "{ % }";\r
             this.lbl_progress.Visible = false;\r
             // \r
-            // btn_skip\r
-            // \r
-            this.btn_skip.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.btn_skip.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
-            this.btn_skip.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
-            this.btn_skip.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.btn_skip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_skip.Location = new System.Drawing.Point(351, 4);\r
-            this.btn_skip.Name = "btn_skip";\r
-            this.btn_skip.Size = new System.Drawing.Size(71, 22);\r
-            this.btn_skip.TabIndex = 33;\r
-            this.btn_skip.TabStop = false;\r
-            this.btn_skip.Text = "Cancel";\r
-            this.btn_skip.UseVisualStyleBackColor = false;\r
-            this.btn_skip.Visible = false;\r
-            this.btn_skip.Click += new System.EventHandler(this.btn_skip_Click);\r
-            // \r
             // frmReadDVD\r
             // \r
-            this.AcceptButton = this.btn_ok;\r
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.ClientSize = new System.Drawing.Size(434, 88);\r
+            this.ClientSize = new System.Drawing.Size(346, 70);\r
             this.ControlBox = false;\r
-            this.Controls.Add(this.btn_skip);\r
             this.Controls.Add(this.lbl_progress);\r
             this.Controls.Add(this.lbl_status);\r
-            this.Controls.Add(this.lbl_pressOk);\r
-            this.Controls.Add(this.btn_ok);\r
             this.Controls.Add(this.Label3);\r
             this.Controls.Add(this.Label2);\r
             this.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -155,12 +105,9 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        internal System.Windows.Forms.Label lbl_pressOk;\r
-        internal System.Windows.Forms.Button btn_ok;\r
         internal System.Windows.Forms.Label Label3;\r
         internal System.Windows.Forms.Label Label2;\r
         internal System.Windows.Forms.Label lbl_status;\r
         private System.Windows.Forms.Label lbl_progress;\r
-        internal System.Windows.Forms.Button btn_skip;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmReadDVD.cs b/win/C#/frmReadDVD.cs
index 526e9bd..f697e34 100644 (file)
--- a/win/C#/frmReadDVD.cs
+++ b/win/C#/frmReadDVD.cs
@@ -28,28 +28,34 @@ namespace Handbrake
             this.inputFile = inputFile;\r
             this.mainWindow = parent;\r
             this.dvdInfo = dvdInfoWindow;\r
+            startScan();\r
+            \r
         }\r
 \r
-        private void btn_ok_Click(object sender, EventArgs e)\r
+        private void startScan()\r
         {\r
-      \r
             try\r
             {\r
-                btn_ok.Enabled = false;\r
                 //btn_skip.Visible = true;\r
-                lbl_pressOk.Visible = false;\r
                 lbl_progress.Text = "0%";\r
                 //lbl_progress.Visible = true;\r
                 lbl_status.Visible = true;\r
                 // throw cli call and parsing on it's own thread\r
                 ThreadPool.QueueUserWorkItem(startProc);\r
             }\r
-            catch(Exception exc)\r
+            catch (Exception exc)\r
             {\r
-                MessageBox.Show("frmReadDVD.cs - btn_ok_Click " + exc.ToString());\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
             }\r
         }\r
-     \r
+   \r
         private void updateUIElements()\r
         {\r
             try\r
@@ -69,7 +75,14 @@ namespace Handbrake
             }\r
             catch(Exception exc)\r
             {\r
-                MessageBox.Show("frmReadDVD.cs - updateUIElements " + exc.ToString());\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
             }\r
         }\r
 \r
@@ -103,7 +116,14 @@ namespace Handbrake
             }\r
             catch (Exception exc)\r
             {\r
-                MessageBox.Show("frmReadDVD.cs - startProc " + exc.ToString());\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
             }\r
 \r
         }\r
@@ -146,17 +166,5 @@ namespace Handbrake
             this.lbl_progress.Text = progress.ToString() + "%";\r
         }*/\r
 \r
-        private void btn_skip_Click(object sender, EventArgs e)\r
-        {\r
-            try\r
-            {\r
-                this.Close();\r
-                //cancel = 1;\r
-            }\r
-            catch (Exception exc)\r
-            {\r
-                MessageBox.Show(exc.ToString());\r
-            }\r
-        }\r
     }\r
 }
\ No newline at end of file