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

6 files changed, 48 insertions, 98 deletions

diff --git a/win/C#/Resources/tempSplash.jpg b/win/C#/Resources/tempSplash.jpg
index 2b4ac63fb..0b353dd6e 100644
--- a/win/C#/Resources/tempSplash.jpg
+++ b/win/C#/Resources/tempSplash.jpg
diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index c038d7493..49ceb569b 100644
--- 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();

             this.ISO_Open = new System.Windows.Forms.OpenFileDialog();

             this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();

-            this.mnu_open = new System.Windows.Forms.ToolStripMenuItem();

             this.mnu_save = new System.Windows.Forms.ToolStripMenuItem();

             this.ToolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();

             this.mnu_update = new System.Windows.Forms.ToolStripMenuItem();

@@ -415,7 +414,7 @@ namespace Handbrake
             "yadif (Slow)",

             "yadif + mcdeint (Slower)",

             "yadif + mcdeint  (Slowest)"});

-            this.drp_deInterlace_option.Location = new System.Drawing.Point(467, 154);

+            this.drp_deInterlace_option.Location = new System.Drawing.Point(462, 154);

             this.drp_deInterlace_option.Name = "drp_deInterlace_option";

             this.drp_deInterlace_option.Size = new System.Drawing.Size(161, 21);

             this.drp_deInterlace_option.TabIndex = 67;

@@ -431,13 +430,18 @@ namespace Handbrake
             "None",

             "Weak",

             "Strong"});

-            this.drp_deNoise.Location = new System.Drawing.Point(467, 211);

+            this.drp_deNoise.Location = new System.Drawing.Point(462, 211);

             this.drp_deNoise.Name = "drp_deNoise";

             this.drp_deNoise.Size = new System.Drawing.Size(161, 21);

             this.drp_deNoise.TabIndex = 72;

             this.drp_deNoise.Text = "None";

             this.ToolTip.SetToolTip(this.drp_deNoise, "Select the subtitle language you require from this dropdown.");

             // 

+            // DVD_Open

+            // 

+            this.DVD_Open.Description = "Select the \"VIDEO_TS\" folder from your DVD Drvie.";

+            this.DVD_Open.ShowNewFolderButton = false;

+            // 

             // File_Open

             // 

             this.File_Open.DefaultExt = "hb";

@@ -451,7 +455,6 @@ namespace Handbrake
             // FileToolStripMenuItem

             // 

             this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {

-            this.mnu_open,

             this.mnu_save,

             this.ToolStripSeparator1,

             this.mnu_update,

@@ -461,47 +464,37 @@ namespace Handbrake
             this.FileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);

             this.FileToolStripMenuItem.Text = "&File";

             // 

-            // mnu_open

-            // 

-            this.mnu_open.Image = ((System.Drawing.Image)(resources.GetObject("mnu_open.Image")));

-            this.mnu_open.ImageTransparentColor = System.Drawing.Color.Magenta;

-            this.mnu_open.Name = "mnu_open";

-            this.mnu_open.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O)));

-            this.mnu_open.Size = new System.Drawing.Size(184, 22);

-            this.mnu_open.Text = "&Open Profile";

-            this.mnu_open.Click += new System.EventHandler(this.mnu_open_Click);

-            // 

             // mnu_save

             // 

             this.mnu_save.Image = ((System.Drawing.Image)(resources.GetObject("mnu_save.Image")));

             this.mnu_save.ImageTransparentColor = System.Drawing.Color.Magenta;

             this.mnu_save.Name = "mnu_save";

             this.mnu_save.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));

-            this.mnu_save.Size = new System.Drawing.Size(184, 22);

+            this.mnu_save.Size = new System.Drawing.Size(180, 22);

             this.mnu_save.Text = "&Save Profile";

             this.mnu_save.Click += new System.EventHandler(this.mnu_save_Click);

             // 

             // ToolStripSeparator1

             // 

             this.ToolStripSeparator1.Name = "ToolStripSeparator1";

-            this.ToolStripSeparator1.Size = new System.Drawing.Size(181, 6);

+            this.ToolStripSeparator1.Size = new System.Drawing.Size(177, 6);

             // 

             // mnu_update

             // 

             this.mnu_update.Name = "mnu_update";

-            this.mnu_update.Size = new System.Drawing.Size(184, 22);

