WinGui:

- Added some new png images to the gui ( Hawkman's Image pack)
- Redesigned the layout of the queue slightly.
- Fixed size issue with the DVD info window.
-

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

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 97918ad..1812936 100644 (file)
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -177,8 +177,11 @@
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="handbrakepineapple.ico" />\r
+    <Content Include="Resources\Output_Small.png" />\r
+    <Content Include="Resources\Pref_Small.png" />\r
+    <Content Include="Resources\Queue.png" />\r
+    <Content Include="Resources\Queue_Small.png" />\r
     <None Include="Resources\SplashScreen.jpg" />\r
-    <BaseApplicationManifest Include="Properties\app.manifest" />\r
     <None Include="Resources\Remove.png" />\r
     <None Include="Resources\Movies.png" />\r
     <None Include="Resources\info.png" />\r

diff --git a/win/C#/Properties/AssemblyInfo.cs b/win/C#/Properties/AssemblyInfo.cs
index ed9c1d1..505af03 100644 (file)
--- a/win/C#/Properties/AssemblyInfo.cs
+++ b/win/C#/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@ using System.Resources;
 // set of attributes. Change these attribute values to modify the information\r
 // associated with an assembly.\r
 [assembly: AssemblyTitle("Handbrake")]\r
-[assembly: AssemblyDescription("DVD to MPEG-4 converter")]\r
+[assembly: AssemblyDescription("DVD Like Source to MPEG-4 converter")]\r
 [assembly: AssemblyConfiguration("")]\r
 [assembly: AssemblyCompany("Handbrake")]\r
 [assembly: AssemblyProduct("Handbrake")]\r

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index 169ae4e..e024011 100644 (file)
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -88,9 +88,9 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
-        internal static System.Drawing.Bitmap General_Preferences {\r
+        internal static System.Drawing.Bitmap General_Prefences {\r
             get {\r
-                object obj = ResourceManager.GetObject("General Preferences", resourceCulture);\r
+                object obj = ResourceManager.GetObject("General_Prefences", resourceCulture);\r
                 return ((System.Drawing.Bitmap)(obj));\r
             }\r
         }\r
@@ -123,6 +123,34 @@ namespace Handbrake.Properties {
             }\r
         }\r
         \r
+        internal static System.Drawing.Bitmap Output_Small {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Output_Small", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap Pref_Small {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Pref_Small", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap Queue {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Queue", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
+        internal static System.Drawing.Bitmap Queue_Small {\r
+            get {\r
+                object obj = ResourceManager.GetObject("Queue_Small", resourceCulture);\r
+                return ((System.Drawing.Bitmap)(obj));\r
+            }\r
+        }\r
+        \r
         internal static System.Drawing.Bitmap Remove {\r
             get {\r
                 object obj = ResourceManager.GetObject("Remove", resourceCulture);\r

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index a873857..9b28b08 100644 (file)
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -127,28 +127,40 @@
   <data name="info" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
-  </data>\r
   <data name="Emoticon" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Emoticon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="General Preferences" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="SplashScreen" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\SplashScreen.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="Delete" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="Queue_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Queue_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
   <data name="Remove" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Remove.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
   <data name="History" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\History.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
+  <data name="Help" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Help.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
   <data name="Movies" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
     <value>..\Resources\Movies.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
-  <data name="SplashScreen" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
-    <value>..\Resources\SplashScreen.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  <data name="Output_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Output_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Pref_Small" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Pref_Small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="General_Prefences" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\General Preferences.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
+  </data>\r
+  <data name="Queue" type="System.Resources.ResXFileRef, System.Windows.Forms">\r
+    <value>..\Resources\Queue.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>\r
   </data>\r
 </root>
\ No newline at end of file

diff --git a/win/C#/Resources/Output_Small.png b/win/C#/Resources/Output_Small.png
new file mode 100644 (file)
index 0000000..a1017d6
Binary files /dev/null and b/win/C#/Resources/Output_Small.png differ

diff --git a/win/C#/Resources/Pref_Small.png b/win/C#/Resources/Pref_Small.png
new file mode 100644 (file)
index 0000000..a28fb5b
Binary files /dev/null and b/win/C#/Resources/Pref_Small.png differ

diff --git a/win/C#/Resources/Queue.png b/win/C#/Resources/Queue.png
new file mode 100644 (file)
index 0000000..51962a1
Binary files /dev/null and b/win/C#/Resources/Queue.png differ

diff --git a/win/C#/Resources/Queue_Small.png b/win/C#/Resources/Queue_Small.png
new file mode 100644 (file)
index 0000000..02c7391
Binary files /dev/null and b/win/C#/Resources/Queue_Small.png differ

diff --git a/win/C#/frmDvdInfo.Designer.cs b/win/C#/frmDvdInfo.Designer.cs
index 6777d16..d726461 100644 (file)
--- a/win/C#/frmDvdInfo.Designer.cs
+++ b/win/C#/frmDvdInfo.Designer.cs
@@ -78,7 +78,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(547, 495);\r
+            this.ClientSize = new System.Drawing.Size(547, 481);\r
             this.Controls.Add(this.Label2);\r
             this.Controls.Add(this.rtf_dvdInfo);\r
             this.Controls.Add(this.btn_close);\r
@@ -87,7 +87,7 @@ namespace Handbrake
             this.MaximizeBox = false;\r
             this.MaximumSize = new System.Drawing.Size(553, 520);\r
             this.MinimizeBox = false;\r
-            this.MinimumSize = new System.Drawing.Size(553, 520);\r
+            this.MinimumSize = new System.Drawing.Size(553, 506);\r
             this.Name = "frmDvdInfo";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
             this.Text = "Read DVD";\r

diff --git a/win/C#/frmMain.Designer.cs b/win/C#/frmMain.Designer.cs
index d74482e..16c3a65 100644 (file)
--- a/win/C#/frmMain.Designer.cs
+++ b/win/C#/frmMain.Designer.cs
@@ -126,6 +126,7 @@ namespace Handbrake
             this.lbl_encode = new System.Windows.Forms.Label();\r
             this.btn_eCancel = new System.Windows.Forms.Button();\r
             this.TabPage6 = new System.Windows.Forms.TabPage();\r
+            this.label23 = new System.Windows.Forms.Label();\r
             this.Label7 = new System.Windows.Forms.Label();\r
             this.Label39 = new System.Windows.Forms.Label();\r
             this.btn_ClearQuery = new System.Windows.Forms.Button();\r
@@ -186,7 +187,7 @@ namespace Handbrake
             this.text_left = new System.Windows.Forms.TextBox();\r
             this.advancedOptions = new System.Windows.Forms.TabControl();\r
             this.groupBox_dest = new System.Windows.Forms.GroupBox();\r
-            this.label23 = new System.Windows.Forms.Label();\r
+            this.button1 = new System.Windows.Forms.Button();\r
             Label38 = new System.Windows.Forms.Label();\r
             ((System.ComponentModel.ISupportInitialize)(this.slider_videoQuality)).BeginInit();\r
             this.frmMainMenu.SuspendLayout();\r
@@ -230,7 +231,7 @@ namespace Handbrake
             this.drop_chapterFinish.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterFinish.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterFinish.FormattingEnabled = true;\r
-            this.drop_chapterFinish.Location = new System.Drawing.Point(408, 58);\r
+            this.drop_chapterFinish.Location = new System.Drawing.Point(408, 55);\r
             this.drop_chapterFinish.Name = "drop_chapterFinish";\r
             this.drop_chapterFinish.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterFinish.TabIndex = 41;\r
@@ -244,7 +245,7 @@ namespace Handbrake
             this.drop_chapterStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.drop_chapterStart.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.drop_chapterStart.FormattingEnabled = true;\r
-            this.drop_chapterStart.Location = new System.Drawing.Point(295, 58);\r
+            this.drop_chapterStart.Location = new System.Drawing.Point(295, 55);\r
             this.drop_chapterStart.Name = "drop_chapterStart";\r
             this.drop_chapterStart.Size = new System.Drawing.Size(69, 21);\r
             this.drop_chapterStart.TabIndex = 40;\r
@@ -260,7 +261,7 @@ namespace Handbrake
             this.drp_dvdtitle.FormattingEnabled = true;\r
             this.drp_dvdtitle.Items.AddRange(new object[] {\r
             "Automatic"});\r
-            this.drp_dvdtitle.Location = new System.Drawing.Point(99, 55);\r
+            this.drp_dvdtitle.Location = new System.Drawing.Point(99, 52);\r
             this.drp_dvdtitle.Name = "drp_dvdtitle";\r
             this.drp_dvdtitle.Size = new System.Drawing.Size(119, 21);\r
             this.drp_dvdtitle.TabIndex = 39;\r
@@ -273,7 +274,7 @@ namespace Handbrake
             // \r
             this.RadioISO.AutoSize = true;\r
             this.RadioISO.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioISO.Location = new System.Drawing.Point(549, 25);\r
+            this.RadioISO.Location = new System.Drawing.Point(549, 22);\r
             this.RadioISO.Name = "RadioISO";\r
             this.RadioISO.Size = new System.Drawing.Size(44, 17);\r
             this.RadioISO.TabIndex = 19;\r
@@ -285,7 +286,7 @@ namespace Handbrake
             // \r
             this.text_source.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_source.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_source.Location = new System.Drawing.Point(99, 22);\r
+            this.text_source.Location = new System.Drawing.Point(99, 19);\r
             this.text_source.Name = "text_source";\r
             this.text_source.Size = new System.Drawing.Size(294, 21);\r
             this.text_source.TabIndex = 1;\r
@@ -308,7 +309,7 @@ namespace Handbrake
             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
             this.btn_Browse.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_Browse.Location = new System.Drawing.Point(399, 22);\r
+            this.btn_Browse.Location = new System.Drawing.Point(399, 19);\r
             this.btn_Browse.Name = "btn_Browse";\r
             this.btn_Browse.Size = new System.Drawing.Size(78, 22);\r
             this.btn_Browse.TabIndex = 2;\r
@@ -322,7 +323,7 @@ namespace Handbrake
             this.text_height.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_height.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.text_height.ForeColor = System.Drawing.SystemColors.InfoText;\r
-            this.text_height.Location = new System.Drawing.Point(196, 58);\r
+            this.text_height.Location = new System.Drawing.Point(196, 54);\r
             this.text_height.Name = "text_height";\r
             this.text_height.Size = new System.Drawing.Size(64, 21);\r
             this.text_height.TabIndex = 8;\r
@@ -333,7 +334,7 @@ namespace Handbrake
             // \r
             this.text_width.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_width.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_width.Location = new System.Drawing.Point(104, 58);\r
+            this.text_width.Location = new System.Drawing.Point(104, 54);\r
             this.text_width.Name = "text_width";\r
             this.text_width.Size = new System.Drawing.Size(64, 21);\r
             this.text_width.TabIndex = 7;\r
@@ -366,7 +367,7 @@ namespace Handbrake
             "H.264",\r
             "H.264 (iPod)",\r
             "H.264 Baseline 1.3"});\r
-            this.drp_videoEncoder.Location = new System.Drawing.Point(104, 25);\r
+            this.drp_videoEncoder.Location = new System.Drawing.Point(104, 21);\r
             this.drp_videoEncoder.Name = "drp_videoEncoder";\r
             this.drp_videoEncoder.Size = new System.Drawing.Size(156, 21);\r
             this.drp_videoEncoder.TabIndex = 5;\r
@@ -384,7 +385,7 @@ namespace Handbrake
             "MP3",\r
             "Vorbis",\r
             "AC3"});\r
-            this.drp_audioCodec.Location = new System.Drawing.Point(376, 24);\r
+            this.drp_audioCodec.Location = new System.Drawing.Point(376, 20);\r
             this.drp_audioCodec.Name = "drp_audioCodec";\r
             this.drp_audioCodec.Size = new System.Drawing.Size(111, 21);\r
             this.drp_audioCodec.TabIndex = 6;\r
@@ -410,7 +411,7 @@ namespace Handbrake
             this.QueryEditorText.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.QueryEditorText.Location = new System.Drawing.Point(16, 88);\r
             this.QueryEditorText.Name = "QueryEditorText";\r
-            this.QueryEditorText.Size = new System.Drawing.Size(605, 122);\r
+            this.QueryEditorText.Size = new System.Drawing.Size(605, 93);\r
             this.QueryEditorText.TabIndex = 41;\r
             this.QueryEditorText.Text = "";\r
             this.ToolTip.SetToolTip(this.QueryEditorText, "Manually add or edit a query generated by the GUI.");\r
@@ -420,7 +421,7 @@ namespace Handbrake
             this.rtf_h264advanced.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.rtf_h264advanced.Location = new System.Drawing.Point(16, 79);\r
             this.rtf_h264advanced.Name = "rtf_h264advanced";\r
-            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 96);\r
+            this.rtf_h264advanced.Size = new System.Drawing.Size(605, 76);\r
             this.rtf_h264advanced.TabIndex = 41;\r
             this.rtf_h264advanced.Text = "";\r
             this.ToolTip.SetToolTip(this.rtf_h264advanced, "H.264 advanced options can be added here. See link below for details.");\r
