WinGui:

- Updated splash screen
- Horizontal scroll bar added to queue window.
- Few minor tweaks

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

diff --git a/win/C#/Resources/tempSplash.jpg b/win/C#/Resources/tempSplash.jpg
index 2b4ac63fbf900724979f96ccb0101739cd423a5c..0b353dd6e772558f0df8bdaffc2b388235d5cd4c 100644 (file)
Binary files a/win/C#/Resources/tempSplash.jpg and b/win/C#/Resources/tempSplash.jpg differ

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index c038d7493c67d8d9c5b8c1762655565cf3592ff8..49ceb569b881a693fd18d3f0698f31ad9bffde43 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -54,7 +54,6 @@ namespace Handbrake
             this.File_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();\r
             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
-            this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();\r
             this.mnu_save = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();\r
             this.mnu_update = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -415,7 +414,7 @@ namespace Handbrake
             "yadif (Slow)",\r
             "yadif + mcdeint (Slower)",\r
             "yadif + mcdeint  (Slowest)"});\r
-            this.drp_deInterlace_option.Location = new System.Drawing.Point(467, 154);\r
+            this.drp_deInterlace_option.Location = new System.Drawing.Point(462, 154);\r
             this.drp_deInterlace_option.Name = "drp_deInterlace_option";\r
             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deInterlace_option.TabIndex = 67;\r
@@ -431,13 +430,18 @@ namespace Handbrake
             "None",\r
             "Weak",\r
             "Strong"});\r
-            this.drp_deNoise.Location = new System.Drawing.Point(467, 211);\r
+            this.drp_deNoise.Location = new System.Drawing.Point(462, 211);\r
             this.drp_deNoise.Name = "drp_deNoise";\r
             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);\r
             this.drp_deNoise.TabIndex = 72;\r
             this.drp_deNoise.Text = "None";\r
             this.ToolTip.SetToolTip(this.drp_deNoise, "Select the subtitle language you require from this dropdown.");\r
             // \r
+            // DVD_Open\r
+            // \r
+            this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";\r
+            this.DVD_Open.ShowNewFolderButton = false;\r
+            // \r
             // File_Open\r
             // \r
             this.File_Open.DefaultExt = "hb";\r
@@ -451,7 +455,6 @@ namespace Handbrake
             // FileToolStripMenuItem\r
             // \r
             this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
-            this.mnu_open,\r
             this.mnu_save,\r
             this.ToolStripSeparator1,\r
             this.mnu_update,\r
@@ -461,47 +464,37 @@ namespace Handbrake
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);\r
             this.FileToolStripMenuItem.Text = "&File";\r
             // \r
-            // mnu_open\r
-            // \r
-            this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));\r
-            this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;\r
-            this.mnu_open.Name = "mnu_open";\r
-            this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));\r
-            this.mnu_open.Size = new System.Drawing.Size(184, 22);\r
-            this.mnu_open.Text = "&Open Profile";\r
-            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);\r
-            // \r
             // mnu_save\r
             // \r
             this.mnu_save.Image = ((System.Drawing.Image)(resources.GetObject("mnu_save.Image")));\r
             this.mnu_save.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.mnu_save.Name = "mnu_save";\r
             this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));\r
-            this.mnu_save.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_save.Size = new System.Drawing.Size(180, 22);\r
             this.mnu_save.Text = "&Save Profile";\r
             this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click);\r
             // \r
             // ToolStripSeparator1\r
             // \r
             this.ToolStripSeparator1.Name = "ToolStripSeparator1";\r
-            this.ToolStripSeparator1.Size = new System.Drawing.Size(181, 6);\r
+            this.ToolStripSeparator1.Size = new System.Drawing.Size(177, 6);\r
             // \r
             // mnu_update\r
             // \r
             this.mnu_update.Name = "mnu_update";\r
