WinGui:

- Refined the Queue look.
- Fixed bug which cause the move up and down buttons to cause an exception.
- When you select an item on the queue and move it up or down, it will now remain selected. This saves re-selecting the item every time you want to move it up or down.
- Added pending encodes counter.

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

diff --git a/win/C#/Functions/Queue.cs b/win/C#/Functions/Queue.cs
index 28730e0..3afca7d 100644 (file)
--- a/win/C#/Functions/Queue.cs
+++ b/win/C#/Functions/Queue.cs
@@ -83,7 +83,7 @@ namespace Handbrake.Functions
         {\r
             if (index != 0)\r
             {\r
-                string item = queue[index].ToString();\r
+                ArrayList item = (ArrayList)queue[index];\r
 \r
                 queue.Insert((index - 1), item);\r
                 queue.RemoveAt((index + 1));\r
@@ -98,7 +98,7 @@ namespace Handbrake.Functions
         {\r
             if (index != queue.Count - 1)\r
             {\r
-                string item = queue[index].ToString();\r
+                ArrayList item = (ArrayList)queue[index];\r
 \r
                 queue.Insert((index + 2), item);\r
                 queue.RemoveAt((index));\r

diff --git a/win/C#/frmOptions.Designer.cs b/win/C#/frmOptions.Designer.cs
index 3ee7e5c..dff23d9 100644 (file)
--- a/win/C#/frmOptions.Designer.cs
+++ b/win/C#/frmOptions.Designer.cs
@@ -86,11 +86,11 @@ namespace Handbrake
             this.btn_close.FlatAppearance.BorderColor = System.Drawing.Color.Black;\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(395, 346);\r
+            this.btn_close.Location = new System.Drawing.Point(430, 346);\r
             this.btn_close.Name = "btn_close";\r
-            this.btn_close.Size = new System.Drawing.Size(107, 22);\r
+            this.btn_close.Size = new System.Drawing.Size(72, 22);\r
             this.btn_close.TabIndex = 53;\r
-            this.btn_close.Text = "Save && Close";\r
+            this.btn_close.Text = "Close";\r
             this.btn_close.UseVisualStyleBackColor = true;\r
             this.btn_close.Click += new System.EventHandler(this.btn_close_Click);\r
             // \r
@@ -175,6 +175,9 @@ namespace Handbrake
             this.txt_autoNameFormat.Name = "txt_autoNameFormat";\r
             this.txt_autoNameFormat.Size = new System.Drawing.Size(255, 21);\r
             this.txt_autoNameFormat.TabIndex = 79;\r
+            this.ToolTip.SetToolTip(this.txt_autoNameFormat, "Define the format of the automatically named file.\r\ne.g  {source}_{title}_some-te" +\r
+                    "xt\r\n{source} {title} {chapters} will be automatically substituted for the input " +\r
+                    "sources values.");\r
             this.txt_autoNameFormat.TextChanged += new System.EventHandler(this.txt_autoNameFormat_TextChanged);\r
             // \r
             // btn_browse\r
@@ -206,7 +209,7 @@ namespace Handbrake
             this.text_an_path.Name = "text_an_path";\r
             this.text_an_path.Size = new System.Drawing.Size(181, 21);\r
             this.text_an_path.TabIndex = 76;\r
-            this.ToolTip.SetToolTip(this.text_an_path, "Default location where Auto named files are stored.");\r
+            this.ToolTip.SetToolTip(this.text_an_path, "The default location where auto named files are stored.");\r
             this.text_an_path.TextChanged += new System.EventHandler(this.text_an_path_TextChanged);\r
             // \r
             // check_autoNaming\r
@@ -215,9 +218,9 @@ namespace Handbrake
             this.check_autoNaming.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
             this.check_autoNaming.Location = new System.Drawing.Point(114, 148);\r
             this.check_autoNaming.Name = "check_autoNaming";\r
-            this.check_autoNaming.Size = new System.Drawing.Size(340, 17);\r
+            this.check_autoNaming.Size = new System.Drawing.Size(206, 17);\r
             this.check_autoNaming.TabIndex = 72;\r
-            this.check_autoNaming.Text = "Use Auto Naming (uses source name and title number)";\r
+            this.check_autoNaming.Text = "Automatically name output files";\r
             this.ToolTip.SetToolTip(this.check_autoNaming, "Automatically name output files");\r
             this.check_autoNaming.UseVisualStyleBackColor = true;\r
             this.check_autoNaming.CheckedChanged += new System.EventHandler(this.check_autoNaming_CheckedChanged);\r

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 750098e..b3bf743 100644 (file)
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -70,10 +70,9 @@ namespace Handbrake
             this.progressBar = new System.Windows.Forms.ToolStripProgressBar();\r
             this.lbl_progressValue = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.OpenFile = new System.Windows.Forms.OpenFileDialog();\r
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();\r
+            this.lbl_encodesPending = new System.Windows.Forms.ToolStripStatusLabel();\r
             this.toolStrip1.SuspendLayout();\r
             this.statusStrip1.SuspendLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();\r
             this.SuspendLayout();\r
             // \r
             // btn_down\r
@@ -82,12 +81,13 @@ namespace Handbrake
             this.btn_down.FlatAppearance.BorderColor = System.Drawing.Color.Black;\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(610, 129);\r
+            this.btn_down.Location = new System.Drawing.Point(613, 110);\r
             this.btn_down.Name = "btn_down";\r
             this.btn_down.Size = new System.Drawing.Size(75, 22);\r
             this.btn_down.TabIndex = 33;\r
             this.btn_down.TabStop = false;\r
             this.btn_down.Text = "Down";\r
+            this.toolTip1.SetToolTip(this.btn_down, "Move the selected item down 1 place in the queue");\r
             this.btn_down.UseVisualStyleBackColor = true;\r
             this.btn_down.Click += new System.EventHandler(this.btn_down_Click);\r
             // \r
@@ -97,12 +97,13 @@ namespace Handbrake
             this.btn_up.FlatAppearance.BorderColor = System.Drawing.Color.Black;\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(540, 129);\r
+            this.btn_up.Location = new System.Drawing.Point(543, 110);\r
             this.btn_up.Name = "btn_up";\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
+            this.toolTip1.SetToolTip(this.btn_up, "Move the selected item up 1 place in the queue.");\r
             this.btn_up.UseVisualStyleBackColor = true;\r
             this.btn_up.Click += new System.EventHandler(this.btn_up_Click);\r
             // \r
@@ -112,12 +113,13 @@ namespace Handbrake
             this.btn_delete.FlatAppearance.BorderColor = System.Drawing.Color.Black;\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(692, 129);\r
+            this.btn_delete.Location = new System.Drawing.Point(695, 110);\r
             this.btn_delete.Name = "btn_delete";\r
             this.btn_delete.Size = new System.Drawing.Size(75, 22);\r
             this.btn_delete.TabIndex = 31;\r
             this.btn_delete.TabStop = false;\r
             this.btn_delete.Text = "Delete";\r
+            this.toolTip1.SetToolTip(this.btn_delete, "Remove the selected item from the queue");\r
             this.btn_delete.UseVisualStyleBackColor = true;\r
             this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);\r
             // \r
@@ -125,7 +127,7 @@ namespace Handbrake
             // \r
             this.label4.AutoSize = true;\r
             this.label4.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label4.Location = new System.Drawing.Point(269, 121);\r
+            this.label4.Location = new System.Drawing.Point(225, 98);\r
             this.label4.Name = "label4";\r
             this.label4.Size = new System.Drawing.Size(47, 26);\r
             this.label4.TabIndex = 70;\r
@@ -134,7 +136,7 @@ namespace Handbrake
             // lbl_chapt\r
             // \r
             this.lbl_chapt.AutoSize = true;\r
-            this.lbl_chapt.Location = new System.Drawing.Point(202, 133);\r
+            this.lbl_chapt.Location = new System.Drawing.Point(158, 110);\r
             this.lbl_chapt.Name = "lbl_chapt";\r
             this.lbl_chapt.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_chapt.TabIndex = 69;\r
@@ -144,7 +146,7 @@ namespace Handbrake
             // \r
             this.lbl_title.AccessibleRole = System.Windows.Forms.AccessibleRole.None;\r
             this.lbl_title.AutoSize = true;\r
-            this.lbl_title.Location = new System.Drawing.Point(202, 120);\r
+            this.lbl_title.Location = new System.Drawing.Point(158, 97);\r
             this.lbl_title.Name = "lbl_title";\r
             this.lbl_title.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_title.TabIndex = 68;\r
@@ -153,7 +155,7 @@ namespace Handbrake
             // lbl_aEnc\r
             // \r
             this.lbl_aEnc.AutoSize = true;\r
-            this.lbl_aEnc.Location = new System.Drawing.Point(330, 134);\r
+            this.lbl_aEnc.Location = new System.Drawing.Point(286, 111);\r
             this.lbl_aEnc.Name = "lbl_aEnc";\r
             this.lbl_aEnc.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_aEnc.TabIndex = 67;\r
@@ -162,7 +164,7 @@ namespace Handbrake
             // lbl_vEnc\r
             // \r
             this.lbl_vEnc.AutoSize = true;\r
-            this.lbl_vEnc.Location = new System.Drawing.Point(330, 121);\r
+            this.lbl_vEnc.Location = new System.Drawing.Point(286, 98);\r
             this.lbl_vEnc.Name = "lbl_vEnc";\r
             this.lbl_vEnc.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_vEnc.TabIndex = 66;\r
@@ -171,7 +173,7 @@ namespace Handbrake
             // lbl_dest\r
             // \r
             this.lbl_dest.AutoSize = true;\r
-            this.lbl_dest.Location = new System.Drawing.Point(202, 108);\r
+            this.lbl_dest.Location = new System.Drawing.Point(158, 85);\r
             this.lbl_dest.Name = "lbl_dest";\r
             this.lbl_dest.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_dest.TabIndex = 65;\r
@@ -181,7 +183,7 @@ namespace Handbrake
             // lbl_source\r
             // \r
             this.lbl_source.AutoSize = true;\r
-            this.lbl_source.Location = new System.Drawing.Point(202, 95);\r
+            this.lbl_source.Location = new System.Drawing.Point(158, 72);\r
             this.lbl_source.Name = "lbl_source";\r
             this.lbl_source.Size = new System.Drawing.Size(12, 13);\r
             this.lbl_source.TabIndex = 64;\r
@@ -191,7 +193,7 @@ namespace Handbrake
             // \r
             this.label1.AutoSize = true;\r
             this.label1.Font = new System.Drawing.Font("Verdana", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));\r
-            this.label1.Location = new System.Drawing.Point(56, 95);\r
+            this.label1.Location = new System.Drawing.Point(12, 72);\r
             this.label1.Name = "label1";\r
             this.label1.Size = new System.Drawing.Size(99, 52);\r
             this.label1.TabIndex = 63;\r
@@ -201,7 +203,7 @@ namespace Handbrake
             // \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(56, 73);\r
+            this.label3.Location = new System.Drawing.Point(12, 50);\r
             this.label3.Name = "label3";\r
             this.label3.Size = new System.Drawing.Size(82, 13);\r
             this.label3.TabIndex = 62;\r
@@ -218,7 +220,7 @@ namespace Handbrake
             this.toolStrip1.Location = new System.Drawing.Point(0, 0);\r
             this.toolStrip1.Name = "toolStrip1";\r
             this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;\r
-            this.toolStrip1.Size = new System.Drawing.Size(779, 49);\r
+            this.toolStrip1.Size = new System.Drawing.Size(779, 39);\r
             this.toolStrip1.TabIndex = 71;\r
             this.toolStrip1.Text = "toolStrip1";\r
             // \r
@@ -228,8 +230,7 @@ namespace Handbrake
             this.btn_encode.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.btn_encode.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_encode.Name = "btn_encode";\r
-            this.btn_encode.Padding = new System.Windows.Forms.Padding(5);\r
-            this.btn_encode.Size = new System.Drawing.Size(88, 46);\r
+            this.btn_encode.Size = new System.Drawing.Size(84, 36);\r
             this.btn_encode.Text = "Encode";\r
             this.btn_encode.Click += new System.EventHandler(this.btn_encode_Click);\r
             // \r
@@ -240,7 +241,7 @@ namespace Handbrake
             this.btn_stop.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.btn_stop.Name = "btn_stop";\r
             this.btn_stop.Overflow = System.Windows.Forms.ToolStripItemOverflow.Never;\r
-            this.btn_stop.Size = new System.Drawing.Size(72, 46);\r
+            this.btn_stop.Size = new System.Drawing.Size(75, 36);\r
             this.btn_stop.Text = "Pause";\r
             this.btn_stop.Visible = false;\r
             this.btn_stop.Click += new System.EventHandler(this.btn_stop_Click);\r
@@ -248,7 +249,7 @@ namespace Handbrake
             // toolStripSeparator1\r
             // \r
             this.toolStripSeparator1.Name = "toolStripSeparator1";\r
-            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 49);\r
+            this.toolStripSeparator1.Size = new System.Drawing.Size(6, 39);\r
             // \r
             // drop_button_queue\r
             // \r
@@ -260,14 +261,14 @@ namespace Handbrake
             this.drop_button_queue.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;\r
             this.drop_button_queue.ImageTransparentColor = System.Drawing.Color.Magenta;\r
             this.drop_button_queue.Name = "drop_button_queue";\r
-            this.drop_button_queue.Size = new System.Drawing.Size(84, 46);\r
+            this.drop_button_queue.Size = new System.Drawing.Size(89, 36);\r
             this.drop_button_queue.Text = "Queue";\r
             // \r
             // mnu_batch\r
             // \r
             this.mnu_batch.Image = global::Handbrake.Properties.Resources.Output_Small;\r
             this.mnu_batch.Name = "mnu_batch";\r
-            this.mnu_batch.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_batch.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_batch.Text = "Generate Batch Script";\r
             this.mnu_batch.Click += new System.EventHandler(this.mnu_batch_Click);\r
             // \r
@@ -275,7 +276,7 @@ namespace Handbrake
             // \r
             this.mnu_import.Image = global::Handbrake.Properties.Resources.folder;\r
             this.mnu_import.Name = "mnu_import";\r
-            this.mnu_import.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_import.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_import.Text = "Import Queue";\r
             this.mnu_import.Click += new System.EventHandler(this.mnu_import_Click);\r
             // \r
@@ -283,7 +284,7 @@ namespace Handbrake
             // \r
             this.mnu_export.Image = global::Handbrake.Properties.Resources.save;\r
             this.mnu_export.Name = "mnu_export";\r
-            this.mnu_export.Size = new System.Drawing.Size(190, 22);\r
+            this.mnu_export.Size = new System.Drawing.Size(207, 22);\r
             this.mnu_export.Text = "Export Queue";\r
             this.mnu_export.Click += new System.EventHandler(this.mnu_export_Click);\r
             // \r
@@ -304,10 +305,10 @@ namespace Handbrake
             this.list_queue.FullRowSelect = true;\r
             this.list_queue.GridLines = true;\r
             this.list_queue.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;\r
-            this.list_queue.Location = new System.Drawing.Point(12, 157);\r
+            this.list_queue.Location = new System.Drawing.Point(15, 138);\r
             this.list_queue.MultiSelect = false;\r
             this.list_queue.Name = "list_queue";\r
-            this.list_queue.Size = new System.Drawing.Size(755, 185);\r
+            this.list_queue.Size = new System.Drawing.Size(755, 202);\r
             this.list_queue.TabIndex = 72;\r
             this.list_queue.UseCompatibleStateImageBehavior = false;\r
             this.list_queue.View = System.Windows.Forms.View.Details;\r
@@ -346,6 +347,7 @@ namespace Handbrake
             // statusStrip1\r
             // \r
             this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
+            this.lbl_encodesPending,\r
             this.toolStripStatusLabel1,\r
             this.progressBar,\r
             this.lbl_progressValue});\r
