WinGui:

- Fixed bug in Query Parser in relation to Titles (Error when 1 was set to auto)
- Added Batch Script creation option on the Queue.
- Added Toolbar to the queue (similar to the MacGui) and removed some old style buttons that are now on the toolbar.

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

1 files changed, 97 insertions, 65 deletions

diff --git a/win/C#/frmQueue.Designer.cs b/win/C#/frmQueue.Designer.cs
index 6098553c0..8e416039c 100644
--- a/win/C#/frmQueue.Designer.cs
+++ b/win/C#/frmQueue.Designer.cs
@@ -33,13 +33,11 @@ namespace Handbrake
             this.btn_down = new System.Windows.Forms.Button();

             this.btn_up = new System.Windows.Forms.Button();

             this.btn_delete = new System.Windows.Forms.Button();

-            this.btn_q_encoder = new System.Windows.Forms.Button();

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

             this.btn_Close = new System.Windows.Forms.Button();

             this.progressBar = new System.Windows.Forms.ProgressBar();

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

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

-            this.btn_cancel = new System.Windows.Forms.Button();

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

             this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);

             this.text_edit = new System.Windows.Forms.TextBox();

@@ -53,7 +51,14 @@ namespace Handbrake
             this.lbl_source = new System.Windows.Forms.Label();

             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_stop = new System.Windows.Forms.ToolStripButton();

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

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

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

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

+            this.toolStrip1.SuspendLayout();

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

             this.SuspendLayout();

             // 

@@ -64,7 +69,7 @@ namespace Handbrake
             this.btn_down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_down.Location = new System.Drawing.Point(74, 274);

+            this.btn_down.Location = new System.Drawing.Point(74, 327);

             this.btn_down.Name = "btn_down";

             this.btn_down.Size = new System.Drawing.Size(64, 22);

             this.btn_down.TabIndex = 33;

@@ -80,7 +85,7 @@ namespace Handbrake
             this.btn_up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_up.Location = new System.Drawing.Point(13, 274);

+            this.btn_up.Location = new System.Drawing.Point(13, 327);

             this.btn_up.Name = "btn_up";

             this.btn_up.Size = new System.Drawing.Size(55, 22);

             this.btn_up.TabIndex = 32;

@@ -96,7 +101,7 @@ namespace Handbrake
             this.btn_delete.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_delete.Location = new System.Drawing.Point(144, 274);

+            this.btn_delete.Location = new System.Drawing.Point(144, 327);

             this.btn_delete.Name = "btn_delete";

             this.btn_delete.Size = new System.Drawing.Size(64, 22);

             this.btn_delete.TabIndex = 31;

@@ -105,30 +110,14 @@ namespace Handbrake
             this.btn_delete.UseVisualStyleBackColor = false;

             this.btn_delete.Click += new System.EventHandler(this.btn_delete_Click);

             // 

-            // btn_q_encoder

-            // 

-            this.btn_q_encoder.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.btn_q_encoder.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_q_encoder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

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

-            this.btn_q_encoder.Name = "btn_q_encoder";

-            this.btn_q_encoder.Size = new System.Drawing.Size(124, 22);

-            this.btn_q_encoder.TabIndex = 29;

-            this.btn_q_encoder.TabStop = false;

-            this.btn_q_encoder.Text = "Encode Video(s)";

-            this.btn_q_encoder.UseVisualStyleBackColor = false;

-            this.btn_q_encoder.Click += new System.EventHandler(this.btn_q_encoder_Click);

-            // 

             // list_queue

             // 

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

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

             this.list_queue.HorizontalScrollbar = true;

-            this.list_queue.Location = new System.Drawing.Point(12, 110);

+            this.list_queue.Location = new System.Drawing.Point(12, 176);

             this.list_queue.Name = "list_queue";

-            this.list_queue.Size = new System.Drawing.Size(701, 158);

+            this.list_queue.Size = new System.Drawing.Size(701, 145);

             this.list_queue.TabIndex = 28;

             this.list_queue.SelectedIndexChanged += new System.EventHandler(this.list_queue_SelectedIndexChanged);

             // 

@@ -139,7 +128,7 @@ namespace Handbrake
             this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_Close.Location = new System.Drawing.Point(606, 345);