@@ -648,6 +649,7 @@ namespace Handbrake
             // \r
             // mnu_encode\r
             // \r
+            this.mnu_encode.Image = global::Handbrake.Properties.Resources.Queue_Small;\r
             this.mnu_encode.Name = "mnu_encode";\r
             this.mnu_encode.Size = new System.Drawing.Size(155, 22);\r
             this.mnu_encode.Text = "View Queue";\r
@@ -655,6 +657,7 @@ namespace Handbrake
             // \r
             // mnu_viewDVDdata\r
             // \r
+            this.mnu_viewDVDdata.Image = global::Handbrake.Properties.Resources.Output_Small;\r
             this.mnu_viewDVDdata.Name = "mnu_viewDVDdata";\r
             this.mnu_viewDVDdata.Size = new System.Drawing.Size(155, 22);\r
             this.mnu_viewDVDdata.Text = "View DVD data";\r
@@ -667,6 +670,7 @@ namespace Handbrake
             // \r
             // mnu_options\r
             // \r
+            this.mnu_options.Image = global::Handbrake.Properties.Resources.Pref_Small;\r
             this.mnu_options.Name = "mnu_options";\r
             this.mnu_options.Size = new System.Drawing.Size(155, 22);\r
             this.mnu_options.Text = "Options";\r