-            this.mnu_update.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_update.Size = new System.Drawing.Size(180, 22);\r
             this.mnu_update.Text = "Check for Updates";\r
             this.mnu_update.Click += new System.EventHandler(this.mnu_update_Click);\r
             // \r
             // toolStripSeparator2\r
             // \r
             this.toolStripSeparator2.Name = "toolStripSeparator2";\r
-            this.toolStripSeparator2.Size = new System.Drawing.Size(181, 6);\r
+            this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);\r
             // \r
             // mnu_exit\r
             // \r
             this.mnu_exit.Name = "mnu_exit";\r
-            this.mnu_exit.Size = new System.Drawing.Size(184, 22);\r
+            this.mnu_exit.Size = new System.Drawing.Size(180, 22);\r
             this.mnu_exit.Text = "E&xit";\r
             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);\r
             // \r
@@ -751,7 +744,7 @@ namespace Handbrake
             this.GroupBox1.Controls.Add(this.Label10);\r
             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
-            this.GroupBox1.Location = new System.Drawing.Point(15, 35);\r
+            this.GroupBox1.Location = new System.Drawing.Point(14, 35);\r
             this.GroupBox1.Name = "GroupBox1";\r
             this.GroupBox1.Size = new System.Drawing.Size(647, 116);\r
             this.GroupBox1.TabIndex = 408;\r
@@ -842,7 +835,7 @@ namespace Handbrake
             this.GroupBox4.Controls.Add(this.Label12);\r
             this.GroupBox4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.GroupBox4.ForeColor = System.Drawing.Color.Black;\r
-            this.GroupBox4.Location = new System.Drawing.Point(15, 157);\r
+            this.GroupBox4.Location = new System.Drawing.Point(14, 157);\r
             this.GroupBox4.Name = "GroupBox4";\r
             this.GroupBox4.Size = new System.Drawing.Size(647, 126);\r
             this.GroupBox4.TabIndex = 409;\r
@@ -976,7 +969,7 @@ namespace Handbrake
             this.Version.Name = "Version";\r
             this.Version.Size = new System.Drawing.Size(79, 20);\r
             this.Version.TabIndex = 415;\r
-            this.Version.Text = "Version 2.3";\r
+            this.Version.Text = "Version 2.4";\r
             // \r
             // lbl_encode\r
             // \r
@@ -1368,7 +1361,7 @@ namespace Handbrake
             // \r
             this.label24.AutoSize = true;\r
             this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label24.Location = new System.Drawing.Point(365, 133);\r
+            this.label24.Location = new System.Drawing.Point(360, 133);\r
             this.label24.Name = "label24";\r
             this.label24.Size = new System.Drawing.Size(109, 13);\r
             this.label24.TabIndex = 73;\r
@@ -1378,7 +1371,7 @@ namespace Handbrake
             // \r
             this.label11.AutoSize = true;\r
             this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label11.Location = new System.Drawing.Point(365, 214);\r
+            this.label11.Location = new System.Drawing.Point(360, 214);\r
             this.label11.Name = "label11";\r
             this.label11.Size = new System.Drawing.Size(58, 13);\r
             this.label11.TabIndex = 71;\r
@@ -1388,7 +1381,7 @@ namespace Handbrake
             // \r
             this.check_deblock.AutoSize = true;\r
             this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_deblock.Location = new System.Drawing.Point(467, 186);\r
+            this.check_deblock.Location = new System.Drawing.Point(462, 186);\r
             this.check_deblock.Name = "check_deblock";\r
             this.check_deblock.Size = new System.Drawing.Size(72, 17);\r
             this.check_deblock.TabIndex = 70;\r
@@ -1399,7 +1392,7 @@ namespace Handbrake
             // \r
             this.check_detelecine.AutoSize = true;\r
             this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_detelecine.Location = new System.Drawing.Point(368, 185);\r
