WinGui:

- Fixed: for Auto-naming where it would incorrectly set directory when the user had no default set
- Fixed: A few control's were not set to transparent so showed up incorrectly on themed windows machines.

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

diff --git a/win/C#/Functions/Common.cs b/win/C#/Functions/Common.cs
index ee4c4ca44fa2288e1d64839111ae5d1885c79fc0..b4b2070bb93fd9b3d3b12b1159189d242aedb375 100644 (file)
--- a/win/C#/Functions/Common.cs
+++ b/win/C#/Functions/Common.cs
@@ -82,7 +82,10 @@ namespace Handbrake.Functions
                     {\r
                         string filePath = "";\r
                         if (Properties.Settings.Default.autoNamePath.Trim() != "")\r
-                            filePath = Properties.Settings.Default.autoNamePath + "\\";\r
+                        {\r
+                            if (Properties.Settings.Default.autoNamePath.Trim() != "Click 'Browse' to set the default location")\r
+                                filePath = Properties.Settings.Default.autoNamePath + "\\";\r
+                        } \r
                         mainWindow.text_destination.Text = filePath + source + "_T" + title + "_C" + cs + dash + cf + ".mp4";\r
                     }\r
                     else\r

diff --git a/win/C#/Program.cs b/win/C#/Program.cs
index 57734cbd7331ccfc79bcdfed96f89015d2cf8b72..25a4d415df32e1e51ff1bc28274cebe32e82a01a 100644 (file)
--- a/win/C#/Program.cs
+++ b/win/C#/Program.cs
@@ -32,7 +32,7 @@ namespace Handbrake
 \r
             // Development Code Expiry.\r
             // Remember to comment out on public release!!!\r
-            if (DateTime.Now > DateTime.Parse("30/1/2008")) { MessageBox.Show("Sorry, This development build of Handbrake has expired."); return; } \r
+            if (DateTime.Now > DateTime.Parse("20/1/2008")) { MessageBox.Show("Sorry, This development build of Handbrake has expired."); return; } \r
 \r
             // Check the system meets the system requirements.\r
             Boolean launch = true;\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index b2ebe3584759ae9e5d304ddf28f52dfca3963dd4..9955afd086fc6e8b1f4eb8398b359e5d45d92bd3 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 dataGridViewCellStyle3 = 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
@@ -323,6 +323,7 @@ namespace Handbrake
             // \r
             // btn_Browse\r
             // \r
+            this.btn_Browse.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_Browse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             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
@@ -333,11 +334,12 @@ namespace Handbrake
             this.btn_Browse.TabIndex = 5;\r
             this.btn_Browse.Text = "Browse";\r
             this.ToolTip.SetToolTip(this.btn_Browse, "Step 1 - Select a Source. This can be either a DVD or ts/mpg/iso file");\r
-            this.btn_Browse.UseVisualStyleBackColor = true;\r
+            this.btn_Browse.UseVisualStyleBackColor = false;\r
             this.btn_Browse.Click += new System.EventHandler(this.btn_Browse_Click);\r
             // \r
             // btn_destBrowse\r
             // \r
+            this.btn_destBrowse.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_destBrowse.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             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
@@ -348,7 +350,7 @@ namespace Handbrake
             this.btn_destBrowse.TabIndex = 2;\r
             this.btn_destBrowse.Text = "Browse";\r
             this.ToolTip.SetToolTip(this.btn_destBrowse, "Step 4 - Select a location to save your encoded file.");\r
-            this.btn_destBrowse.UseVisualStyleBackColor = true;\r
+            this.btn_destBrowse.UseVisualStyleBackColor = false;\r
             this.btn_destBrowse.Click += new System.EventHandler(this.btn_destBrowse_Click);\r
             // \r
             // drp_videoEncoder\r
@@ -483,7 +485,7 @@ namespace Handbrake
             this.slider_videoQuality.Location = new System.Drawing.Point(435, 90);\r
             this.slider_videoQuality.Maximum = 100;\r
             this.slider_videoQuality.Name = "slider_videoQuality";\r
-            this.slider_videoQuality.Size = new System.Drawing.Size(167, 45);\r
+            this.slider_videoQuality.Size = new System.Drawing.Size(167, 42);\r
             this.slider_videoQuality.TabIndex = 14;\r
             this.slider_videoQuality.TickFrequency = 17;\r
             this.ToolTip.SetToolTip(this.slider_videoQuality, "Set the quality level of the video. (Around 70% is fine for most)");\r
@@ -529,7 +531,7 @@ namespace Handbrake
             // \r
             // btn_setDefault\r
             // \r
-            this.btn_setDefault.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_setDefault.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_setDefault.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             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
@@ -594,7 +596,7 @@ namespace Handbrake
             this.slider_drc.Location = new System.Drawing.Point(317, 137);\r
             this.slider_drc.Maximum = 30;\r
             this.slider_drc.Name = "slider_drc";\r