@@ -963,7 +967,7 @@ namespace Handbrake
             this.GroupBox1.ForeColor = System.Drawing.Color.Black;\r
             this.GroupBox1.Location = new System.Drawing.Point(14, 35);\r
             this.GroupBox1.Name = "GroupBox1";\r
-            this.GroupBox1.Size = new System.Drawing.Size(647, 98);\r
+            this.GroupBox1.Size = new System.Drawing.Size(647, 87);\r
             this.GroupBox1.TabIndex = 408;\r
             this.GroupBox1.TabStop = false;\r
             this.GroupBox1.Text = "Source";\r
@@ -972,7 +976,7 @@ namespace Handbrake
             // \r
             this.Label13.AutoSize = true;\r
             this.Label13.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label13.Location = new System.Drawing.Point(374, 61);\r
+            this.Label13.Location = new System.Drawing.Point(374, 58);\r
             this.Label13.Name = "Label13";\r
             this.Label13.Size = new System.Drawing.Size(21, 13);\r
             this.Label13.TabIndex = 42;\r
@@ -983,7 +987,7 @@ namespace Handbrake
             this.RadioDVD.AutoSize = true;\r
             this.RadioDVD.Checked = true;\r
             this.RadioDVD.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.RadioDVD.Location = new System.Drawing.Point(483, 25);\r
+            this.RadioDVD.Location = new System.Drawing.Point(483, 22);\r
             this.RadioDVD.Name = "RadioDVD";\r
             this.RadioDVD.Size = new System.Drawing.Size(60, 17);\r
             this.RadioDVD.TabIndex = 20;\r
@@ -996,7 +1000,7 @@ namespace Handbrake
             this.Label17.AutoSize = true;\r
             this.Label17.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label17.ForeColor = System.Drawing.Color.Black;\r
-            this.Label17.Location = new System.Drawing.Point(12, 25);\r
+            this.Label17.Location = new System.Drawing.Point(17, 22);\r
             this.Label17.Name = "Label17";\r
             this.Label17.Size = new System.Drawing.Size(52, 13);\r
             this.Label17.TabIndex = 6;\r
@@ -1007,7 +1011,7 @@ namespace Handbrake
             this.Label9.AutoSize = true;\r
             this.Label9.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label9.ForeColor = System.Drawing.Color.Black;\r
-            this.Label9.Location = new System.Drawing.Point(224, 61);\r
+            this.Label9.Location = new System.Drawing.Point(224, 58);\r
             this.Label9.Name = "Label9";\r
             this.Label9.Size = new System.Drawing.Size(64, 13);\r
             this.Label9.TabIndex = 12;\r
@@ -1018,7 +1022,7 @@ namespace Handbrake
             this.Label10.AutoSize = true;\r
             this.Label10.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label10.ForeColor = System.Drawing.Color.Black;\r
-            this.Label10.Location = new System.Drawing.Point(12, 61);\r
+            this.Label10.Location = new System.Drawing.Point(17, 55);\r
             this.Label10.Name = "Label10";\r
             this.Label10.Size = new System.Drawing.Size(36, 13);\r
             this.Label10.TabIndex = 11;\r