+            this.check_detelecine.Location = new System.Drawing.Point(363, 185);\r
             this.check_detelecine.Name = "check_detelecine";\r
             this.check_detelecine.Size = new System.Drawing.Size(86, 17);\r
             this.check_detelecine.TabIndex = 69;\r
@@ -1410,7 +1403,7 @@ namespace Handbrake
             // \r
             this.label4.AutoSize = true;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(365, 157);\r
+            this.label4.Location = new System.Drawing.Point(360, 157);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(77, 13);\r
             this.label4.TabIndex = 68;\r
@@ -1420,7 +1413,7 @@ namespace Handbrake
             // \r
             this.Label37.AutoSize = true;\r
             this.Label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label37.Location = new System.Drawing.Point(387, 104);\r
+            this.Label37.Location = new System.Drawing.Point(382, 104);\r
             this.Label37.Name = "Label37";\r
             this.Label37.Size = new System.Drawing.Size(241, 12);\r
             this.Label37.TabIndex = 52;\r
@@ -1430,7 +1423,7 @@ namespace Handbrake
             // \r
             this.check_largeFile.AutoSize = true;\r
             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_largeFile.Location = new System.Drawing.Point(368, 84);\r
+            this.check_largeFile.Location = new System.Drawing.Point(363, 84);\r
             this.check_largeFile.Name = "check_largeFile";\r
             this.check_largeFile.Size = new System.Drawing.Size(172, 17);\r
             this.check_largeFile.TabIndex = 51;\r
@@ -1442,7 +1435,7 @@ namespace Handbrake
             // \r
             this.check_turbo.AutoSize = true;\r
             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_turbo.Location = new System.Drawing.Point(368, 61);\r
+            this.check_turbo.Location = new System.Drawing.Point(363, 61);\r
             this.check_turbo.Name = "check_turbo";\r
             this.check_turbo.Size = new System.Drawing.Size(110, 17);\r
             this.check_turbo.TabIndex = 50;\r
@@ -1463,7 +1456,7 @@ namespace Handbrake
             // \r
             this.Label22.AutoSize = true;\r
             this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label22.Location = new System.Drawing.Point(365, 13);\r
+            this.Label22.Location = new System.Drawing.Point(360, 13);\r
             this.Label22.Name = "Label22";\r
             this.Label22.Size = new System.Drawing.Size(175, 13);\r
             this.Label22.TabIndex = 38;\r
@@ -1514,7 +1507,7 @@ namespace Handbrake
             // \r
             this.check_2PassEncode.AutoSize = true;\r
             this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_2PassEncode.Location = new System.Drawing.Point(368, 38);\r
+            this.check_2PassEncode.Location = new System.Drawing.Point(363, 38);\r
             this.check_2PassEncode.Name = "check_2PassEncode";\r
             this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);\r
             this.check_2PassEncode.TabIndex = 18;\r
@@ -1829,7 +1822,7 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.h264Tab);\r
             this.advancedOptions.Controls.Add(this.TabPage6);\r
             this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.advancedOptions.Location = new System.Drawing.Point(15, 295);\r
+            this.advancedOptions.Location = new System.Drawing.Point(14, 295);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
             this.advancedOptions.Size = new System.Drawing.Size(647, 268);\r
@@ -1884,7 +1877,6 @@ namespace Handbrake
 \r
         internal System.Windows.Forms.SaveFileDialog File_Save;\r
         internal System.Windows.Forms.ToolTip ToolTip;\r
-        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
         internal System.Windows.Forms.OpenFileDialog File_Open;\r
         internal System.Windows.Forms.OpenFileDialog ISO_Open;\r
         internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;\r
@@ -2030,6 +2022,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_film;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_Classic;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_normal;\r
+        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 256d8066eff3e91fb8dda9d36b943addca8d705d..ba21fa5234c28868877ec6d7b808ef5547e6b726 100644 (file)
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -382,6 +382,7 @@ namespace Handbrake
             }\r
             catch (Exception)\r
             {\r
+                // No action required\r
             }\r
 \r
             // BUG *******************************************************\r
