WinGui:

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

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 4569a3e..c928ac4 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -37,7 +37,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 dataGridViewCellStyle2 = 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
@@ -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" +\r
                     "ersion 1 only) and PS3 compatibility.\r\nRequires .mp4/.m4v file extension");\r
             this.check_largeFile.UseVisualStyleBackColor = false;\r
-            this.check_largeFile.CheckedChanged += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
+            this.check_largeFile.Click += new System.EventHandler(this.check_largeFile_CheckedChanged);\r
             // \r
             // check_turbo\r
             // \r
@@ -574,7 +574,7 @@ namespace Handbrake
                     " QuickTime can only read the files as long as the file extension is .mp4\r\nCan on" +\r
                     "ly be used with H.264 ");\r
             this.check_optimiseMP4.UseVisualStyleBackColor = false;\r
-            this.check_optimiseMP4.CheckedChanged += new System.EventHandler(this.check_optimiseMP4_CheckedChanged);\r
+            this.check_optimiseMP4.Click += new System.EventHandler(this.check_optimiseMP4_Clicked);\r
             // \r
             // check_iPodAtom\r
             // \r
@@ -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 " +\r
                     "enabled for H.264 encodes");\r
             this.check_iPodAtom.UseVisualStyleBackColor = false;\r
-            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
+            this.check_iPodAtom.Click += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
             // \r
             // data_chpt\r
             // \r
@@ -608,9 +608,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle2.Format = "N0";\r
-            dataGridViewCellStyle2.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle2;\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

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index cd0005e..06d1e3c 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -666,41 +666,25 @@ namespace Handbrake
         {\r
             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))\r
             {\r
-                check_largeFile.BackColor = Color.LightCoral;\r
+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                 check_largeFile.CheckState = CheckState.Unchecked;\r
             }\r
-            else\r
-            {\r
-                check_largeFile.BackColor = Color.Transparent;\r
-            }\r
         }\r
         private void check_iPodAtom_CheckedChanged(object sender, EventArgs e)\r
         {\r
             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))\r
             {\r
-                text_destination.BackColor = Color.LightCoral;\r
-                check_iPodAtom.BackColor = Color.LightCoral;\r
+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);\r
                 check_iPodAtom.CheckState = CheckState.Unchecked;\r
             }\r
-            else\r
-            {\r
-                check_iPodAtom.BackColor = Color.Transparent;\r
-                text_destination.BackColor = Color.White;\r
-            }\r
         }\r
-        private void check_optimiseMP4_CheckedChanged(object sender, EventArgs e)\r
+        private void check_optimiseMP4_Clicked(object sender, EventArgs e)\r
         {\r
             if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))\r
             {\r
-                check_optimiseMP4.BackColor = Color.LightCoral;\r
-                text_destination.BackColor = Color.LightCoral;\r
+                MessageBox.Show("You can only use this option with the .mp4/.m4v file container.","Warning",MessageBoxButtons.OK,MessageBoxIcon.Warning);\r
                 check_optimiseMP4.CheckState = CheckState.Unchecked;\r
             }\r
-            else\r
-            {\r
-                check_optimiseMP4.BackColor = Color.Transparent;\r
-                text_destination.BackColor = Color.White;\r
-            }\r
         }\r
 \r
         //Video Tab\r
@@ -1667,6 +1651,9 @@ namespace Handbrake
         #endregion\r
 \r
 \r
+\r
+\r
+\r
         // This is the END of the road ------------------------------------------------------------------------------\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index e9b8e49..e91100b 100644 (file)
--- 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.\r
 Note: Do not change any of the chapter numbers!</value>\r
   </data>\r
-  <metadata name="number.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
-  <metadata name="name.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
-    <value>True</value>\r
-  </metadata>\r
   <metadata name="DVD_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>223, 15</value>\r
   </metadata>\r