@@ -357,8 +359,9 @@ namespace Handbrake
             // \r
             // toolStripStatusLabel1\r
             // \r
+            this.toolStripStatusLabel1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";\r
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(53, 26);\r
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(57, 26);\r
             this.toolStripStatusLabel1.Text = "Progress:";\r
             // \r
             // progressBar\r
@@ -370,21 +373,20 @@ namespace Handbrake
             // lbl_progressValue\r
             // \r
             this.lbl_progressValue.Name = "lbl_progressValue";\r
-            this.lbl_progressValue.Size = new System.Drawing.Size(30, 26);\r
+            this.lbl_progressValue.Size = new System.Drawing.Size(34, 26);\r
             this.lbl_progressValue.Text = " 0 %";\r
             // \r
             // OpenFile\r
             // \r
             this.OpenFile.Filter = "HandBrake Queue|*.queue";\r
             // \r
-            // pictureBox1\r
+            // lbl_encodesPending\r
             // \r
-            this.pictureBox1.Image = global::Handbrake.Properties.Resources.Queue;\r
-            this.pictureBox1.Location = new System.Drawing.Point(12, 61);\r
-            this.pictureBox1.Name = "pictureBox1";\r
-            this.pictureBox1.Size = new System.Drawing.Size(37, 32);\r
-            this.pictureBox1.TabIndex = 61;\r
-            this.pictureBox1.TabStop = false;\r
+            this.lbl_encodesPending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;\r
+            this.lbl_encodesPending.Margin = new System.Windows.Forms.Padding(0, 3, 10, 2);\r
+            this.lbl_encodesPending.Name = "lbl_encodesPending";\r
+            this.lbl_encodesPending.Size = new System.Drawing.Size(122, 26);\r
+            this.lbl_encodesPending.Text = "0 encode(s) pending";\r
             // \r
             // frmQueue\r
             // \r