+            this.mnu_update.Size = new System.Drawing.Size(180, 22);

             this.mnu_update.Text = "Check for Updates";

             this.mnu_update.Click += new System.EventHandler(this.mnu_update_Click);

             // 

             // toolStripSeparator2

             // 

             this.toolStripSeparator2.Name = "toolStripSeparator2";

-            this.toolStripSeparator2.Size = new System.Drawing.Size(181, 6);

+            this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);

             // 

             // mnu_exit

             // 

             this.mnu_exit.Name = "mnu_exit";

-            this.mnu_exit.Size = new System.Drawing.Size(184, 22);

+            this.mnu_exit.Size = new System.Drawing.Size(180, 22);

             this.mnu_exit.Text = "E&xit";

             this.mnu_exit.Click += new System.EventHandler(this.mnu_exit_Click);

             // 

@@ -751,7 +744,7 @@ namespace Handbrake
             this.GroupBox1.Controls.Add(this.Label10);

             this.GroupBox1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.GroupBox1.ForeColor = System.Drawing.Color.Black;

-            this.GroupBox1.Location = new System.Drawing.Point(15, 35);

+            this.GroupBox1.Location = new System.Drawing.Point(14, 35);

             this.GroupBox1.Name = "GroupBox1";

             this.GroupBox1.Size = new System.Drawing.Size(647, 116);

             this.GroupBox1.TabIndex = 408;

@@ -842,7 +835,7 @@ namespace Handbrake
             this.GroupBox4.Controls.Add(this.Label12);

             this.GroupBox4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.GroupBox4.ForeColor = System.Drawing.Color.Black;

-            this.GroupBox4.Location = new System.Drawing.Point(15, 157);

+            this.GroupBox4.Location = new System.Drawing.Point(14, 157);

             this.GroupBox4.Name = "GroupBox4";

             this.GroupBox4.Size = new System.Drawing.Size(647, 126);

             this.GroupBox4.TabIndex = 409;

@@ -976,7 +969,7 @@ namespace Handbrake
             this.Version.Name = "Version";

             this.Version.Size = new System.Drawing.Size(79, 20);

             this.Version.TabIndex = 415;

-            this.Version.Text = "Version 2.3";

+            this.Version.Text = "Version 2.4";

             // 

             // lbl_encode

             // 

@@ -1368,7 +1361,7 @@ namespace Handbrake
             // 

             this.label24.AutoSize = true;

             this.label24.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label24.Location = new System.Drawing.Point(365, 133);

+            this.label24.Location = new System.Drawing.Point(360, 133);

             this.label24.Name = "label24";

             this.label24.Size = new System.Drawing.Size(109, 13);

             this.label24.TabIndex = 73;

@@ -1378,7 +1371,7 @@ namespace Handbrake
             // 

             this.label11.AutoSize = true;

             this.label11.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label11.Location = new System.Drawing.Point(365, 214);

+            this.label11.Location = new System.Drawing.Point(360, 214);

             this.label11.Name = "label11";

             this.label11.Size = new System.Drawing.Size(58, 13);

             this.label11.TabIndex = 71;

@@ -1388,7 +1381,7 @@ namespace Handbrake
             // 

             this.check_deblock.AutoSize = true;

             this.check_deblock.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_deblock.Location = new System.Drawing.Point(467, 186);

+            this.check_deblock.Location = new System.Drawing.Point(462, 186);

             this.check_deblock.Name = "check_deblock";

             this.check_deblock.Size = new System.Drawing.Size(72, 17);

             this.check_deblock.TabIndex = 70;

@@ -1399,7 +1392,7 @@ namespace Handbrake
             // 

             this.check_detelecine.AutoSize = true;

             this.check_detelecine.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_detelecine.Location = new System.Drawing.Point(368, 185);

+            this.check_detelecine.Location = new System.Drawing.Point(363, 185);

             this.check_detelecine.Name = "check_detelecine";

             this.check_detelecine.Size = new System.Drawing.Size(86, 17);

             this.check_detelecine.TabIndex = 69;

@@ -1410,7 +1403,7 @@ namespace Handbrake
             // 

             this.label4.AutoSize = true;

             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label4.Location = new System.Drawing.Point(365, 157);