-            this.slider_drc.Size = new System.Drawing.Size(241, 45);\r
+            this.slider_drc.Size = new System.Drawing.Size(241, 42);\r
             this.slider_drc.TabIndex = 18;\r
             this.slider_drc.TickFrequency = 10;\r
             this.ToolTip.SetToolTip(this.slider_drc, "Dynamic Range Compression");\r
@@ -851,7 +853,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(892, 24);\r
+            this.frmMainMenu.Size = new System.Drawing.Size(890, 24);\r
             this.frmMainMenu.TabIndex = 0;\r
             this.frmMainMenu.Text = "MenuStrip1";\r
             // \r
@@ -999,7 +1001,7 @@ namespace Handbrake
             // \r
             // btn_queue\r
             // \r
-            this.btn_queue.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_queue.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_queue.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_queue.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_queue.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -1015,7 +1017,7 @@ namespace Handbrake
             // \r
             // btn_encode\r
             // \r
-            this.btn_encode.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_encode.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_encode.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_encode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -1910,9 +1912,9 @@ namespace Handbrake
             // \r
             // number\r
             // \r
-            dataGridViewCellStyle3.Format = "N0";\r
-            dataGridViewCellStyle3.NullValue = null;\r
-            this.number.DefaultCellStyle = dataGridViewCellStyle3;\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
@@ -1975,7 +1977,7 @@ namespace Handbrake
             // \r
             // btn_h264Clear\r
             // \r
-            this.btn_h264Clear.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_h264Clear.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_h264Clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_h264Clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_h264Clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -2027,7 +2029,7 @@ namespace Handbrake
             // \r
             // btn_clear\r
             // \r
-            this.btn_clear.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_clear.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_clear.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_clear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_clear.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -2042,7 +2044,7 @@ namespace Handbrake
             // \r
             // btn_copy2C\r
             // \r
-            this.btn_copy2C.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_copy2C.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_copy2C.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_copy2C.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_copy2C.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -2067,7 +2069,7 @@ namespace Handbrake
             // \r
             // btn_generate_Query\r
             // \r
-            this.btn_generate_Query.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.btn_generate_Query.BackColor = System.Drawing.Color.Transparent;\r
             this.btn_generate_Query.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
             this.btn_generate_Query.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_generate_Query.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
@@ -2159,7 +2161,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(892, 588);\r
+            this.ClientSize = new System.Drawing.Size(890, 586);\r
             this.Controls.Add(this.label6);\r
             this.Controls.Add(this.groupBox2);\r
             this.Controls.Add(this.groupBox_dest);\r

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index c5c2fdf14c5c909577fb0747480952aa56c3f24f..bd6d57208e8b28e728ed34fc316bfd612a0b0277 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -692,9 +692,16 @@ namespace Handbrake
             {\r
                 CheckPixelRatio.Enabled = false;\r
                 CheckPixelRatio.Checked = false;\r
+                text_height.Text = "";\r
+                text_height.Enabled = false;\r
+                text_height.BackColor = Color.LightGray;\r
             }\r
             else\r
+            {\r
                 CheckPixelRatio.Enabled = true;\r
+                text_height.Enabled = true;\r
+                text_height.BackColor = Color.White;\r
+            }\r
         }\r
 \r
         private void check_2PassEncode_CheckedChanged(object sender, EventArgs e)\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index 4f28a77133e52f69a1f6c4d1ca1b906f5c1f8d2b..06f6f6a7244ae947a73e142e7bd6615eb7f8a5af 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -189,12 +189,6 @@ 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="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
     <value>56</value>\r
   </metadata>\r

diff --git a/win/C#/frmOptions.cs b/win/C#/frmOptions.cs
index fe681bdc1dd5f695a7c583581f244f55d03d525c..e8d0bc02bc6f3ad46c459734f5e57025872bfb21 100644 (file)
--- a/win/C#/frmOptions.cs
+++ b/win/C#/frmOptions.cs
@@ -55,10 +55,10 @@ namespace Handbrake
                 check_autoNaming.CheckState = CheckState.Checked;\r
             }\r
 \r
-            if (Properties.Settings.Default.autoNamePath != "")\r
-                text_an_path.Text = Properties.Settings.Default.autoNamePath;\r
-            else\r
-                text_an_path.Text = "Click 'Browse' to set the default location";\r
+            text_an_path.Text = Properties.Settings.Default.autoNamePath;\r
+\r
+            if (text_an_path.Text == "")\r
+                text_an_path.Text = "Click 'Browse' to set the default location";              \r
         }\r
 \r
         #region Options\r
@@ -122,7 +122,10 @@ namespace Handbrake
         private void text_an_path_TextChanged(object sender, EventArgs e)\r
         {\r
             if (text_an_path.Text == "")\r
-                Properties.Settings.Default.autoNamePath = null;\r
+            {\r
+                Properties.Settings.Default.autoNamePath = "";\r
+                text_an_path.Text = "Click 'Browse' to set the default location";\r
+            }\r
             else\r
                 Properties.Settings.Default.autoNamePath = text_an_path.Text;\r
         }\r