@@ -1039,9 +1043,9 @@ namespace Handbrake
             this.groupBox_output.Controls.Add(this.Label12);\r
             this.groupBox_output.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.groupBox_output.ForeColor = System.Drawing.Color.Black;\r
-            this.groupBox_output.Location = new System.Drawing.Point(14, 194);\r
+            this.groupBox_output.Location = new System.Drawing.Point(14, 185);\r
             this.groupBox_output.Name = "groupBox_output";\r
-            this.groupBox_output.Size = new System.Drawing.Size(647, 89);\r
+            this.groupBox_output.Size = new System.Drawing.Size(647, 82);\r
             this.groupBox_output.TabIndex = 409;\r
             this.groupBox_output.TabStop = false;\r
             this.groupBox_output.Text = "Output Settings (Preset: None)";\r
@@ -1051,7 +1055,7 @@ namespace Handbrake
             this.Label56.AutoSize = true;\r
             this.Label56.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label56.ForeColor = System.Drawing.Color.Black;\r
-            this.Label56.Location = new System.Drawing.Point(175, 61);\r
+            this.Label56.Location = new System.Drawing.Point(175, 57);\r
             this.Label56.Name = "Label56";\r
             this.Label56.Size = new System.Drawing.Size(15, 13);\r
             this.Label56.TabIndex = 38;\r