@@ -393,7 +395,6 @@ namespace Handbrake
             this.ClientSize = new System.Drawing.Size(779, 390);\r
             this.Controls.Add(this.statusStrip1);\r
             this.Controls.Add(this.list_queue);\r
-            this.Controls.Add(this.pictureBox1);\r
             this.Controls.Add(this.btn_down);\r
             this.Controls.Add(this.btn_up);\r
             this.Controls.Add(this.toolStrip1);\r
@@ -418,7 +419,6 @@ namespace Handbrake
             this.toolStrip1.PerformLayout();\r
             this.statusStrip1.ResumeLayout(false);\r
             this.statusStrip1.PerformLayout();\r
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();\r
             this.ResumeLayout(false);\r
             this.PerformLayout();\r
 \r
@@ -439,7 +439,6 @@ namespace Handbrake
         private System.Windows.Forms.Label lbl_source;\r
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.Label label3;\r
-        private System.Windows.Forms.PictureBox pictureBox1;\r
         private System.Windows.Forms.ToolStrip toolStrip1;\r
         private System.Windows.Forms.ToolStripButton btn_encode;\r
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;\r
@@ -461,5 +460,6 @@ namespace Handbrake
         private System.Windows.Forms.ToolStripMenuItem mnu_import;\r
         private System.Windows.Forms.ToolStripMenuItem mnu_export;\r
         private System.Windows.Forms.OpenFileDialog OpenFile;\r
