WinGui:

- Enable tabstops on the add preset window.
- Confirm closing of program if Queue is running (ExDeus)
- Minor fixes/cleanup from Exdeus (Destination Browse Button, Tools > Show Queue,  MessageBox in frmQueue)
- Code cleanup in a few other files.

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

13 files changed, 155 insertions, 139 deletions

diff --git a/win/C#/Functions/Main.cs b/win/C#/Functions/Main.cs
index 13579c9ff..59af6bf85 100644
--- a/win/C#/Functions/Main.cs
+++ b/win/C#/Functions/Main.cs
@@ -30,7 +30,7 @@ namespace Handbrake.Functions
             // Get the durations between the 2 chapter points and add them together.

             if (chapter_start != "Auto" && chapter_end != "Auto")

             {

-                int start_chapter, end_chapter = 0;

+                int start_chapter, end_chapter;

                 int.TryParse(chapter_start, out start_chapter);

                 int.TryParse(chapter_end, out end_chapter);

 

@@ -56,6 +56,11 @@ namespace Handbrake.Functions
         /// Calculate the non-anamorphic resoltuion of the source

         /// </summary>

         /// <param name="width"></param>

+        /// <param name="top"></param>

+        /// <param name="bottom"></param>

+        /// <param name="left"></param>

+        /// <param name="right"></param>

+        /// <param name="selectedTitle"></param>

         /// <returns></returns>

         public int cacluateNonAnamorphicHeight(int width, decimal top, decimal bottom, decimal left, decimal right, Parsing.Title selectedTitle)

         {

@@ -109,18 +114,18 @@ namespace Handbrake.Functions
         public Parsing.Title selectLongestTitle(ComboBox drp_dvdtitle)

         {

             int current_largest = 0;

-            Handbrake.Parsing.Title title2Select;

+            Parsing.Title title2Select;

 

             // Check if there are titles in the DVD title dropdown menu and make sure, it's not just "Automatic"

             if (drp_dvdtitle.Items[0].ToString() != "Automatic")

-                title2Select = (Handbrake.Parsing.Title)drp_dvdtitle.Items[0];

+                title2Select = (Parsing.Title)drp_dvdtitle.Items[0];

             else

                 title2Select = null;

 

             // So, If there are titles in the DVD Title dropdown menu, lets select the longest.

             if (title2Select != null)

             {

-                foreach (Handbrake.Parsing.Title x in drp_dvdtitle.Items)

+                foreach (Parsing.Title x in drp_dvdtitle.Items)

                 {

                     string title = x.ToString();

                     if (title != "Automatic")

@@ -156,7 +161,6 @@ namespace Handbrake.Functions
         /// <summary>

         /// Set's up the DataGridView on the Chapters tab (frmMain)

         /// </summary>

-        /// <param name="mainWindow"></param>

         public DataGridView chapterNaming(DataGridView data_chpt, string chapter_end)

         {

             int i = 0, finish = 0;

@@ -181,7 +185,6 @@ namespace Handbrake.Functions
         /// Function which generates the filename and path automatically based on 

         /// the Source Name, DVD title and DVD Chapters

         /// </summary>

-        /// <param name="mainWindow"></param>

         public string autoName(ComboBox drp_dvdtitle, string chapter_start, string chatper_end, string source, string dest, int format)

         {

             string AutoNamePath = string.Empty;

@@ -202,7 +205,7 @@ namespace Handbrake.Functions
                     combinedChapterTag = chapterStart + "-" + chapterFinish;

 

                 // Get the destination filename.

-                string destination_filename = "";

+                string destination_filename;

                 if (Properties.Settings.Default.autoNameFormat != "")

                 {

                     destination_filename = Properties.Settings.Default.autoNameFormat;

@@ -228,15 +231,10 @@ namespace Handbrake.Functions
                 if (!dest.Contains(Path.DirectorySeparatorChar.ToString()))

                 {

                     // If there is an auto name path, use it...

-                    if (Properties.Settings.Default.autoNamePath.Trim() != "" && 

-                        Properties.Settings.Default.autoNamePath.Trim() != "Click 'Browse' to set the default location") 

-                    {

+                    if (Properties.Settings.Default.autoNamePath.Trim() != "" && Properties.Settings.Default.autoNamePath.Trim() != "Click 'Browse' to set the default location") 

                         AutoNamePath = Path.Combine(Properties.Settings.Default.autoNamePath, destination_filename);

-                    }

                     else // ...otherwise, output to the source directory

-                    {

                         AutoNamePath = null;

-                    }

                 }

                 else // Otherwise, use the path that is already there.

                 {

@@ -258,7 +256,7 @@ namespace Handbrake.Functions
         {

             try

             {

-                Functions.AppcastReader rssRead = new Functions.AppcastReader();

+                Functions.AppcastReader rssRead = new AppcastReader();

                 rssRead.getInfo(); // Initializes the class.

                 string build = rssRead.build();

 

@@ -268,16 +266,14 @@ namespace Handbrake.Functions
 

                 if (latest == skip)

                     return false;

-                else

-                {

-                    Boolean update = (latest > current);

-                    return update;

-                }

+                

+                Boolean update = (latest > current);

+                return update;

             }

             catch (Exception exc)

             {

-                if (debug == true)

-                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc.ToString(), "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

+                if (debug)

+                    MessageBox.Show("Unable to check for updates, Please try again later. \n" + exc, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);

                 return false;

             }

         }

diff --git a/win/C#/Functions/QueryParser.cs b/win/C#/Functions/QueryParser.cs
index b297ed68e..b3c8a70c3 100644
--- a/win/C#/Functions/QueryParser.cs
+++ b/win/C#/Functions/QueryParser.cs
@@ -8,7 +8,6 @@ using System;
 using System.Globalization;

 using System.Text.RegularExpressions;

 using System.Windows.Forms;

-using System.Collections;

 

 namespace Handbrake.Functions

 {

diff --git a/win/C#/Functions/QueryParserTester.cs b/win/C#/Functions/QueryParserTester.cs
index 75d8c30c1..1606a7724 100644
--- a/win/C#/Functions/QueryParserTester.cs
+++ b/win/C#/Functions/QueryParserTester.cs
@@ -1,9 +1,4 @@
 using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Data;

-using System.Drawing;

-using System.Text;

 using System.Windows.Forms;

 

 namespace Handbrake.Functions

diff --git a/win/C#/HandBrakeCS.csproj b/win/C#/HandBrakeCS.csproj
index 7ddbeb888..7542e6097 100644
--- a/win/C#/HandBrakeCS.csproj
+++ b/win/C#/HandBrakeCS.csproj
@@ -306,6 +306,7 @@
     <None Include="Resources\ActivityWindow.png" />

     <None Include="Resources\AddToQueue.png" />

     <Content Include="Resources\ActivityWindow_small.png" />

+    <None Include="Resources\AddToQueue_small.png" />

     <Content Include="Resources\copy.png" />

     <Content Include="Resources\disc_small.png" />

     <None Include="Resources\hb32.png" />

diff --git a/win/C#/Properties/Resources.Designer.cs b/win/C#/Properties/Resources.Designer.cs
index d347dc47b..70b73b78e 100644
--- a/win/C#/Properties/Resources.Designer.cs
+++ b/win/C#/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------

 // <auto-generated>

 //     This code was generated by a tool.

-//     Runtime Version:2.0.50727.3053

+//     Runtime Version:2.0.50727.1433

 //

 //     Changes to this file may cause incorrect behavior and will be lost if

 //     the code is regenerated.

@@ -81,6 +81,13 @@ namespace Handbrake.Properties {
             }

         }

         

+        internal static System.Drawing.Bitmap AddToQueue_small {

+            get {

+                object obj = ResourceManager.GetObject("AddToQueue_small", resourceCulture);

+                return ((System.Drawing.Bitmap)(obj));

+            }

+        }

+        

         internal static System.Drawing.Bitmap copy {

             get {

                 object obj = ResourceManager.GetObject("copy", resourceCulture);

diff --git a/win/C#/Properties/Resources.resx b/win/C#/Properties/Resources.resx
index db3ecbe0e..7807b0e53 100644
--- a/win/C#/Properties/Resources.resx
+++ b/win/C#/Properties/Resources.resx
@@ -196,4 +196,7 @@
   <data name="picture" type="System.Resources.ResXFileRef, System.Windows.Forms">

     <value>..\Resources\picture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

   </data>

+  <data name="AddToQueue_small" type="System.Resources.ResXFileRef, System.Windows.Forms">

+    <value>..\Resources\AddToQueue_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

+  </data>

 </root>
\ No newline at end of file
diff --git a/win/C#/Queue/QueueHandler.cs b/win/C#/Queue/QueueHandler.cs
index 3486e233a..478757e95 100644
--- a/win/C#/Queue/QueueHandler.cs
+++ b/win/C#/Queue/QueueHandler.cs
@@ -18,7 +18,7 @@ namespace Handbrake.Queue
     {

         private static XmlSerializer ser = new XmlSerializer(typeof(List<QueueItem>));

         List<QueueItem> queue = new List<QueueItem>();

-        int id = 0; // Unique identifer number for each job

+        int id; // Unique identifer number for each job

         private QueueItem lastItem;

 

         #region Queue Handling

@@ -53,6 +53,8 @@ namespace Handbrake.Queue
         /// Add's a new item to the queue

         /// </summary>

         /// <param name="query">String</param>

+        /// <param name="source"></param>

+        /// <param name="destination"></param>

         public void add(string query, string source, string destination)

         {

             QueueItem newJob = new QueueItem();

@@ -94,7 +96,7 @@ namespace Handbrake.Queue
         {

             if (index > 0)

             {

-                QueueItem item = (QueueItem)queue[index];

+                QueueItem item = queue[index];

 

                 queue.RemoveAt(index);

                 queue.Insert((index - 1), item);

@@ -109,7 +111,7 @@ namespace Handbrake.Queue
         {

             if (index < queue.Count - 1)

             {

-                QueueItem item = (QueueItem)queue[index];

+                QueueItem item = queue[index];

 

                 queue.RemoveAt(index);

                 queue.Insert((index + 1), item);

@@ -122,7 +124,7 @@ namespace Handbrake.Queue
         /// </summary>

         public void write2disk(string file)

         {

-            string tempPath = "";

+            string tempPath;

             if (file == "hb_queue_recovery.xml")

                 tempPath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");

             else

@@ -154,7 +156,7 @@ namespace Handbrake.Queue
             foreach (QueueItem queue_item in queue)

             {

                 string q_item = queue_item.Query;

-                string fullQuery = '"' + Application.StartupPath.ToString() + "\\HandBrakeCLI.exe" + '"' + q_item;

+                string fullQuery = '"' + Application.StartupPath + "\\HandBrakeCLI.exe" + '"' + q_item;

 

                 if (queries == string.Empty)

                     queries = queries + fullQuery;

@@ -188,7 +190,7 @@ namespace Handbrake.Queue
         /// </summary>

         public void recoverQueue(string file)

         {

-            string tempPath = "";

+            string tempPath;

             if (file == "hb_queue_recovery.xml")

                 tempPath = Path.Combine(Path.GetTempPath(), "hb_queue_recovery.xml");

             else

@@ -216,8 +218,8 @@ namespace Handbrake.Queue
         //------------------------------------------------------------------------

         Functions.Encode encodeHandler = new Functions.Encode();

         private Boolean started = false;

-        private Boolean paused = false;

-        private Boolean encoding = false;

+        private Boolean paused;

+        private Boolean encoding;

 

         #region Encoding

 

@@ -239,15 +241,14 @@ namespace Handbrake.Queue
             Thread theQueue;

             if (this.count() != 0)

             {

-                if (paused == true)

+                if (paused)

                     paused = false;

                 else

                 {

                     paused = false;

                     try

                     {

-                        theQueue = new Thread(startProc);

-                        theQueue.IsBackground = true;

+                        theQueue = new Thread(startProc) {IsBackground = true};

                         theQueue.Start();

                     }

                     catch (Exception exc)

@@ -265,7 +266,7 @@ namespace Handbrake.Queue
 

         private void startProc(object state)

         {

-            Process hbProc = new Process();

+            Process hbProc;

             try

             {

                 // Run through each item on the queue

@@ -283,11 +284,9 @@ namespace Handbrake.Queue
 

                     hbProc.Close();

                     hbProc.Dispose();

-                    hbProc = null;

-                    query = "";

                     EncodeFinished(null);

 

-                    while (paused == true) // Need to find a better way of doing this.

+                    while (paused) // Need to find a better way of doing this.

                     {

                         Thread.Sleep(10000);

                     }

diff --git a/win/C#/Resources/AddToQueue_small.png b/win/C#/Resources/AddToQueue_small.png
new file mode 100644
index 000000000..5bb08184f
--- /dev/null
+++ b/win/C#/Resources/AddToQueue_small.png
diff --git a/win/C#/frmAddPreset.Designer.cs b/win/C#/frmAddPreset.Designer.cs
index c7bea2b29..be37ade4a 100644
--- a/win/C#/frmAddPreset.Designer.cs
+++ b/win/C#/frmAddPreset.Designer.cs
@@ -60,7 +60,7 @@ namespace Handbrake
             this.txt_preset_name.Location = new System.Drawing.Point(109, 17);

             this.txt_preset_name.Name = "txt_preset_name";

             this.txt_preset_name.Size = new System.Drawing.Size(241, 21);

-            this.txt_preset_name.TabIndex = 2;

+            this.txt_preset_name.TabIndex = 0;

             // 

             // btn_add

             // 

@@ -68,11 +68,10 @@ namespace Handbrake
             this.btn_add.FlatAppearance.BorderColor = System.Drawing.Color.Black;

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

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

-            this.btn_add.Location = new System.Drawing.Point(284, 67);

+            this.btn_add.Location = new System.Drawing.Point(212, 72);

             this.btn_add.Name = "btn_add";

             this.btn_add.Size = new System.Drawing.Size(66, 22);

-            this.btn_add.TabIndex = 0;

-            this.btn_add.TabStop = false;

+            this.btn_add.TabIndex = 2;

             this.btn_add.Text = "Add";

             this.btn_add.UseVisualStyleBackColor = false;

             this.btn_add.Click += new System.EventHandler(this.btn_add_Click);

@@ -83,11 +82,10 @@ namespace Handbrake
             this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

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

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

-            this.btn_cancel.Location = new System.Drawing.Point(212, 67);

+            this.btn_cancel.Location = new System.Drawing.Point(284, 72);

             this.btn_cancel.Name = "btn_cancel";

             this.btn_cancel.Size = new System.Drawing.Size(66, 22);

             this.btn_cancel.TabIndex = 3;

-            this.btn_cancel.TabStop = false;

             this.btn_cancel.Text = "Cancel";

             this.btn_cancel.UseVisualStyleBackColor = false;

             this.btn_cancel.Click += new System.EventHandler(this.btn_cancel_Click);

@@ -98,7 +96,7 @@ namespace Handbrake
             this.check_pictureSettings.Location = new System.Drawing.Point(109, 44);

             this.check_pictureSettings.Name = "check_pictureSettings";

             this.check_pictureSettings.Size = new System.Drawing.Size(118, 17);

-            this.check_pictureSettings.TabIndex = 4;

+            this.check_pictureSettings.TabIndex = 1;

             this.check_pictureSettings.Text = "Use Picture Size";

             this.toolTip.SetToolTip(this.check_pictureSettings, "Save Picture Width/Height and Crop Values");

             this.check_pictureSettings.UseVisualStyleBackColor = true;

diff --git a/win/C#/frmMain.cs b/win/C#/frmMain.cs
index 4ec8b2892..a915148fb 100644
--- a/win/C#/frmMain.cs
+++ b/win/C#/frmMain.cs
@@ -222,7 +222,6 @@ namespace Handbrake
         #region Tools Menu

         private void mnu_encode_Click(object sender, EventArgs e)

         {

-            queueWindow.setQueue();

             queueWindow.Show();

         }

         private void mnu_encodeLog_Click(object sender, EventArgs e)

@@ -937,7 +936,8 @@ namespace Handbrake
         {

             // This removes the file extension from the filename box on the save file dialog.

             // It's daft but some users don't realise that typing an extension overrides the dropdown extension selected.

-            DVD_Save.FileName = DVD_Save.FileName.Replace(".mp4", "").Replace(".m4v", "").Replace(".mkv", "").Replace(".ogm", "").Replace(".avi", "");

+            DVD_Save.FileName = Path.Combine(Path.GetDirectoryName(text_destination.Text), Path.GetFileNameWithoutExtension(text_destination.Text));

+

 

             // Show the dialog and set the main form file path

             if (drop_format.SelectedIndex.Equals(0))

@@ -2103,7 +2103,24 @@ namespace Handbrake
 

         #endregion

 

-

+        #region overrides

+        /// <summary>

+        /// If the queue is being processed, prompt the user to confirm application close.

+        /// </summary>

+        /// <param name="e"></param>

+        protected override void OnFormClosing(FormClosingEventArgs e)

+        {

+            // If currently encoding, the queue isn't paused, and there are queue items to process, prompt to confirm close.

+            if ((encodeQueue.isEncoding) && (! encodeQueue.isPaused) && (encodeQueue.count() > 0))

+            {

+                DialogResult result = MessageBox.Show("HandBrake has queue items to process. Closing HandBrake will not stop the current encoding, but will stop processing the queue.\n\nDo you want to close HandBrake?",

+                    "Close HandBrake?", MessageBoxButtons.YesNo, MessageBoxIcon.Question);

+                if (result == DialogResult.No)

+                    e.Cancel = true;

+            }

+            base.OnFormClosing(e);

+        }

+        #endregion

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

     }

 }

diff --git a/win/C#/frmMain/QueryGenerator.cs b/win/C#/frmMain/QueryGenerator.cs
index 2c0417397..05e73b841 100644
--- a/win/C#/frmMain/QueryGenerator.cs
+++ b/win/C#/frmMain/QueryGenerator.cs
@@ -219,9 +219,9 @@ namespace Handbrake
                         break;

                     case "H.264 (x264)":

                         double divided;

-                        System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.CreateSpecificCulture("en-US");

+                        System.Globalization.CultureInfo culture = CultureInfo.CreateSpecificCulture("en-US");

                         double.TryParse(Properties.Settings.Default.x264cqstep,

-                                        System.Globalization.NumberStyles.Number,

+                                        NumberStyles.Number,

                                         culture,

                                         out divided);

                         value = 51 - mainWindow.slider_videoQuality.Value * divided;

@@ -384,8 +384,7 @@ namespace Handbrake
                 query += " -U ";

             else if (subtitles != "" && subtitles != "None")

             {

-                string[] tempSub;

-                tempSub = subtitles.Split(' ');

+                string[] tempSub = subtitles.Split(' ');

                 query += " -s " + tempSub[0];

             }

 

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 0f09bf69e..259450dab 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -50,15 +50,7 @@ namespace Handbrake
             this.label1 = new System.Windows.Forms.Label();

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

             this.toolStrip1 = new System.Windows.Forms.ToolStrip();

-            this.btn_encode = new System.Windows.Forms.ToolStripButton();

-            this.btn_pause = new System.Windows.Forms.ToolStripButton();

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

-            this.drop_button_queue = new System.Windows.Forms.ToolStripDropDownButton();

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

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

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

-            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();

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

             this.SaveFile = new System.Windows.Forms.SaveFileDialog();

             this.list_queue = new System.Windows.Forms.ListView();

             this.Title = new System.Windows.Forms.ColumnHeader();

@@ -74,6 +66,14 @@ namespace Handbrake
             this.panel3 = new System.Windows.Forms.Panel();

             this.panel2 = new System.Windows.Forms.Panel();

             this.panel1 = new System.Windows.Forms.Panel();

+            this.btn_encode = new System.Windows.Forms.ToolStripButton();

+            this.btn_pause = new System.Windows.Forms.ToolStripButton();

+            this.drop_button_queue = new System.Windows.Forms.ToolStripDropDownButton();

+            this.mnu_batch = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_import = new System.Windows.Forms.ToolStripMenuItem();

+            this.mnu_export = new System.Windows.Forms.ToolStripMenuItem();

+            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();

+            this.mnu_readd = new System.Windows.Forms.ToolStripMenuItem();

             this.toolStrip1.SuspendLayout();

             this.statusStrip1.SuspendLayout();

             this.splitContainer1.Panel1.SuspendLayout();

@@ -230,84 +230,11 @@ namespace Handbrake
             this.toolStrip1.TabIndex = 71;

             this.toolStrip1.Text = "toolStrip1";

             // 

-            // btn_encode

-            // 

-            this.btn_encode.Image = global::Handbrake.Properties.Resources.Play;

-            this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

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

-            this.btn_encode.Name = "btn_encode";

-            this.btn_encode.Size = new System.Drawing.Size(84, 36);

-            this.btn_encode.Text = "Encode";

-            this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);

-            // 

-            // btn_pause

-            // 

-            this.btn_pause.Image = global::Handbrake.Properties.Resources.Pause;

-            this.btn_pause.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

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

-            this.btn_pause.Name = "btn_pause";

-            this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

-            this.btn_pause.Size = new System.Drawing.Size(75, 36);

-            this.btn_pause.Text = "Pause";

-            this.btn_pause.Visible = false;

-            this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);

-            // 

             // toolStripSeparator1

             // 

             this.toolStripSeparator1.Name = "toolStripSeparator1";

             this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39);

             // 

-            // drop_button_queue

-            // 

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

-            this.mnu_batch,

-            this.mnu_import,

-            this.mnu_export,

-            this.toolStripSeparator2,

-            this.mnu_readd});

-            this.drop_button_queue.Image = global::Handbrake.Properties.Resources.ActivityWindow;

-            this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

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

-            this.drop_button_queue.Name = "drop_button_queue";

-            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);

-            this.drop_button_queue.Text = "Queue";

-            // 

-            // mnu_batch

-            // 

-            this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;

-            this.mnu_batch.Name = "mnu_batch";

-            this.mnu_batch.Size = new System.Drawing.Size(207, 22);

-            this.mnu_batch.Text = "Generate Batch Script";

-            this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);

-            // 

-            // mnu_import

-            // 

-            this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;

-            this.mnu_import.Name = "mnu_import";

-            this.mnu_import.Size = new System.Drawing.Size(207, 22);

-            this.mnu_import.Text = "Import Queue";

-            this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);

-            // 

-            // mnu_export

-            // 

-            this.mnu_export.Image = global::Handbrake.Properties.Resources.save;

-            this.mnu_export.Name = "mnu_export";

-            this.mnu_export.Size = new System.Drawing.Size(207, 22);

-            this.mnu_export.Text = "Export Queue";

-            this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);

-            // 

-            // toolStripSeparator2

-            // 

-            this.toolStripSeparator2.Name = "toolStripSeparator2";

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

-            // 

-            // mnu_readd

-            // 

-            this.mnu_readd.Name = "mnu_readd";

-            this.mnu_readd.Size = new System.Drawing.Size(207, 22);

-            this.mnu_readd.Text = "Re-Add Current Job";

-            this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);

-            // 

             // SaveFile

             // 

             this.SaveFile.Filter = "Batch|.bat";

@@ -445,6 +372,81 @@ namespace Handbrake
             this.panel1.Size = new System.Drawing.Size(15, 234);

             this.panel1.TabIndex = 75;

             // 

+            // btn_encode

+            // 

+            this.btn_encode.Image = global::Handbrake.Properties.Resources.Play;

+            this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.btn_encode.Name = "btn_encode";

+            this.btn_encode.Size = new System.Drawing.Size(84, 36);

+            this.btn_encode.Text = "Encode";

+            this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);

+            // 

+            // btn_pause

+            // 

+            this.btn_pause.Image = global::Handbrake.Properties.Resources.Pause;

+            this.btn_pause.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.btn_pause.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.btn_pause.Name = "btn_pause";

+            this.btn_pause.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;

+            this.btn_pause.Size = new System.Drawing.Size(75, 36);

+            this.btn_pause.Text = "Pause";

+            this.btn_pause.Visible = false;

+            this.btn_pause.Click += new System.EventHandler(this.btn_pause_Click);

+            // 

+            // drop_button_queue

+            // 

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

+            this.mnu_batch,

+            this.mnu_import,

+            this.mnu_export,

+            this.toolStripSeparator2,

+            this.mnu_readd});

+            this.drop_button_queue.Image = global::Handbrake.Properties.Resources.ActivityWindow;

+            this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;

+            this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;

+            this.drop_button_queue.Name = "drop_button_queue";

+            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);

+            this.drop_button_queue.Text = "Queue";

+            // 

+            // mnu_batch

+            // 

+            this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;

+            this.mnu_batch.Name = "mnu_batch";

+            this.mnu_batch.Size = new System.Drawing.Size(207, 22);

+            this.mnu_batch.Text = "Generate Batch Script";

+            this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);

+            // 

+            // mnu_import

+            // 

+            this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;

+            this.mnu_import.Name = "mnu_import";

+            this.mnu_import.Size = new System.Drawing.Size(207, 22);

+            this.mnu_import.Text = "Import Queue";

+            this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);

+            // 

+            // mnu_export

+            // 

+            this.mnu_export.Image = global::Handbrake.Properties.Resources.save;

+            this.mnu_export.Name = "mnu_export";

+            this.mnu_export.Size = new System.Drawing.Size(207, 22);

+            this.mnu_export.Text = "Export Queue";

+            this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);

+            // 

+            // toolStripSeparator2

+            // 

+            this.toolStripSeparator2.Name = "toolStripSeparator2";

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

+            // 

+            // mnu_readd

+            // 

+            this.mnu_readd.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;

+            this.mnu_readd.Image = global::Handbrake.Properties.Resources.AddToQueue_small;

+            this.mnu_readd.Name = "mnu_readd";

+            this.mnu_readd.Size = new System.Drawing.Size(207, 22);

+            this.mnu_readd.Text = "Re-Add Current Job";

+            this.mnu_readd.Click += new System.EventHandler(this.mnu_readd_Click);

+            // 

             // frmQueue

             // 

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

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index 26fd97311..769921691 100644
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -87,7 +87,7 @@ namespace Handbrake
             queue.pauseEncode();

             setUIEncodeFinished();

             resetQueue();

-            MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode Video' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

+            MessageBox.Show("No further items on the queue will start. The current encode process will continue until it is finished. \nClick 'Encode' when you wish to continue encoding the queue.", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Warning);

         }

 

         // Window Display Management