@@ -1061,7 +1065,7 @@ namespace Handbrake
             // \r
             this.lbl_Aspect.AutoSize = true;\r
             this.lbl_Aspect.Font = new System.Drawing.Font("Verdana", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_Aspect.Location = new System.Drawing.Point(374, 62);\r
+            this.lbl_Aspect.Location = new System.Drawing.Point(374, 58);\r
             this.lbl_Aspect.Name = "lbl_Aspect";\r
             this.lbl_Aspect.Size = new System.Drawing.Size(72, 12);\r
             this.lbl_Aspect.TabIndex = 41;\r
@@ -1071,7 +1075,7 @@ namespace Handbrake
             // \r
             this.Label91.AutoSize = true;\r
             this.Label91.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label91.Location = new System.Drawing.Point(270, 62);\r
+            this.Label91.Location = new System.Drawing.Point(270, 58);\r
             this.Label91.Name = "Label91";\r
             this.Label91.Size = new System.Drawing.Size(87, 13);\r
             this.Label91.TabIndex = 40;\r
@@ -1082,7 +1086,7 @@ namespace Handbrake
             this.Label55.AutoSize = true;\r
             this.Label55.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label55.ForeColor = System.Drawing.Color.Black;\r
-            this.Label55.Location = new System.Drawing.Point(17, 62);\r
+            this.Label55.Location = new System.Drawing.Point(17, 58);\r
             this.Label55.Name = "Label55";\r
             this.Label55.Size = new System.Drawing.Size(85, 13);\r
             this.Label55.TabIndex = 29;\r
@@ -1093,7 +1097,7 @@ namespace Handbrake
             this.Label47.AutoSize = true;\r
             this.Label47.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label47.ForeColor = System.Drawing.Color.Black;\r
-            this.Label47.Location = new System.Drawing.Point(17, 28);\r
+            this.Label47.Location = new System.Drawing.Point(17, 24);\r
             this.Label47.Name = "Label47";\r
             this.Label47.Size = new System.Drawing.Size(62, 13);\r
             this.Label47.TabIndex = 12;\r
@@ -1104,7 +1108,7 @@ namespace Handbrake
             this.Label12.AutoSize = true;\r
             this.Label12.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.Label12.ForeColor = System.Drawing.Color.Black;\r
-            this.Label12.Location = new System.Drawing.Point(270, 28);\r
+            this.Label12.Location = new System.Drawing.Point(270, 24);\r
             this.Label12.Name = "Label12";\r
             this.Label12.Size = new System.Drawing.Size(94, 13);\r
             this.Label12.TabIndex = 20;\r
@@ -1115,18 +1119,18 @@ namespace Handbrake
             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.ForeColor = System.Drawing.Color.Black;\r
-            this.Label3.Location = new System.Drawing.Point(12, 23);\r
+            this.Label3.Location = new System.Drawing.Point(17, 21);\r
             this.Label3.Name = "Label3";\r
-            this.Label3.Size = new System.Drawing.Size(80, 13);\r
+            this.Label3.Size = new System.Drawing.Size(31, 13);\r
             this.Label3.TabIndex = 3;\r
-            this.Label3.Text = "Destination: ";\r
+            this.Label3.Text = "File:";\r
             // \r
             // lbl_update\r
             // \r
             this.lbl_update.AutoSize = true;\r
             this.lbl_update.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.lbl_update.ForeColor = System.Drawing.Color.Black;\r
-            this.lbl_update.Location = new System.Drawing.Point(102, 594);\r
+            this.lbl_update.Location = new System.Drawing.Point(93, 540);\r
             this.lbl_update.Name = "lbl_update";\r
             this.lbl_update.Size = new System.Drawing.Size(193, 13);\r
             this.lbl_update.TabIndex = 417;\r
@@ -1140,7 +1144,7 @@ namespace Handbrake
             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
             this.btn_queue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_queue.Location = new System.Drawing.Point(415, 589);\r
+            this.btn_queue.Location = new System.Drawing.Point(414, 535);\r
             this.btn_queue.Name = "btn_queue";\r
             this.btn_queue.Size = new System.Drawing.Size(115, 22);\r
             this.btn_queue.TabIndex = 416;\r
@@ -1156,7 +1160,7 @@ namespace Handbrake
             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
             this.btn_encode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_encode.Location = new System.Drawing.Point(536, 589);\r
+            this.btn_encode.Location = new System.Drawing.Point(535, 535);\r
             this.btn_encode.Name = "btn_encode";\r
             this.btn_encode.Size = new System.Drawing.Size(124, 22);\r
             this.btn_encode.TabIndex = 414;\r
@@ -1169,17 +1173,17 @@ namespace Handbrake
             // \r
             this.Version.BackColor = System.Drawing.Color.Transparent;\r
             this.Version.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Version.Location = new System.Drawing.Point(12, 594);\r
+            this.Version.Location = new System.Drawing.Point(11, 540);\r
             this.Version.Name = "Version";\r
-            this.Version.Size = new System.Drawing.Size(94, 20);\r
+            this.Version.Size = new System.Drawing.Size(84, 20);\r
             this.Version.TabIndex = 415;\r
-            this.Version.Text = "Version 2.4";\r
+            this.Version.Text = "Version 2.4.1";\r
             // \r
             // lbl_encode\r
             // \r
             this.lbl_encode.AutoSize = true;\r
             this.lbl_encode.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.lbl_encode.Location = new System.Drawing.Point(12, 571);\r
+            this.lbl_encode.Location = new System.Drawing.Point(11, 520);\r
             this.lbl_encode.Name = "lbl_encode";\r
             this.lbl_encode.Size = new System.Drawing.Size(129, 13);\r
             this.lbl_encode.TabIndex = 418;\r
@@ -1194,7 +1198,7 @@ namespace Handbrake
             this.btn_eCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_eCancel.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_eCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_eCancel.Location = new System.Drawing.Point(344, 589);\r
+            this.btn_eCancel.Location = new System.Drawing.Point(343, 535);\r
             this.btn_eCancel.Name = "btn_eCancel";\r
             this.btn_eCancel.Size = new System.Drawing.Size(65, 22);\r
             this.btn_eCancel.TabIndex = 419;\r
@@ -1207,6 +1211,7 @@ namespace Handbrake
             // TabPage6\r
             // \r
             this.TabPage6.BackColor = System.Drawing.SystemColors.ControlLight;\r
+            this.TabPage6.Controls.Add(this.button1);\r
             this.TabPage6.Controls.Add(this.label23);\r
             this.TabPage6.Controls.Add(this.Label7);\r
             this.TabPage6.Controls.Add(this.Label39);\r
@@ -1216,10 +1221,19 @@ namespace Handbrake
             this.TabPage6.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage6.Name = "TabPage6";\r
             this.TabPage6.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage6.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage6.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage6.TabIndex = 6;\r
             this.TabPage6.Text = "Query Editor";\r
             // \r
+            // label23\r
+            // \r
+            this.label23.AutoSize = true;\r
+            this.label23.Location = new System.Drawing.Point(13, 186);\r
+            this.label23.Name = "label23";\r
+            this.label23.Size = new System.Drawing.Size(403, 13);\r
+            this.label23.TabIndex = 43;\r
+            this.label23.Text = "Remember to re-generate the query each time you change a setting!";\r
+            // \r
             // Label7\r
             // \r
             this.Label7.AutoSize = true;\r
@@ -1261,7 +1275,7 @@ namespace Handbrake
             this.GenerateQuery.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
             this.GenerateQuery.Location = new System.Drawing.Point(16, 59);\r
             this.GenerateQuery.Name = "GenerateQuery";\r
-            this.GenerateQuery.Size = new System.Drawing.Size(176, 23);\r
+            this.GenerateQuery.Size = new System.Drawing.Size(154, 23);\r
             this.GenerateQuery.TabIndex = 38;\r
             this.GenerateQuery.Text = "Generate Query Now";\r
             this.GenerateQuery.UseVisualStyleBackColor = true;\r
@@ -1280,14 +1294,14 @@ namespace Handbrake
             this.h264Tab.Location = new System.Drawing.Point(4, 22);\r
             this.h264Tab.Name = "h264Tab";\r
             this.h264Tab.Padding = new System.Windows.Forms.Padding(3);\r
-            this.h264Tab.Size = new System.Drawing.Size(639, 242);\r
+            this.h264Tab.Size = new System.Drawing.Size(639, 211);\r
             this.h264Tab.TabIndex = 5;\r
             this.h264Tab.Text = "H.264";\r
             // \r
             // Label43\r
             // \r
             this.Label43.AutoSize = true;\r
-            this.Label43.Location = new System.Drawing.Point(78, 206);\r
+            this.Label43.Location = new System.Drawing.Point(78, 187);\r
             this.Label43.Name = "Label43";\r
             this.Label43.Size = new System.Drawing.Size(158, 13);\r
             this.Label43.TabIndex = 48;\r
@@ -1296,7 +1310,7 @@ namespace Handbrake
             // label_h264\r
             // \r
             this.label_h264.AutoSize = true;\r
-            this.label_h264.Location = new System.Drawing.Point(13, 206);\r
+            this.label_h264.Location = new System.Drawing.Point(13, 187);\r
             this.label_h264.Name = "label_h264";\r
             this.label_h264.Size = new System.Drawing.Size(66, 13);\r
             this.label_h264.TabIndex = 47;\r
@@ -1307,7 +1321,7 @@ namespace Handbrake
             // Label95\r
             // \r
             this.Label95.AutoSize = true;\r
-            this.Label95.Location = new System.Drawing.Point(13, 187);\r
+            this.Label95.Location = new System.Drawing.Point(13, 168);\r
             this.Label95.Name = "Label95";\r
             this.Label95.Size = new System.Drawing.Size(387, 13);\r
             this.Label95.TabIndex = 46;\r
@@ -1368,7 +1382,7 @@ namespace Handbrake
             this.TabPage2.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage2.Name = "TabPage2";\r
             this.TabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage2.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage2.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage2.TabIndex = 3;\r
             this.TabPage2.Text = "Audio && Subtitles";\r
             // \r
@@ -1522,7 +1536,7 @@ namespace Handbrake
             this.TabPage3.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage3.Name = "TabPage3";\r
             this.TabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage3.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage3.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage3.TabIndex = 2;\r
             this.TabPage3.Text = "Video Settings";\r
             // \r
@@ -1647,7 +1661,7 @@ namespace Handbrake
             this.TabPage1.Location = new System.Drawing.Point(4, 22);\r
             this.TabPage1.Name = "TabPage1";\r
             this.TabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-            this.TabPage1.Size = new System.Drawing.Size(639, 242);\r
+            this.TabPage1.Size = new System.Drawing.Size(639, 211);\r
             this.TabPage1.TabIndex = 0;\r
             this.TabPage1.Text = "Picture Settings";\r
             // \r
@@ -1803,7 +1817,7 @@ namespace Handbrake
             // \r
             this.Label53.AutoSize = true;\r
             this.Label53.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label53.Location = new System.Drawing.Point(134, 196);\r
+            this.Label53.Location = new System.Drawing.Point(134, 187);\r
             this.Label53.Name = "Label53";\r
             this.Label53.Size = new System.Drawing.Size(48, 13);\r
             this.Label53.TabIndex = 32;\r
@@ -1813,7 +1827,7 @@ namespace Handbrake
             // \r
             this.Label52.AutoSize = true;\r
             this.Label52.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label52.Location = new System.Drawing.Point(138, 105);\r
+            this.Label52.Location = new System.Drawing.Point(138, 96);\r
             this.Label52.Name = "Label52";\r
             this.Label52.Size = new System.Drawing.Size(28, 13);\r
             this.Label52.TabIndex = 31;\r
@@ -1843,7 +1857,7 @@ namespace Handbrake
             // \r
             this.Label15.AutoSize = true;\r
             this.Label15.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.Label15.Location = new System.Drawing.Point(39, 148);\r
+            this.Label15.Location = new System.Drawing.Point(39, 139);\r
             this.Label15.Name = "Label15";\r
             this.Label15.Size = new System.Drawing.Size(28, 13);\r
             this.Label15.TabIndex = 29;\r
@@ -1853,7 +1867,7 @@ namespace Handbrake
             // \r
             this.text_top.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_top.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_top.Location = new System.Drawing.Point(131, 120);\r
+            this.text_top.Location = new System.Drawing.Point(131, 111);\r
             this.text_top.Name = "text_top";\r
             this.text_top.Size = new System.Drawing.Size(51, 21);\r
             this.text_top.TabIndex = 10;\r
@@ -1863,7 +1877,7 @@ namespace Handbrake
             // \r
             this.text_bottom.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_bottom.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_bottom.Location = new System.Drawing.Point(131, 172);\r
+            this.text_bottom.Location = new System.Drawing.Point(131, 163);\r
             this.text_bottom.Name = "text_bottom";\r
             this.text_bottom.Size = new System.Drawing.Size(51, 21);\r
             this.text_bottom.TabIndex = 12;\r
@@ -1889,7 +1903,7 @@ namespace Handbrake
             // \r
             this.text_right.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_right.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_right.Location = new System.Drawing.Point(190, 145);\r
+            this.text_right.Location = new System.Drawing.Point(190, 136);\r
             this.text_right.Name = "text_right";\r
             this.text_right.Size = new System.Drawing.Size(51, 21);\r
             this.text_right.TabIndex = 13;\r
@@ -1899,7 +1913,7 @@ namespace Handbrake
             // \r
             this.text_left.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;\r
             this.text_left.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.text_left.Location = new System.Drawing.Point(72, 145);\r
+            this.text_left.Location = new System.Drawing.Point(72, 136);\r
             this.text_left.Name = "text_left";\r
             this.text_left.Size = new System.Drawing.Size(51, 21);\r
             this.text_left.TabIndex = 11;\r
@@ -1913,10 +1927,10 @@ 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(14, 295);\r
+            this.advancedOptions.Location = new System.Drawing.Point(14, 276);\r
             this.advancedOptions.Name = "advancedOptions";\r
             this.advancedOptions.SelectedIndex = 0;\r
-            this.advancedOptions.Size = new System.Drawing.Size(647, 268);\r
+            this.advancedOptions.Size = new System.Drawing.Size(647, 237);\r
             this.advancedOptions.TabIndex = 411;\r
             this.advancedOptions.TabStop = false;\r
             // \r
@@ -1926,28 +1940,32 @@ namespace Handbrake
             this.groupBox_dest.Controls.Add(this.text_destination);\r
             this.groupBox_dest.Controls.Add(this.btn_destBrowse);\r
             this.groupBox_dest.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.groupBox_dest.Location = new System.Drawing.Point(14, 138);\r
+            this.groupBox_dest.Location = new System.Drawing.Point(14, 128);\r
             this.groupBox_dest.Name = "groupBox_dest";\r
             this.groupBox_dest.Size = new System.Drawing.Size(646, 50);\r
             this.groupBox_dest.TabIndex = 420;\r
             this.groupBox_dest.TabStop = false;\r
             this.groupBox_dest.Text = "Destination";\r
             // \r
-            // label23\r
+            // button1\r
             // \r
-            this.label23.AutoSize = true;\r
-            this.label23.Location = new System.Drawing.Point(13, 221);\r
-            this.label23.Name = "label23";\r
-            this.label23.Size = new System.Drawing.Size(403, 13);\r
-            this.label23.TabIndex = 43;\r
-            this.label23.Text = "Remember to re-generate the query each time you change a setting!";\r
+            this.button1.FlatAppearance.BorderColor = System.Drawing.Color.Black;\r
+            this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.button1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
+            this.button1.Location = new System.Drawing.Point(176, 59);\r
+            this.button1.Name = "button1";\r
+            this.button1.Size = new System.Drawing.Size(134, 23);\r
+            this.button1.TabIndex = 44;\r
+            this.button1.Text = "Copy to Clipboard";\r
+            this.button1.UseVisualStyleBackColor = true;\r
             // \r
             // frmMain\r
             // \r
             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(675, 621);\r
+            this.ClientSize = new System.Drawing.Size(675, 564);\r
             this.Controls.Add(this.groupBox_dest);\r
             this.Controls.Add(this.btn_eCancel);\r
             this.Controls.Add(this.lbl_encode);\r
@@ -1960,7 +1978,7 @@ namespace Handbrake
             this.Controls.Add(this.GroupBox1);\r
             this.Controls.Add(this.frmMainMenu);\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
-            this.MinimumSize = new System.Drawing.Size(683, 648);\r
+            this.MinimumSize = new System.Drawing.Size(683, 580);\r
             this.Name = "frmMain";\r
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
             this.Text = "Handbrake";\r
@@ -2147,6 +2165,7 @@ namespace Handbrake
         internal System.Windows.Forms.Label label4;\r
         internal System.Windows.Forms.ComboBox drp_deInterlace_option;\r
         private System.Windows.Forms.Label label23;\r
+        internal System.Windows.Forms.Button button1;\r
 \r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index f3bb3e6..dcbc30b 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -32,7 +32,6 @@ namespace Handbrake
             this.btn_down = new System.Windows.Forms.Button();\r
             this.btn_up = new System.Windows.Forms.Button();\r
             this.btn_delete = new System.Windows.Forms.Button();\r
-            this.Label1 = new System.Windows.Forms.Label();\r
             this.btn_q_encoder = new System.Windows.Forms.Button();\r
             this.list_queue = new System.Windows.Forms.ListBox();\r
             this.btn_Close = new System.Windows.Forms.Button();\r
@@ -40,6 +39,10 @@ namespace Handbrake
             this.label2 = new System.Windows.Forms.Label();\r
             this.lbl_progressValue = new System.Windows.Forms.Label();\r
             this.btn_minimise = new System.Windows.Forms.Button();\r
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
+            this.label3 = new System.Windows.Forms.Label();\r
+            this.label1 = new System.Windows.Forms.Label();\r
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             // btn_down\r
@@ -49,9 +52,9 @@ namespace Handbrake
             this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_down.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_down.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_down.Location = new System.Drawing.Point(585, 9);\r
+            this.btn_down.Location = new System.Drawing.Point(650, 144);\r
             this.btn_down.Name = "btn_down";\r
-            this.btn_down.Size = new System.Drawing.Size(55, 22);\r
+            this.btn_down.Size = new System.Drawing.Size(64, 22);\r
             this.btn_down.TabIndex = 33;\r
             this.btn_down.TabStop = false;\r
             this.btn_down.Text = "Down";\r
@@ -65,9 +68,9 @@ namespace Handbrake
             this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_up.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_up.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_up.Location = new System.Drawing.Point(539, 9);\r
+            this.btn_up.Location = new System.Drawing.Point(649, 116);\r
             this.btn_up.Name = "btn_up";\r
-            this.btn_up.Size = new System.Drawing.Size(40, 22);\r
+            this.btn_up.Size = new System.Drawing.Size(64, 22);\r
             this.btn_up.TabIndex = 32;\r
             this.btn_up.TabStop = false;\r
             this.btn_up.Text = "Up";\r
@@ -81,24 +84,15 @@ namespace Handbrake
             this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_delete.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_delete.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_delete.Location = new System.Drawing.Point(140, 374);\r
+            this.btn_delete.Location = new System.Drawing.Point(650, 190);\r
             this.btn_delete.Name = "btn_delete";\r
-            this.btn_delete.Size = new System.Drawing.Size(124, 22);\r
+            this.btn_delete.Size = new System.Drawing.Size(64, 22);\r
             this.btn_delete.TabIndex = 31;\r
             this.btn_delete.TabStop = false;\r
-            this.btn_delete.Text = "Delete Item";\r
+            this.btn_delete.Text = "Delete";\r
             this.btn_delete.UseVisualStyleBackColor = false;\r
             this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);\r
             // \r