@@ -1611,7 +1612,8 @@ namespace Handbrake
 \r
         #endregion\r
 \r
-        \r
+\r
+      \r
 \r
 \r
         // This is the END of the road ------------------------------------------------------------------------------\r

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index c34fee188f2a0a32d0286b880cf84040a35721f5..5176aae1579bad45b387727834cbee7f96bca4a2 100644 (file)
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -130,7 +130,7 @@
     <value>18, 15</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>106, 15</value>\r
+    <value>223, 15</value>\r
   </metadata>\r
   <metadata name="File_Open.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>331, 15</value>\r
@@ -139,23 +139,6 @@
     <value>432, 15</value>\r
   </metadata>\r
   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />\r
-  <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
-    <value>\r
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I\r
-        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC\r
-        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p\r
-        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0\r
-        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr\r
-        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG\r
-        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5\r
-        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS\r
-        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt\r
-        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp\r
-        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W\r
-        AAAAAElFTkSuQmCC\r
-</value>\r
-  </data>\r
   <data name="mnu_save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">\r
     <value>\r
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8\r
@@ -173,7 +156,7 @@
 </value>\r
   </data>\r
   <metadata name="frmMainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
-    <value>212, 15</value>\r
+    <value>94, 17</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

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index b078970bd98beafc154cb2548acc28d7b985f1d6..6aaf16762b20eb747f9763342536c58547cf55f5 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -118,6 +118,7 @@ namespace Handbrake
             // \r
             this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.list_queue.FormattingEnabled = true;\r
+            this.list_queue.HorizontalScrollbar = true;\r
             this.list_queue.Location = new System.Drawing.Point(10, 37);\r
             this.list_queue.Name = "list_queue";\r
             this.list_queue.Size = new System.Drawing.Size(630, 288);\r

diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs
index af55a9ba1678ae9637ae18a0443931f58d5ddb40..5de83c6765be0e4ba6762c0660a8f42b6ca5b65c 100644 (file)
--- a/win/C#/frmQuickStart.Designer.cs
+++ b/win/C#/frmQuickStart.Designer.cs
@@ -36,8 +36,6 @@ namespace Handbrake
             this.label_docs = new System.Windows.Forms.LinkLabel();\r
             this.pictureBox2 = new System.Windows.Forms.PictureBox();\r
             this.label2 = new System.Windows.Forms.Label();\r
-            this.pictureBox3 = new System.Windows.Forms.PictureBox();\r
-            this.label3 = new System.Windows.Forms.Label();\r
             this.pictureBox4 = new System.Windows.Forms.PictureBox();\r
             this.label4 = new System.Windows.Forms.Label();\r
             this.pictureBox5 = new System.Windows.Forms.PictureBox();\r
@@ -50,7 +48,6 @@ namespace Handbrake
             this.label8 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();\r
@@ -62,7 +59,7 @@ namespace Handbrake
             // \r
             this.check_disableWindow.AutoSize = true;\r
             this.check_disableWindow.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.check_disableWindow.Location = new System.Drawing.Point(12, 462);\r
+            this.check_disableWindow.Location = new System.Drawing.Point(12, 406);\r
             this.check_disableWindow.Name = "check_disableWindow";\r
             this.check_disableWindow.Size = new System.Drawing.Size(185, 17);\r
             this.check_disableWindow.TabIndex = 0;\r
@@ -77,7 +74,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_close.Location = new System.Drawing.Point(401, 462);\r
+            this.btn_close.Location = new System.Drawing.Point(399, 402);\r
             this.btn_close.Name = "btn_close";\r
             this.btn_close.Size = new System.Drawing.Size(111, 22);\r
             this.btn_close.TabIndex = 415;\r
@@ -121,7 +118,7 @@ namespace Handbrake
             // \r
             this.pictureBox2.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox2.Image = global::Handbrake.Properties.Resources.info;\r