+            this.btn_Close.Location = new System.Drawing.Point(605, 12);

             this.btn_Close.Name = "btn_Close";

             this.btn_Close.Size = new System.Drawing.Size(108, 22);

             this.btn_Close.TabIndex = 27;

@@ -151,16 +140,16 @@ namespace Handbrake
             // progressBar

             // 

             this.progressBar.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.progressBar.Location = new System.Drawing.Point(67, 307);

+            this.progressBar.Location = new System.Drawing.Point(67, 360);

             this.progressBar.Name = "progressBar";

-            this.progressBar.Size = new System.Drawing.Size(608, 23);

+            this.progressBar.Size = new System.Drawing.Size(647, 23);

             this.progressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;

             this.progressBar.TabIndex = 34;

             // 

             // label2

             // 

             this.label2.AutoSize = true;

-            this.label2.Location = new System.Drawing.Point(10, 313);

+            this.label2.Location = new System.Drawing.Point(10, 366);

             this.label2.Name = "label2";

             this.label2.Size = new System.Drawing.Size(51, 13);

             this.label2.TabIndex = 35;

@@ -169,36 +158,17 @@ namespace Handbrake
             // lbl_progressValue

             // 

             this.lbl_progressValue.AutoSize = true;

-            this.lbl_progressValue.Location = new System.Drawing.Point(690, 313);

+            this.lbl_progressValue.Location = new System.Drawing.Point(690, 331);

             this.lbl_progressValue.Name = "lbl_progressValue";

             this.lbl_progressValue.Size = new System.Drawing.Size(24, 13);

             this.lbl_progressValue.TabIndex = 36;

             this.lbl_progressValue.Text = "0 %";

             // 

-            // btn_cancel

-            // 

-            this.btn_cancel.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.btn_cancel.FlatAppearance.BorderColor = System.Drawing.Color.Black;

-            this.btn_cancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

-            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(143, 345);

-            this.btn_cancel.Name = "btn_cancel";

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

-            this.btn_cancel.TabIndex = 41;

-            this.btn_cancel.TabStop = false;

-            this.btn_cancel.Text = "Stop Queue";

-            this.toolTip1.SetToolTip(this.btn_cancel, "This will prevent any more encode processes from starting. It will not stop the c" +

-                    "urrent process!");

-            this.btn_cancel.UseVisualStyleBackColor = false;

-            this.btn_cancel.Visible = false;

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

-            // 

             // lbl_status

             // 

             this.lbl_status.AutoSize = true;

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

-            this.lbl_status.Location = new System.Drawing.Point(274, 313);

+            this.lbl_status.Location = new System.Drawing.Point(274, 366);

             this.lbl_status.Name = "lbl_status";

             this.lbl_status.Size = new System.Drawing.Size(176, 13);

             this.lbl_status.TabIndex = 42;

@@ -208,7 +178,7 @@ namespace Handbrake
             // text_edit

             // 

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

-            this.text_edit.Location = new System.Drawing.Point(214, 275);

+            this.text_edit.Location = new System.Drawing.Point(214, 328);

             this.text_edit.Name = "text_edit";

             this.text_edit.Size = new System.Drawing.Size(430, 20);

             this.text_edit.TabIndex = 43;

@@ -222,7 +192,7 @@ namespace Handbrake
             this.btn_updateQuery.FlatStyle = System.Windows.Forms.FlatStyle.Flat;

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

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

-            this.btn_updateQuery.Location = new System.Drawing.Point(650, 274);

+            this.btn_updateQuery.Location = new System.Drawing.Point(650, 327);

             this.btn_updateQuery.Name = "btn_updateQuery";

             this.btn_updateQuery.Size = new System.Drawing.Size(64, 23);

             this.btn_updateQuery.TabIndex = 46;

@@ -235,7 +205,7 @@ namespace Handbrake
             // 

             this.label4.AutoSize = true;

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

-            this.label4.Location = new System.Drawing.Point(232, 72);

+            this.label4.Location = new System.Drawing.Point(232, 125);

             this.label4.Name = "label4";

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

             this.label4.TabIndex = 70;