-            // Label1\r
-            // \r
-            this.Label1.AutoSize = true;\r
-            this.Label1.Location = new System.Drawing.Point(10, 14);\r
-            this.Label1.Name = "Label1";\r
-            this.Label1.Size = new System.Drawing.Size(110, 13);\r
-            this.Label1.TabIndex = 30;\r
-            this.Label1.Text = "Videos on the Queue:";\r
-            // \r
             // btn_q_encoder\r
             // \r
             this.btn_q_encoder.BackColor = System.Drawing.SystemColors.ControlLight;\r
@@ -106,7 +100,7 @@ namespace Handbrake
             this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_q_encoder.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_q_encoder.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_q_encoder.Location = new System.Drawing.Point(10, 374);\r
+            this.btn_q_encoder.Location = new System.Drawing.Point(13, 302);\r
             this.btn_q_encoder.Name = "btn_q_encoder";\r
             this.btn_q_encoder.Size = new System.Drawing.Size(124, 22);\r
             this.btn_q_encoder.TabIndex = 29;\r
@@ -120,9 +114,9 @@ namespace Handbrake
             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.Location = new System.Drawing.Point(13, 72);\r
             this.list_queue.Name = "list_queue";\r
-            this.list_queue.Size = new System.Drawing.Size(630, 288);\r
+            this.list_queue.Size = new System.Drawing.Size(630, 184);\r
             this.list_queue.TabIndex = 28;\r
             // \r
             // btn_Close\r