+            this.label4.Location = new System.Drawing.Point(360, 157);

             this.label4.Name = "label4";

             this.label4.Size = new System.Drawing.Size(77, 13);

             this.label4.TabIndex = 68;

@@ -1420,7 +1413,7 @@ namespace Handbrake
             // 

             this.Label37.AutoSize = true;

             this.Label37.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label37.Location = new System.Drawing.Point(387, 104);

+            this.Label37.Location = new System.Drawing.Point(382, 104);

             this.Label37.Name = "Label37";

             this.Label37.Size = new System.Drawing.Size(241, 12);

             this.Label37.TabIndex = 52;

@@ -1430,7 +1423,7 @@ namespace Handbrake
             // 

             this.check_largeFile.AutoSize = true;

             this.check_largeFile.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_largeFile.Location = new System.Drawing.Point(368, 84);

+            this.check_largeFile.Location = new System.Drawing.Point(363, 84);

             this.check_largeFile.Name = "check_largeFile";

             this.check_largeFile.Size = new System.Drawing.Size(172, 17);

             this.check_largeFile.TabIndex = 51;

@@ -1442,7 +1435,7 @@ namespace Handbrake
             // 

             this.check_turbo.AutoSize = true;

             this.check_turbo.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_turbo.Location = new System.Drawing.Point(368, 61);

+            this.check_turbo.Location = new System.Drawing.Point(363, 61);

             this.check_turbo.Name = "check_turbo";

             this.check_turbo.Size = new System.Drawing.Size(110, 17);

             this.check_turbo.TabIndex = 50;

@@ -1463,7 +1456,7 @@ namespace Handbrake
             // 

             this.Label22.AutoSize = true;

             this.Label22.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.Label22.Location = new System.Drawing.Point(365, 13);

+            this.Label22.Location = new System.Drawing.Point(360, 13);

             this.Label22.Name = "Label22";

             this.Label22.Size = new System.Drawing.Size(175, 13);

             this.Label22.TabIndex = 38;

@@ -1514,7 +1507,7 @@ namespace Handbrake
             // 

             this.check_2PassEncode.AutoSize = true;

             this.check_2PassEncode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_2PassEncode.Location = new System.Drawing.Point(368, 38);

+            this.check_2PassEncode.Location = new System.Drawing.Point(363, 38);

             this.check_2PassEncode.Name = "check_2PassEncode";

             this.check_2PassEncode.Size = new System.Drawing.Size(119, 17);

             this.check_2PassEncode.TabIndex = 18;

@@ -1829,7 +1822,7 @@ namespace Handbrake
             this.advancedOptions.Controls.Add(this.h264Tab);

             this.advancedOptions.Controls.Add(this.TabPage6);

             this.advancedOptions.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.advancedOptions.Location = new System.Drawing.Point(15, 295);

+            this.advancedOptions.Location = new System.Drawing.Point(14, 295);

             this.advancedOptions.Name = "advancedOptions";

             this.advancedOptions.SelectedIndex = 0;

             this.advancedOptions.Size = new System.Drawing.Size(647, 268);

@@ -1884,7 +1877,6 @@ namespace Handbrake
 

         internal System.Windows.Forms.SaveFileDialog File_Save;

         internal System.Windows.Forms.ToolTip ToolTip;

-        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;

         internal System.Windows.Forms.OpenFileDialog File_Open;

         internal System.Windows.Forms.OpenFileDialog ISO_Open;

         internal System.Windows.Forms.ToolStripMenuItem FileToolStripMenuItem;

@@ -2030,6 +2022,7 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_film;

         private System.Windows.Forms.ToolStripMenuItem mnu_Classic;

         private System.Windows.Forms.ToolStripMenuItem mnu_normal;

+        internal System.Windows.Forms.FolderBrowserDialog DVD_Open;

 

     }

 }
\ No newline at end of file
diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 256d8066e..ba21fa523 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -382,6 +382,7 @@ namespace Handbrake
             }

             catch (Exception)

             {

+                // No action required

             }

 

             // BUG *******************************************************

@@ -1611,7 +1612,8 @@ namespace Handbrake
 

         #endregion

 

-        

+

+      

 

 

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

diff --git a/win/C#/frmMain.resx b/win/C#/frmMain.resx
index c34fee188..5176aae15 100644
--- a/win/C#/frmMain.resx
+++ b/win/C#/frmMain.resx
@@ -130,7 +130,7 @@
     <value>18, 15</value>

   </metadata>

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

