WinGui:

- Few tweaks to the iPod Atom Checkbox and Optimise MP4 Checkbox
- Removal of x264b30

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

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index 814ff1f..d657c40 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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
@@ -129,10 +129,8 @@ namespace Handbrake
             this.Label32 = new System.Windows.Forms.Label();\r
             this.Label18 = new System.Windows.Forms.Label();\r
             this.TabPage3 = new System.Windows.Forms.TabPage();\r
-            this.lbl_ipodAtom = new System.Windows.Forms.Label();\r
             this.label25 = new System.Windows.Forms.Label();\r
             this.lbl_vfr = new System.Windows.Forms.Label();\r
-            this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.lbl_largeMp4Warning = new System.Windows.Forms.Label();\r
             this.Label22 = new System.Windows.Forms.Label();\r
             this.check_2PassEncode = new System.Windows.Forms.CheckBox();\r
@@ -141,6 +139,7 @@ namespace Handbrake
             this.SliderValue = new System.Windows.Forms.Label();\r
             this.Label46 = new System.Windows.Forms.Label();\r
             this.Label40 = new System.Windows.Forms.Label();\r
+            this.check_iPodAtom = new System.Windows.Forms.CheckBox();\r
             this.check_grayscale = new System.Windows.Forms.CheckBox();\r
             this.TabPage1 = new System.Windows.Forms.TabPage();\r
             this.text_bottom = new System.Windows.Forms.NumericUpDown();\r
@@ -368,8 +367,7 @@ namespace Handbrake
             this.drp_videoEncoder.Items.AddRange(new object[] {\r
             "Mpeg 4",\r
             "Xvid",\r
-            "H.264",\r
-            "H.264 (iPod)"});\r
+            "H.264"});\r
             this.drp_videoEncoder.Location = new System.Drawing.Point(99, 20);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
@@ -986,7 +984,7 @@ namespace Handbrake
             this.check_optimiseMP4.AutoSize = true;\r
             this.check_optimiseMP4.BackColor = System.Drawing.Color.Transparent;\r
             this.check_optimiseMP4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_optimiseMP4.Location = new System.Drawing.Point(502, 21);\r
+            this.check_optimiseMP4.Location = new System.Drawing.Point(502, 14);\r
             this.check_optimiseMP4.Name = "check_optimiseMP4";\r
             this.check_optimiseMP4.Size = new System.Drawing.Size(143, 17);\r
             this.check_optimiseMP4.TabIndex = 25;\r
@@ -1256,12 +1254,11 @@ namespace Handbrake
             // TabPage3\r
             // \r
             this.TabPage3.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.TabPage3.Controls.Add(this.lbl_ipodAtom);\r
             this.TabPage3.Controls.Add(this.label25);\r
             this.TabPage3.Controls.Add(this.lbl_vfr);\r
-            this.TabPage3.Controls.Add(this.check_iPodAtom);\r
             this.TabPage3.Controls.Add(this.lbl_largeMp4Warning);\r
             this.TabPage3.Controls.Add(this.check_largeFile);\r
+            this.TabPage3.Controls.Add(this.check_grayscale);\r
             this.TabPage3.Controls.Add(this.check_turbo);\r
             this.TabPage3.Controls.Add(this.Label22);\r
             this.TabPage3.Controls.Add(this.check_2PassEncode);\r
@@ -1282,19 +1279,6 @@ namespace Handbrake
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video";\r
             // \r
-            // lbl_ipodAtom\r
-            // \r
-            this.lbl_ipodAtom.AutoSize = true;\r
-            this.lbl_ipodAtom.BackColor = System.Drawing.Color.Transparent;\r
-            this.lbl_ipodAtom.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_ipodAtom.ForeColor = System.Drawing.Color.Red;\r
-            this.lbl_ipodAtom.Location = new System.Drawing.Point(132, 124);\r
-            this.lbl_ipodAtom.Name = "lbl_ipodAtom";\r
-            this.lbl_ipodAtom.Size = new System.Drawing.Size(91, 12);\r
-            this.lbl_ipodAtom.TabIndex = 29;\r
-            this.lbl_ipodAtom.Text = "x264 && mp4 only";\r
-            this.lbl_ipodAtom.Visible = false;\r
-            // \r
             // label25\r
             // \r
             this.label25.AutoSize = true;\r
@@ -1318,19 +1302,6 @@ namespace Handbrake
             this.lbl_vfr.Text = "(VFR On)";\r
             this.lbl_vfr.Visible = false;\r
             // \r
-            // check_iPodAtom\r
-            // \r
-            this.check_iPodAtom.AutoSize = true;\r
-            this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
-            this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_iPodAtom.Location = new System.Drawing.Point(16, 119);\r
-            this.check_iPodAtom.Name = "check_iPodAtom";\r
-            this.check_iPodAtom.Size = new System.Drawing.Size(110, 17);\r
-            this.check_iPodAtom.TabIndex = 26;\r
-            this.check_iPodAtom.Text = "Add iPod Atom";\r
-            this.check_iPodAtom.UseVisualStyleBackColor = false;\r
-            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
-            // \r
             // lbl_largeMp4Warning\r
             // \r
             this.lbl_largeMp4Warning.AutoSize = true;\r
@@ -1421,12 +1392,25 @@ namespace Handbrake
             this.Label40.TabIndex = 13;\r
             this.Label40.Text = "Constant Quality:";\r
             // \r