+        private System.Windows.Forms.ToolStripStatusLabel lbl_encodesPending;\r
     }\r
 }
\ No newline at end of file

diff --git a/win/C#/frmQueue.cs b/win/C#/frmQueue.cs
index e272419..07f4717 100644 (file)
--- a/win/C#/frmQueue.cs
+++ b/win/C#/frmQueue.cs
@@ -41,6 +41,7 @@ namespace Handbrake
         {\r
             queue = qw;\r
             redrawQueue();\r
+            lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
         }\r
 \r
         /// <summary>\r
@@ -59,7 +60,8 @@ namespace Handbrake
         private void redrawQueue()\r
         {\r
             list_queue.Items.Clear();\r
-            foreach (ArrayList queue_item in queue.getQueue())\r
+            ArrayList theQueue = queue.getQueue();\r
+            foreach (ArrayList queue_item in theQueue)\r
             {\r
                 string q_item = queue_item[1].ToString();\r
                 Functions.QueryParser parsed = Functions.QueryParser.Parse(q_item);\r
@@ -195,6 +197,8 @@ namespace Handbrake
                 lbl_aEnc.Text = "-";\r
                 lbl_title.Text = "-";\r
                 lbl_chapt.Text = "-";\r
+\r
+                lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -226,6 +230,7 @@ namespace Handbrake
 \r
                 progressBar.PerformStep();\r
                 lbl_progressValue.Text = string.Format("{0} %", progressBar.Value);\r
+                lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
             }\r
             catch (Exception exc)\r
             {\r
@@ -281,9 +286,16 @@ namespace Handbrake
         {\r
             if (list_queue.SelectedIndices.Count != 0)\r
             {\r
-                queue.moveUp(list_queue.SelectedIndices[0]);\r
+                int selected = list_queue.SelectedIndices[0];\r
+\r
+                queue.moveUp(selected);\r
                 queue.write2disk("hb_queue_recovery.dat"); // Update the queue recovery file\r
                 redrawQueue();\r
+\r
+                if (selected - 1 > 0) \r
+                    list_queue.Items[selected -1].Selected = true;\r
+\r
+                list_queue.Select();\r
             }\r
         }\r
 \r
@@ -292,9 +304,16 @@ namespace Handbrake
         {\r
             if (list_queue.SelectedIndices.Count != 0)\r
             {\r
+                int selected = list_queue.SelectedIndices[0];\r
+\r
                 queue.moveDown(list_queue.SelectedIndices[0]);\r
                 queue.write2disk("hb_queue_recovery.dat"); // Update the queue recovery file\r
                 redrawQueue();\r
+\r
+                if (selected +1 < list_queue.Items.Count) \r
+                    list_queue.Items[selected + 1].Selected = true;\r
+\r
+                list_queue.Select();\r
             }\r
         }\r
 \r
@@ -306,6 +325,7 @@ namespace Handbrake
                 queue.remove(list_queue.SelectedIndices[0]);\r
                 queue.write2disk("hb_queue_recovery.dat"); // Update the queue recovery file\r
                 redrawQueue();\r
+                lbl_encodesPending.Text = list_queue.Items.Count + " encode(s) pending";\r
             }\r
         }\r
 \r