-    <value>106, 15</value>

+    <value>223, 15</value>

   </metadata>

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

     <value>331, 15</value>

@@ -139,23 +139,6 @@
     <value>432, 15</value>

   </metadata>

   <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />

-  <data name="mnu_open.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

-    <value>

-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlpJREFUOE+tk21I

-        k1EYhif0oyA0sqIQCix/+GcQFFH9CCmiUBTLLEjShJofVBgL2fxoU9Pp5ubUlS5rU9f8rCyjsA+pUCRC

-        TR1ppmVFUSlmhq78unrnQF1KGHTg/nEOz30993PO+7qJFrmUeiv2n+Mij+XLRLLYULdF2pxlEVIDcw0p

-        AsyxD5fmI/rQ94pqi26eOlsfuZj+7BgSm01QdA4ih7m73Yx9qGpavwatjPebqCzOprPt8YKQgzFagqL0

-        BEjyEFWVaBkdLHMxT34uYNwWR9nVTEoL0zHlp2DMSeaSRk6eKt4VWm5WM/rVPNN5SjDTLQebZEHNA1wr

-        UvHjk3E6tsNcV62e1r3KLGqtKm6WplNpSsVqVFJsOM8VfSKFWjkGtcyZptSYzvC7XByx3zQoqCnTMvlG

-        CX1prnornPUmQJcUXsbSVhGK5bIOkcmQyveeTHiv4VZ5Nk33Nc6iuSO8CIfmECYa/bE/8ON1iRipJNh5

-        F0V6Bd86lfQ1JlFj1TDVq4COKCegLVIwHmGiKRB7/V6G7+5koHozymgfYRy5E1CgTWKgXcZ1i5qWp0KS

-        rjgBcAJawph6FszYk/2M1O1isGYLX8p9ab6wgqP+3rMvYciS01GfzA1LFvQkQ6sQ9/khxhoCGHnox1Dt

-        NvorxXw0b8Km8UQh2cip6GOzgNyMeKqKM7HdjqFZJ5pRk2YJ9aql3EnxoCJxNaZ4Ly6e3UDY3O6OEXRp

-        59ApTpIhiyDh9GHORAZyPHQPB/ZtZ/cOMVvFPvh6e7F+3SrWrHRnraf7Xz/xf/rJ/kvxb84I3U1y+9/W

-        AAAAAElFTkSuQmCC

-</value>

-  </data>

   <data name="mnu_save.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

     <value>

         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

@@ -173,7 +156,7 @@
 </value>

   </data>

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

-    <value>212, 15</value>

+    <value>94, 17</value>

   </metadata>

   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

     <value>56</value>

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index b078970bd..6aaf16762 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -118,6 +118,7 @@ namespace Handbrake
             // 

             this.list_queue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

             this.list_queue.FormattingEnabled = true;

+            this.list_queue.HorizontalScrollbar = true;

             this.list_queue.Location = new System.Drawing.Point(10, 37);

             this.list_queue.Name = "list_queue";

             this.list_queue.Size = new System.Drawing.Size(630, 288);

diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs
index af55a9ba1..5de83c676 100644
--- 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();

             this.pictureBox2 = new System.Windows.Forms.PictureBox();

             this.label2 = new System.Windows.Forms.Label();

-            this.pictureBox3 = new System.Windows.Forms.PictureBox();

-            this.label3 = new System.Windows.Forms.Label();

             this.pictureBox4 = new System.Windows.Forms.PictureBox();

             this.label4 = new System.Windows.Forms.Label();

             this.pictureBox5 = new System.Windows.Forms.PictureBox();

@@ -50,7 +48,6 @@ namespace Handbrake
             this.label8 = new System.Windows.Forms.Label();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();

-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).BeginInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).BeginInit();

@@ -62,7 +59,7 @@ namespace Handbrake
             // 

             this.check_disableWindow.AutoSize = true;

             this.check_disableWindow.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.check_disableWindow.Location = new System.Drawing.Point(12, 462);

+            this.check_disableWindow.Location = new System.Drawing.Point(12, 406);

             this.check_disableWindow.Name = "check_disableWindow";

             this.check_disableWindow.Size = new System.Drawing.Size(185, 17);

             this.check_disableWindow.TabIndex = 0;