@@ -244,7 +214,7 @@ namespace Handbrake
             // lbl_chapt

             // 

             this.lbl_chapt.AutoSize = true;

-            this.lbl_chapt.Location = new System.Drawing.Point(175, 84);

+            this.lbl_chapt.Location = new System.Drawing.Point(175, 137);

             this.lbl_chapt.Name = "lbl_chapt";

             this.lbl_chapt.Size = new System.Drawing.Size(10, 13);

             this.lbl_chapt.TabIndex = 69;

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

             this.lbl_title.AccessibleRole = System.Windows.Forms.AccessibleRole.None;

             this.lbl_title.AutoSize = true;

-            this.lbl_title.Location = new System.Drawing.Point(175, 71);

+            this.lbl_title.Location = new System.Drawing.Point(175, 124);

             this.lbl_title.Name = "lbl_title";

             this.lbl_title.Size = new System.Drawing.Size(10, 13);

             this.lbl_title.TabIndex = 68;

@@ -263,7 +233,7 @@ namespace Handbrake
             // lbl_aEnc

             // 

             this.lbl_aEnc.AutoSize = true;

-            this.lbl_aEnc.Location = new System.Drawing.Point(285, 85);

+            this.lbl_aEnc.Location = new System.Drawing.Point(285, 138);

             this.lbl_aEnc.Name = "lbl_aEnc";

             this.lbl_aEnc.Size = new System.Drawing.Size(10, 13);

             this.lbl_aEnc.TabIndex = 67;

@@ -272,7 +242,7 @@ namespace Handbrake
             // lbl_vEnc

             // 

             this.lbl_vEnc.AutoSize = true;

-            this.lbl_vEnc.Location = new System.Drawing.Point(285, 72);

+            this.lbl_vEnc.Location = new System.Drawing.Point(285, 125);

             this.lbl_vEnc.Name = "lbl_vEnc";

             this.lbl_vEnc.Size = new System.Drawing.Size(10, 13);

             this.lbl_vEnc.TabIndex = 66;

@@ -281,7 +251,7 @@ namespace Handbrake
             // lbl_dest

             // 

             this.lbl_dest.AutoSize = true;

-            this.lbl_dest.Location = new System.Drawing.Point(175, 59);

+            this.lbl_dest.Location = new System.Drawing.Point(175, 112);

             this.lbl_dest.Name = "lbl_dest";

             this.lbl_dest.Size = new System.Drawing.Size(10, 13);

             this.lbl_dest.TabIndex = 65;

@@ -291,7 +261,7 @@ namespace Handbrake
             // lbl_source

             // 

             this.lbl_source.AutoSize = true;

-            this.lbl_source.Location = new System.Drawing.Point(175, 46);

+            this.lbl_source.Location = new System.Drawing.Point(175, 99);

             this.lbl_source.Name = "lbl_source";

             this.lbl_source.Size = new System.Drawing.Size(10, 13);

             this.lbl_source.TabIndex = 64;

@@ -301,7 +271,7 @@ namespace Handbrake
             // 

             this.label1.AutoSize = true;

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

-            this.label1.Location = new System.Drawing.Point(50, 46);

+            this.label1.Location = new System.Drawing.Point(50, 99);

             this.label1.Name = "label1";

             this.label1.Size = new System.Drawing.Size(99, 52);

             this.label1.TabIndex = 63;

@@ -311,27 +281,85 @@ namespace Handbrake
             // 

             this.label3.AutoSize = true;

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

-            this.label3.Location = new System.Drawing.Point(50, 24);

+            this.label3.Location = new System.Drawing.Point(50, 77);

             this.label3.Name = "label3";

             this.label3.Size = new System.Drawing.Size(82, 13);

             this.label3.TabIndex = 62;

             this.label3.Text = "Current Job";

             // 

+            // toolStrip1

+            // 

+            this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

+            this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {

+            this.btn_encode,

+            this.btn_stop,

+            this.toolStripSeparator1,

+            this.btn_batch});

+            this.toolStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow;

+            this.toolStrip1.Location = new System.Drawing.Point(0, 0);

+            this.toolStrip1.Name = "toolStrip1";

+            this.toolStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;

+            this.toolStrip1.Size = new System.Drawing.Size(729, 49);

