WinGui:

- Instead of highlighting checkboxes red if their selection is invalid. Display a MessageBox explaining the error.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1382 b64f7644-9d1e-0410-96f1-a4d463321fa5

3 files changed, 14 insertions, 33 deletions

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 4569a3e9a..c928ac4dc 100644
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,7 @@ namespace Handbrake
             this.components = new System.ComponentModel.Container();

             System.Windows.Forms.Label Label38;

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));

-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();

+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();

             this.DVD_Save = new System.Windows.Forms.SaveFileDialog();

             this.File_Save = new System.Windows.Forms.SaveFileDialog();

             this.ToolTip = new System.Windows.Forms.ToolTip(this.components);

@@ -420,7 +420,7 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.check_largeFile, "Allows creation of MP4 files greater than 4GB.\r\nWarning: Breaks iPod, Apple TV (V" +

                     "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");

             this.check_largeFile.UseVisualStyleBackColor = false;

-            this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);

+            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);

             // 

             // check_turbo

             // 

@@ -574,7 +574,7 @@ namespace Handbrake
                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +

                     "ly be used with H.264 ");

             this.check_optimiseMP4.UseVisualStyleBackColor = false;

-            this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);

+            this.check_optimiseMP4.Click += new System.EventHandler(this.check_optimiseMP4_Clicked);

             // 

             // check_iPodAtom

             // 

@@ -589,7 +589,7 @@ namespace Handbrake
             this.ToolTip.SetToolTip(this.check_iPodAtom, "Required for 5th and 6th Generation iPods.\r\nEncodes will not sync if this is not " +

                     "enabled for H.264 encodes");

             this.check_iPodAtom.UseVisualStyleBackColor = false;

-            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);

+            this.check_iPodAtom.Click += new System.EventHandler(this.check_iPodAtom_CheckedChanged);

             // 

             // data_chpt

             // 

@@ -608,9 +608,9 @@ namespace Handbrake
             // 

             // number

             // 

-            dataGridViewCellStyle2.Format = "N0";

-            dataGridViewCellStyle2.NullValue = null;

-            this.number.DefaultCellStyle = dataGridViewCellStyle2;

+            dataGridViewCellStyle1.Format = "N0";

+            dataGridViewCellStyle1.NullValue = null;

+            this.number.DefaultCellStyle = dataGridViewCellStyle1;

             this.number.HeaderText = "Chapter Number";

             this.number.MaxInputLength = 3;

             this.number.Name = "number";

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index cd0005e3a..06d1e3c29 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -666,41 +666,25 @@ namespace Handbrake
         {

             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))

             {

-                check_largeFile.BackColor = Color.LightCoral;

+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                 check_largeFile.CheckState = CheckState.Unchecked;

             }

-            else

-            {

-                check_largeFile.BackColor = Color.Transparent;

-            }

         }

         private void check_iPodAtom_CheckedChanged(object sender, EventArgs e)

         {

             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))

             {

-                text_destination.BackColor = Color.LightCoral;

-                check_iPodAtom.BackColor = Color.LightCoral;

+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

                 check_iPodAtom.CheckState = CheckState.Unchecked;

             }

-            else

-            {

-                check_iPodAtom.BackColor = Color.Transparent;

-                text_destination.BackColor = Color.White;

-            }

         }

-        private void check_optimiseMP4_CheckedChanged(object sender, EventArgs e)

+        private void check_optimiseMP4_Clicked(object sender, EventArgs e)

         {

             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))

             {

-                check_optimiseMP4.BackColor = Color.LightCoral;

-                text_destination.BackColor = Color.LightCoral;

+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.","Warning",MessageBoxButtons.OK,MessageBoxIcon.Warning);

                 check_optimiseMP4.CheckState = CheckState.Unchecked;

             }

-            else

-            {

-                check_optimiseMP4.BackColor = Color.Transparent;

-                text_destination.BackColor = Color.White;

-            }

         }

 

         //Video Tab

@@ -1667,6 +1651,9 @@ namespace Handbrake
         #endregion

 

 

+

+

+

         // This is the END of the road ------------------------------------------------------------------------------

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e9b8e49f4..e91100bb4 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -149,12 +149,6 @@ Make sure you have selected a "Title" from the "Source" box above otherwise
 the list will not be populated with the correct amount of chapters.

 Note: Do not change any of the chapter numbers!</value>

   </data>

-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>True</value>

-  </metadata>

-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

-    <value>True</value>

-  </metadata>

   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

     <value>223, 15</value>

   </metadata>