-            this.pictureBox2.Location = new System.Drawing.Point(12, 75);\r
+            this.pictureBox2.Location = new System.Drawing.Point(12, 122);\r
             this.pictureBox2.Name = "pictureBox2";\r
             this.pictureBox2.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox2.TabIndex = 419;\r
@@ -131,39 +128,18 @@ namespace Handbrake
             // \r
             this.label2.AutoSize = true;\r
             this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label2.Location = new System.Drawing.Point(52, 75);\r
+            this.label2.Location = new System.Drawing.Point(52, 122);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(411, 26);\r
             this.label2.TabIndex = 420;\r
             this.label2.Text = "Handbrake on windows does not remove any form of copy proteciton! \r\nThis can be d" +\r
                 "one with 3rd party tools.";\r
             // \r
-            // pictureBox3\r
-            // \r
-            this.pictureBox3.ErrorImage = global::Handbrake.Properties.Resources.info;\r
-            this.pictureBox3.Image = global::Handbrake.Properties.Resources.Disc;\r
-            this.pictureBox3.Location = new System.Drawing.Point(12, 128);\r
-            this.pictureBox3.Name = "pictureBox3";\r
-            this.pictureBox3.Size = new System.Drawing.Size(34, 33);\r
-            this.pictureBox3.TabIndex = 421;\r
-            this.pictureBox3.TabStop = false;\r
-            // \r
-            // label3\r
-            // \r
-            this.label3.AutoSize = true;\r
-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label3.Location = new System.Drawing.Point(52, 128);\r
-            this.label3.Name = "label3";\r
-            this.label3.Size = new System.Drawing.Size(430, 26);\r
-            this.label3.TabIndex = 422;\r
-            this.label3.Text = "Remember, when selecting a dvd source you must select the \"VIDEO_TS\"\r\nfolder on t" +\r
-                "he disc.";\r
-            // \r
             // pictureBox4\r
             // \r
             this.pictureBox4.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox4.Image = global::Handbrake.Properties.Resources.Movies;\r
-            this.pictureBox4.Location = new System.Drawing.Point(12, 179);\r
+            this.pictureBox4.Location = new System.Drawing.Point(12, 172);\r
             this.pictureBox4.Name = "pictureBox4";\r
             this.pictureBox4.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox4.TabIndex = 423;\r
@@ -173,7 +149,7 @@ namespace Handbrake
             // \r
             this.label4.AutoSize = true;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(52, 179);\r
+            this.label4.Location = new System.Drawing.Point(52, 172);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(460, 26);\r
             this.label4.TabIndex = 424;\r
@@ -184,7 +160,7 @@ namespace Handbrake
             // \r
             this.pictureBox5.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox5.Image = global::Handbrake.Properties.Resources.Emoticon;\r
-            this.pictureBox5.Location = new System.Drawing.Point(12, 400);\r
+            this.pictureBox5.Location = new System.Drawing.Point(12, 335);\r
             this.pictureBox5.Name = "pictureBox5";\r
             this.pictureBox5.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox5.TabIndex = 425;\r
@@ -194,7 +170,7 @@ namespace Handbrake
             // \r
             this.label5.AutoSize = true;\r
             this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label5.Location = new System.Drawing.Point(53, 400);\r
+            this.label5.Location = new System.Drawing.Point(53, 335);\r
             this.label5.Name = "label5";\r
             this.label5.Size = new System.Drawing.Size(444, 39);\r
             this.label5.TabIndex = 426;\r
@@ -204,7 +180,7 @@ namespace Handbrake
             // \r
             this.pictureBox6.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox6.Image = global::Handbrake.Properties.Resources.History;\r
-            this.pictureBox6.Location = new System.Drawing.Point(12, 232);\r
+            this.pictureBox6.Location = new System.Drawing.Point(12, 225);\r
             this.pictureBox6.Name = "pictureBox6";\r
             this.pictureBox6.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox6.TabIndex = 427;\r