+            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.Padding = new System.Windows.Forms.Padding(5);

+            this.btn_encode.Size = new System.Drawing.Size(88, 46);

+            this.btn_encode.Text = "Encode";

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

+            // 

+            // btn_stop

+            // 

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

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

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

+            this.btn_stop.Name = "btn_stop";

+            this.btn_stop.Size = new System.Drawing.Size(72, 46);

+            this.btn_stop.Text = "Pause";

+            this.btn_stop.Visible = false;

+            this.btn_stop.Click += new System.EventHandler(this.btn_stop_Click);

+            // 

+            // toolStripSeparator1

+            // 

+            this.toolStripSeparator1.Name = "toolStripSeparator1";

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

+            // 

+            // btn_batch

+            // 

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

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

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

+            this.btn_batch.Name = "btn_batch";

+            this.btn_batch.Size = new System.Drawing.Size(100, 46);

+            this.btn_batch.Text = "Batch Script";

+            this.btn_batch.Click += new System.EventHandler(this.btn_batch_Click);

+            // 

             // pictureBox1

             // 

             this.pictureBox1.Image = global::Handbrake.Properties.Resources.Queue;

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

+            this.pictureBox1.Location = new System.Drawing.Point(12, 65);

             this.pictureBox1.Name = "pictureBox1";

             this.pictureBox1.Size = new System.Drawing.Size(32, 32);

             this.pictureBox1.TabIndex = 61;

             this.pictureBox1.TabStop = false;

             // 

+            // SaveFile

+            // 

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

+            // 

             // frmQueue

             // 

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

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

             this.BackColor = System.Drawing.SystemColors.ControlLight;

-            this.ClientSize = new System.Drawing.Size(729, 377);

+            this.ClientSize = new System.Drawing.Size(729, 400);

+            this.Controls.Add(this.toolStrip1);

             this.Controls.Add(this.label4);

             this.Controls.Add(this.lbl_chapt);

             this.Controls.Add(this.lbl_title);

@@ -346,20 +374,20 @@ namespace Handbrake
             this.Controls.Add(this.btn_updateQuery);

             this.Controls.Add(this.btn_delete);

             this.Controls.Add(this.lbl_status);

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

             this.Controls.Add(this.btn_up);

             this.Controls.Add(this.text_edit);

             this.Controls.Add(this.btn_down);

             this.Controls.Add(this.lbl_progressValue);

             this.Controls.Add(this.label2);

             this.Controls.Add(this.progressBar);

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

             this.Controls.Add(this.btn_Close);

             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));

             this.MaximizeBox = false;

             this.Name = "frmQueue";

             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

             this.Text = "Encode Queue";

+            this.toolStrip1.ResumeLayout(false);

+            this.toolStrip1.PerformLayout();

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

             this.ResumeLayout(false);

             this.PerformLayout();

@@ -371,12 +399,10 @@ namespace Handbrake
         internal System.Windows.Forms.Button btn_down;

         internal System.Windows.Forms.Button btn_up;

         internal System.Windows.Forms.Button btn_delete;

-        internal System.Windows.Forms.Button btn_q_encoder;

         internal System.Windows.Forms.Button btn_Close;

         private System.Windows.Forms.ProgressBar progressBar;

         private System.Windows.Forms.Label label2;

         private System.Windows.Forms.Label lbl_progressValue;

-        internal System.Windows.Forms.Button btn_cancel;

         private System.Windows.Forms.Label lbl_status;

         private System.Windows.Forms.ToolTip toolTip1;

         public System.Windows.Forms.ListBox list_queue;

@@ -392,5 +418,11 @@ namespace Handbrake
         private System.Windows.Forms.Label label1;

         private System.Windows.Forms.Label label3;

         private System.Windows.Forms.PictureBox pictureBox1;

+        private System.Windows.Forms.ToolStrip toolStrip1;

+        private System.Windows.Forms.ToolStripButton btn_encode;

+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

+        private System.Windows.Forms.ToolStripButton btn_stop;

+        private System.Windows.Forms.ToolStripButton btn_batch;

+        private System.Windows.Forms.SaveFileDialog SaveFile;

     }

 }
\ No newline at end of file