@@ -132,7 +126,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(532, 374);\r
+            this.btn_Close.Location = new System.Drawing.Point(606, 305);\r
             this.btn_Close.Name = "btn_Close";\r
             this.btn_Close.Size = new System.Drawing.Size(108, 22);\r
             this.btn_Close.TabIndex = 27;\r
@@ -144,15 +138,16 @@ namespace Handbrake
             // progressBar\r
             // \r
             this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight;\r
-            this.progressBar.Location = new System.Drawing.Point(74, 331);\r
+            this.progressBar.Location = new System.Drawing.Point(67, 264);\r
             this.progressBar.Name = "progressBar";\r
-            this.progressBar.Size = new System.Drawing.Size(513, 23);\r
+            this.progressBar.Size = new System.Drawing.Size(573, 23);\r
+            this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
             this.progressBar.TabIndex = 34;\r
             // \r
             // label2\r
             // \r
             this.label2.AutoSize = true;\r
-            this.label2.Location = new System.Drawing.Point(7, 337);\r
+            this.label2.Location = new System.Drawing.Point(10, 270);\r
             this.label2.Name = "label2";\r
             this.label2.Size = new System.Drawing.Size(51, 13);\r
             this.label2.TabIndex = 35;\r
@@ -161,7 +156,7 @@ namespace Handbrake
             // lbl_progressValue\r
             // \r
             this.lbl_progressValue.AutoSize = true;\r