+            // check_iPodAtom\r
+            // \r
+            this.check_iPodAtom.AutoSize = true;\r
+            this.check_iPodAtom.BackColor = System.Drawing.Color.Transparent;\r
+            this.check_iPodAtom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.check_iPodAtom.Location = new System.Drawing.Point(516, 255);\r
+            this.check_iPodAtom.Name = "check_iPodAtom";\r
+            this.check_iPodAtom.Size = new System.Drawing.Size(122, 17);\r
+            this.check_iPodAtom.TabIndex = 26;\r
+            this.check_iPodAtom.Text = "Insert iPod Atom";\r
+            this.check_iPodAtom.UseVisualStyleBackColor = false;\r
+            this.check_iPodAtom.CheckedChanged += new System.EventHandler(this.check_iPodAtom_CheckedChanged);\r
+            // \r
             // check_grayscale\r
             // \r
             this.check_grayscale.AutoSize = true;\r
             this.check_grayscale.BackColor = System.Drawing.Color.Transparent;\r
             this.check_grayscale.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_grayscale.Location = new System.Drawing.Point(16, 217);\r
+            this.check_grayscale.Location = new System.Drawing.Point(16, 117);\r
             this.check_grayscale.Name = "check_grayscale";\r
             this.check_grayscale.Size = new System.Drawing.Size(138, 17);\r
             this.check_grayscale.TabIndex = 1;\r
@@ -1440,7 +1424,6 @@ namespace Handbrake
             this.TabPage1.Controls.Add(this.text_top);\r
             this.TabPage1.Controls.Add(this.text_left);\r
             this.TabPage1.Controls.Add(this.text_right);\r
-            this.TabPage1.Controls.Add(this.check_grayscale);\r
             this.TabPage1.Controls.Add(this.label26);\r
             this.TabPage1.Controls.Add(this.Label56);\r
             this.TabPage1.Controls.Add(this.lbl_Aspect);\r
@@ -1883,9 +1866,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle1.Format = "N0";\r
-            dataGridViewCellStyle1.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle3.Format = "N0";\r
+            dataGridViewCellStyle3.NullValue = null;\r
+            this.number.DefaultCellStyle = dataGridViewCellStyle3;\r
             this.number.HeaderText = "Chapter Number";\r
             this.number.MaxInputLength = 3;\r
             this.number.Name = "number";\r
@@ -2197,6 +2180,7 @@ namespace Handbrake
             this.Controls.Add(this.lbl_encode);\r
             this.Controls.Add(this.toolStrip1);\r
             this.Controls.Add(this.groupBox2);\r
+            this.Controls.Add(this.check_iPodAtom);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.advancedOptions);\r
             this.Controls.Add(this.groupBox_output);\r
@@ -2358,7 +2342,6 @@ namespace Handbrake
         internal System.Windows.Forms.CheckBox check_vfr;\r
         internal System.Windows.Forms.CheckBox check_iPodAtom;\r
         internal System.Windows.Forms.Label lbl_vfr;\r
-        internal System.Windows.Forms.Label lbl_ipodAtom;\r
         internal System.Windows.Forms.Label label25;\r
         internal System.Windows.Forms.Label label26;\r
         internal System.Windows.Forms.Label Label56;\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 76d9552..c210979 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -748,24 +748,32 @@ namespace Handbrake
 \r
         private void check_iPodAtom_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (!text_destination.Text.Contains(".mp4"))\r
+            if ((!text_destination.Text.Contains(".mp4")) && (!text_destination.Text.Contains(".m4v")))\r
             {\r
-                lbl_ipodAtom.Visible = true;\r
+                text_destination.BackColor = Color.LightCoral;\r
+                check_iPodAtom.BackColor = Color.LightCoral;\r
                 check_iPodAtom.CheckState = CheckState.Unchecked;\r
             }\r
             else\r
-                lbl_ipodAtom.Visible = false;\r
+            {\r
+                check_iPodAtom.BackColor = Color.Transparent;\r
+                text_destination.BackColor = Color.White;\r
+            }\r
         }\r
 \r
         private void check_optimiseMP4_CheckedChanged(object sender, EventArgs e)\r
         {\r
-            if (!text_destination.Text.Contains(".mp4"))\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
                 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
         private void drp_dvdtitle_Click(object sender, EventArgs e)\r
@@ -897,7 +905,6 @@ namespace Handbrake
                 rtf_h264advanced.Text = "";\r
                 check_iPodAtom.Enabled = false;\r
                 check_iPodAtom.Checked = false;\r
-                lbl_ipodAtom.Visible = false;\r
                 check_optimiseMP4.Enabled = false;\r
                 check_lAnamorphic.Enabled = false;\r
                 check_lAnamorphic.Checked = false;\r
@@ -909,7 +916,6 @@ namespace Handbrake
 \r
                 h264Tab.Enabled = true;\r
                 check_iPodAtom.Enabled = true;\r
-                lbl_ipodAtom.Visible = false;\r
                 check_optimiseMP4.Enabled = true;\r
                 check_lAnamorphic.Enabled = true;\r
             }\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 3dee6a5..7964e91 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -189,6 +189,12 @@ Best used in conjunction with forced subtitles.</value>
   <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="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="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>731, 18</value>\r
   </metadata>\r