@@ -77,7 +74,7 @@ namespace Handbrake
             this.btn_close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

             this.btn_close.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

             this.btn_close.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));

-            this.btn_close.Location = new System.Drawing.Point(401, 462);

+            this.btn_close.Location = new System.Drawing.Point(399, 402);

             this.btn_close.Name = "btn_close";

             this.btn_close.Size = new System.Drawing.Size(111, 22);

             this.btn_close.TabIndex = 415;

@@ -121,7 +118,7 @@ namespace Handbrake
             // 

             this.pictureBox2.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox2.Image = global::Handbrake.Properties.Resources.info;

-            this.pictureBox2.Location = new System.Drawing.Point(12, 75);

+            this.pictureBox2.Location = new System.Drawing.Point(12, 122);

             this.pictureBox2.Name = "pictureBox2";

             this.pictureBox2.Size = new System.Drawing.Size(34, 33);

             this.pictureBox2.TabIndex = 419;

@@ -131,39 +128,18 @@ namespace Handbrake
             // 

             this.label2.AutoSize = true;

             this.label2.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label2.Location = new System.Drawing.Point(52, 75);

+            this.label2.Location = new System.Drawing.Point(52, 122);

             this.label2.Name = "label2";

             this.label2.Size = new System.Drawing.Size(411, 26);

             this.label2.TabIndex = 420;

             this.label2.Text = "Handbrake on windows does not remove any form of copy proteciton! \r\nThis can be d" +

                 "one with 3rd party tools.";

             // 

-            // pictureBox3

-            // 

-            this.pictureBox3.ErrorImage = global::Handbrake.Properties.Resources.info;

-            this.pictureBox3.Image = global::Handbrake.Properties.Resources.Disc;

-            this.pictureBox3.Location = new System.Drawing.Point(12, 128);

-            this.pictureBox3.Name = "pictureBox3";

-            this.pictureBox3.Size = new System.Drawing.Size(34, 33);

-            this.pictureBox3.TabIndex = 421;

-            this.pictureBox3.TabStop = false;

-            // 

-            // label3

-            // 

-            this.label3.AutoSize = true;

-            this.label3.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label3.Location = new System.Drawing.Point(52, 128);

-            this.label3.Name = "label3";

-            this.label3.Size = new System.Drawing.Size(430, 26);

-            this.label3.TabIndex = 422;

-            this.label3.Text = "Remember, when selecting a dvd source you must select the \"VIDEO_TS\"\r\nfolder on t" +

-                "he disc.";

-            // 

             // pictureBox4

             // 

             this.pictureBox4.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox4.Image = global::Handbrake.Properties.Resources.Movies;

-            this.pictureBox4.Location = new System.Drawing.Point(12, 179);

+            this.pictureBox4.Location = new System.Drawing.Point(12, 172);

             this.pictureBox4.Name = "pictureBox4";

             this.pictureBox4.Size = new System.Drawing.Size(34, 33);

             this.pictureBox4.TabIndex = 423;

@@ -173,7 +149,7 @@ namespace Handbrake
             // 

             this.label4.AutoSize = true;

             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label4.Location = new System.Drawing.Point(52, 179);

+            this.label4.Location = new System.Drawing.Point(52, 172);

             this.label4.Name = "label4";

             this.label4.Size = new System.Drawing.Size(460, 26);

             this.label4.TabIndex = 424;

@@ -184,7 +160,7 @@ namespace Handbrake
             // 

             this.pictureBox5.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox5.Image = global::Handbrake.Properties.Resources.Emoticon;

-            this.pictureBox5.Location = new System.Drawing.Point(12, 400);

+            this.pictureBox5.Location = new System.Drawing.Point(12, 335);

             this.pictureBox5.Name = "pictureBox5";

             this.pictureBox5.Size = new System.Drawing.Size(34, 33);

             this.pictureBox5.TabIndex = 425;

@@ -194,7 +170,7 @@ namespace Handbrake
             // 

             this.label5.AutoSize = true;

             this.label5.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label5.Location = new System.Drawing.Point(53, 400);

+            this.label5.Location = new System.Drawing.Point(53, 335);

             this.label5.Name = "label5";

             this.label5.Size = new System.Drawing.Size(444, 39);

             this.label5.TabIndex = 426;