-            this.lbl_progressValue.Location = new System.Drawing.Point(605, 337);\r
+            this.lbl_progressValue.Location = new System.Drawing.Point(646, 270);\r
             this.lbl_progressValue.Name = "lbl_progressValue";\r
             this.lbl_progressValue.Size = new System.Drawing.Size(24, 13);\r
             this.lbl_progressValue.TabIndex = 36;\r
@@ -174,22 +169,53 @@ namespace Handbrake
             this.btn_minimise.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btn_minimise.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.btn_minimise.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(0)))));\r
-            this.btn_minimise.Location = new System.Drawing.Point(389, 374);\r
+            this.btn_minimise.Location = new System.Drawing.Point(471, 305);\r
             this.btn_minimise.Name = "btn_minimise";\r
-            this.btn_minimise.Size = new System.Drawing.Size(137, 22);\r
+            this.btn_minimise.Size = new System.Drawing.Size(129, 22);\r
             this.btn_minimise.TabIndex = 37;\r
             this.btn_minimise.TabStop = false;\r
             this.btn_minimise.Text = "Minimize Window";\r
             this.btn_minimise.UseVisualStyleBackColor = false;\r
             this.btn_minimise.Click += new System.EventHandler(this.btn_minimise_Click);\r
             // \r
+            // pictureBox1\r
+            // \r
+            this.pictureBox1.Image = global::Handbrake.Properties.Resources.Queue;\r
+            this.pictureBox1.Location = new System.Drawing.Point(13, 13);\r
+            this.pictureBox1.Name = "pictureBox1";\r
+            this.pictureBox1.Size = new System.Drawing.Size(32, 32);\r
+            this.pictureBox1.TabIndex = 38;\r
+            this.pictureBox1.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.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
+            this.label3.Location = new System.Drawing.Point(51, 25);\r
+            this.label3.Name = "label3";\r
+            this.label3.Size = new System.Drawing.Size(48, 13);\r
+            this.label3.TabIndex = 39;\r
+            this.label3.Text = "Queue";\r
+            // \r
+            // label1\r
+            // \r
+            this.label1.AutoSize = true;\r
+            this.label1.Location = new System.Drawing.Point(51, 43);\r
+            this.label1.Name = "label1";\r
+            this.label1.Size = new System.Drawing.Size(166, 13);\r
+            this.label1.TabIndex = 40;\r
+            this.label1.Text = "List of items ready to be encoded:";\r
+            // \r
             // frmQueue\r
             // \r
             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(657, 406);\r
+            this.ClientSize = new System.Drawing.Size(726, 339);\r
             this.ControlBox = false;\r
+            this.Controls.Add(this.label1);\r
+            this.Controls.Add(this.label3);\r
+            this.Controls.Add(this.pictureBox1);\r
             this.Controls.Add(this.btn_minimise);\r
             this.Controls.Add(this.lbl_progressValue);\r
             this.Controls.Add(this.label2);\r
@@ -197,18 +223,17 @@ namespace Handbrake
             this.Controls.Add(this.btn_down);\r
             this.Controls.Add(this.btn_up);\r
             this.Controls.Add(this.btn_delete);\r
-            this.Controls.Add(this.Label1);\r
             this.Controls.Add(this.btn_q_encoder);\r
             this.Controls.Add(this.list_queue);\r
             this.Controls.Add(this.btn_Close);\r
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;\r
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));\r
             this.MaximizeBox = false;\r
-            this.MaximumSize = new System.Drawing.Size(663, 431);\r
-            this.MinimumSize = new System.Drawing.Size(663, 431);\r
             this.Name = "frmQueue";\r
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;\r
-            this.Text = "Queue";\r
+            this.ShowIcon = false;\r
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;\r
+            this.Text = " ";\r
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -219,7 +244,6 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_down;\r
         internal System.Windows.Forms.Button btn_up;\r
         internal System.Windows.Forms.Button btn_delete;\r
-        internal System.Windows.Forms.Label Label1;\r
         internal System.Windows.Forms.Button btn_q_encoder;\r
         internal System.Windows.Forms.ListBox list_queue;\r
         internal System.Windows.Forms.Button btn_Close;\r
@@ -227,5 +251,8 @@ namespace Handbrake
         private System.Windows.Forms.Label label2;\r
         private System.Windows.Forms.Label lbl_progressValue;\r
         internal System.Windows.Forms.Button btn_minimise;\r
+        private System.Windows.Forms.PictureBox pictureBox1;\r
+        private System.Windows.Forms.Label label3;\r
+        private System.Windows.Forms.Label label1;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index c40ff26..bc45d31 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -171,5 +171,6 @@ namespace Handbrake
         }\r
 \r
         #endregion\r
+\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQuickStart.Designer.cs b/win/C#/frmQuickStart.Designer.cs
index 07f9488..479e67f 100644 (file)
--- a/win/C#/frmQuickStart.Designer.cs
+++ b/win/C#/frmQuickStart.Designer.cs
@@ -223,7 +223,7 @@ namespace Handbrake
             // pictureBox8\r
             // \r
             this.pictureBox8.ErrorImage = global::Handbrake.Properties.Resources.info;\r
-            this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Preferences;\r
+            this.pictureBox8.Image = global::Handbrake.Properties.Resources.General_Prefences;\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