@@ -214,7 +190,7 @@ namespace Handbrake
             // \r
             this.label6.AutoSize = true;\r
             this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label6.Location = new System.Drawing.Point(52, 232);\r
+            this.label6.Location = new System.Drawing.Point(52, 225);\r
             this.label6.Name = "label6";\r
             this.label6.Size = new System.Drawing.Size(448, 39);\r
             this.label6.TabIndex = 428;\r
@@ -226,7 +202,7 @@ namespace Handbrake
             // \r
             this.pictureBox7.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox7.Image = global::Handbrake.Properties.Resources.Remove;\r
-            this.pictureBox7.Location = new System.Drawing.Point(12, 287);\r
+            this.pictureBox7.Location = new System.Drawing.Point(12, 280);\r
             this.pictureBox7.Name = "pictureBox7";\r
             this.pictureBox7.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox7.TabIndex = 429;\r
@@ -236,7 +212,7 @@ namespace Handbrake
             // \r
             this.label7.AutoSize = true;\r
             this.label7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label7.Location = new System.Drawing.Point(53, 287);\r
+            this.label7.Location = new System.Drawing.Point(53, 280);\r
             this.label7.Name = "label7";\r
             this.label7.Size = new System.Drawing.Size(463, 39);\r
             this.label7.TabIndex = 430;\r
@@ -248,7 +224,7 @@ namespace Handbrake
             // \r
             this.pictureBox8.ErrorImage = global::Handbrake.Properties.Resources.info;\r
             this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
-            this.pictureBox8.Location = new System.Drawing.Point(12, 345);\r
+            this.pictureBox8.Location = new System.Drawing.Point(12, 71);\r
             this.pictureBox8.Name = "pictureBox8";\r
             this.pictureBox8.Size = new System.Drawing.Size(34, 33);\r
             this.pictureBox8.TabIndex = 431;\r
@@ -258,7 +234,7 @@ namespace Handbrake
             // \r
             this.label8.AutoSize = true;\r
             this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label8.Location = new System.Drawing.Point(53, 345);\r
+            this.label8.Location = new System.Drawing.Point(53, 71);\r
             this.label8.Name = "label8";\r
             this.label8.Size = new System.Drawing.Size(414, 39);\r
             this.label8.TabIndex = 432;\r
@@ -270,7 +246,7 @@ namespace Handbrake
             // \r
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-            this.ClientSize = new System.Drawing.Size(534, 504);\r
+            this.ClientSize = new System.Drawing.Size(522, 439);\r
             this.Controls.Add(this.label8);\r
             this.Controls.Add(this.pictureBox8);\r
             this.Controls.Add(this.label7);\r
@@ -281,8 +257,6 @@ namespace Handbrake
             this.Controls.Add(this.pictureBox5);\r
             this.Controls.Add(this.label4);\r
             this.Controls.Add(this.pictureBox4);\r
-            this.Controls.Add(this.label3);\r
-            this.Controls.Add(this.pictureBox3);\r
             this.Controls.Add(this.label2);\r
             this.Controls.Add(this.pictureBox2);\r
             this.Controls.Add(this.label_docs);\r
@@ -298,7 +272,6 @@ namespace Handbrake
             this.TopMost = true;\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();\r
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();\r
@@ -318,8 +291,6 @@ namespace Handbrake
         internal System.Windows.Forms.LinkLabel label_docs;\r
         private System.Windows.Forms.PictureBox pictureBox2;\r
         private System.Windows.Forms.Label label2;\r
-        private System.Windows.Forms.PictureBox pictureBox3;\r
-        private System.Windows.Forms.Label label3;\r
         private System.Windows.Forms.PictureBox pictureBox4;\r
         private System.Windows.Forms.Label label4;\r
         private System.Windows.Forms.PictureBox pictureBox5;\r