@@ -204,7 +180,7 @@ namespace Handbrake
             // 

             this.pictureBox6.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox6.Image = global::Handbrake.Properties.Resources.History;

-            this.pictureBox6.Location = new System.Drawing.Point(12, 232);

+            this.pictureBox6.Location = new System.Drawing.Point(12, 225);

             this.pictureBox6.Name = "pictureBox6";

             this.pictureBox6.Size = new System.Drawing.Size(34, 33);

             this.pictureBox6.TabIndex = 427;

@@ -214,7 +190,7 @@ namespace Handbrake
             // 

             this.label6.AutoSize = true;

             this.label6.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label6.Location = new System.Drawing.Point(52, 232);

+            this.label6.Location = new System.Drawing.Point(52, 225);

             this.label6.Name = "label6";

             this.label6.Size = new System.Drawing.Size(448, 39);

             this.label6.TabIndex = 428;

@@ -226,7 +202,7 @@ namespace Handbrake
             // 

             this.pictureBox7.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox7.Image = global::Handbrake.Properties.Resources.Remove;

-            this.pictureBox7.Location = new System.Drawing.Point(12, 287);

+            this.pictureBox7.Location = new System.Drawing.Point(12, 280);

             this.pictureBox7.Name = "pictureBox7";

             this.pictureBox7.Size = new System.Drawing.Size(34, 33);

             this.pictureBox7.TabIndex = 429;

@@ -236,7 +212,7 @@ namespace Handbrake
             // 

             this.label7.AutoSize = true;

             this.label7.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label7.Location = new System.Drawing.Point(53, 287);

+            this.label7.Location = new System.Drawing.Point(53, 280);

             this.label7.Name = "label7";

             this.label7.Size = new System.Drawing.Size(463, 39);

             this.label7.TabIndex = 430;

@@ -248,7 +224,7 @@ namespace Handbrake
             // 

             this.pictureBox8.ErrorImage = global::Handbrake.Properties.Resources.info;

             this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Preferences;

-            this.pictureBox8.Location = new System.Drawing.Point(12, 345);

+            this.pictureBox8.Location = new System.Drawing.Point(12, 71);

             this.pictureBox8.Name = "pictureBox8";

             this.pictureBox8.Size = new System.Drawing.Size(34, 33);

             this.pictureBox8.TabIndex = 431;

@@ -258,7 +234,7 @@ namespace Handbrake
             // 

             this.label8.AutoSize = true;

             this.label8.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));

-            this.label8.Location = new System.Drawing.Point(53, 345);

+            this.label8.Location = new System.Drawing.Point(53, 71);

             this.label8.Name = "label8";

             this.label8.Size = new System.Drawing.Size(414, 39);

             this.label8.TabIndex = 432;

@@ -270,7 +246,7 @@ namespace Handbrake
             // 

             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.ClientSize = new System.Drawing.Size(534, 504);

+            this.ClientSize = new System.Drawing.Size(522, 439);

             this.Controls.Add(this.label8);

             this.Controls.Add(this.pictureBox8);

             this.Controls.Add(this.label7);

@@ -281,8 +257,6 @@ namespace Handbrake
             this.Controls.Add(this.pictureBox5);

             this.Controls.Add(this.label4);

             this.Controls.Add(this.pictureBox4);

-            this.Controls.Add(this.label3);

-            this.Controls.Add(this.pictureBox3);

             this.Controls.Add(this.label2);

             this.Controls.Add(this.pictureBox2);

             this.Controls.Add(this.label_docs);

@@ -298,7 +272,6 @@ namespace Handbrake
             this.TopMost = true;

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();

-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox4)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox5)).EndInit();

             ((System.ComponentModel.ISupportInitialize)(this.pictureBox6)).EndInit();

@@ -318,8 +291,6 @@ namespace Handbrake
         internal System.Windows.Forms.LinkLabel label_docs;

         private System.Windows.Forms.PictureBox pictureBox2;

         private System.Windows.Forms.Label label2;

-        private System.Windows.Forms.PictureBox pictureBox3;

-        private System.Windows.Forms.Label label3;

         private System.Windows.Forms.PictureBox pictureBox4;

         private System.Windows.Forms.Label label4;

         private System.Windows.Forms.PictureBox pictureBox5;