WinGui:

- Re-add all the x264 tooltips.
- Combines the 2 Preview windows for VLC and QT into one.

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

1 files changed, 37 insertions, 24 deletions

diff --git a/win/C#/frmPreview.Designer.cs b/win/C#/frmPreview.Designer.cs
index 8ecd53ec8..0beebf6e0 100644
--- a/win/C#/frmPreview.Designer.cs
+++ b/win/C#/frmPreview.Designer.cs
@@ -37,10 +37,11 @@
             this.cb_preview = new System.Windows.Forms.ToolStripComboBox();

             this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();

             this.cb_duration = new System.Windows.Forms.ToolStripComboBox();

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

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

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

             this.statusStrip = new System.Windows.Forms.StatusStrip();

+            this.lbl_status = new System.Windows.Forms.ToolStripStatusLabel();

             this.QTControl = new AxQTOControlLib.AxQTControl();

-            this.lbl_encode = new System.Windows.Forms.ToolStripStatusLabel();

             this.toolBar.SuspendLayout();

             this.statusStrip.SuspendLayout();

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

@@ -54,7 +55,8 @@
             this.cb_preview,

             this.toolStripLabel2,

             this.cb_duration,

-            this.btn_encode});

+            this.btn_playQT,

+            this.btn_playVLC});

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

             this.toolBar.Name = "toolBar";

             this.toolBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;

@@ -66,7 +68,7 @@
             // 

             this.lbl_preview.BackColor = System.Drawing.Color.Transparent;

             this.lbl_preview.Name = "lbl_preview";

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

+            this.lbl_preview.Size = new System.Drawing.Size(100, 36);

             this.lbl_preview.Text = "Start at Preview:";

             // 

             // cb_preview

@@ -92,7 +94,7 @@
             // 

             this.toolStripLabel2.BackColor = System.Drawing.Color.Transparent;

             this.toolStripLabel2.Name = "toolStripLabel2";

-            this.toolStripLabel2.Size = new System.Drawing.Size(98, 36);

+            this.toolStripLabel2.Size = new System.Drawing.Size(111, 36);

             this.toolStripLabel2.Text = "Duration (seconds)";

             // 

             // cb_duration

@@ -117,26 +119,44 @@
             this.cb_duration.Name = "cb_duration";

             this.cb_duration.Size = new System.Drawing.Size(75, 39);

             // 

-            // btn_encode

+            // btn_playQT

             // 

-            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(159, 36);

-            this.btn_encode.Text = "Encode and Play Sample";

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

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

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

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

+            this.btn_playQT.Name = "btn_playQT";

+            this.btn_playQT.Size = new System.Drawing.Size(113, 36);

+            this.btn_playQT.Text = "Play with QT";

+            this.btn_playQT.Click += new System.EventHandler(this.btn_playQT_Click);

+            // 

+            // btn_playVLC

+            // 

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

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

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

+            this.btn_playVLC.Name = "btn_playVLC";

+            this.btn_playVLC.Size = new System.Drawing.Size(117, 36);

+            this.btn_playVLC.Text = "Play with VLC";

+            this.btn_playVLC.Click += new System.EventHandler(this.btn_playVLC_Click);

             // 

             // statusStrip

             // 

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

-            this.lbl_encode});

+            this.lbl_status});

             this.statusStrip.Location = new System.Drawing.Point(0, 486);

             this.statusStrip.Name = "statusStrip";

             this.statusStrip.Size = new System.Drawing.Size(774, 22);

             this.statusStrip.TabIndex = 38;

             this.statusStrip.Text = "statusStrip1";

             // 

+            // lbl_status

+            // 

+            this.lbl_status.BackColor = System.Drawing.Color.Transparent;

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

+            this.lbl_status.Name = "lbl_status";

+            this.lbl_status.Size = new System.Drawing.Size(31, 17);

+            this.lbl_status.Text = "{0}";

+            // 

             // QTControl

             // 

             this.QTControl.Enabled = true;

@@ -147,14 +167,6 @@
             this.QTControl.TabIndex = 39;

             this.QTControl.Visible = false;

             // 

-            // lbl_encode

-            // 

-            this.lbl_encode.BackColor = System.Drawing.Color.Transparent;

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

-            this.lbl_encode.Name = "lbl_encode";

-            this.lbl_encode.Size = new System.Drawing.Size(31, 17);

-            this.lbl_encode.Text = "{0}";

-            // 

             // frmPreview

             // 

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

@@ -182,13 +194,14 @@
         #endregion

 

         private System.Windows.Forms.ToolStrip toolBar;

-        private System.Windows.Forms.ToolStripButton btn_encode;

+        private System.Windows.Forms.ToolStripButton btn_playQT;

         private System.Windows.Forms.StatusStrip statusStrip;

         private AxQTOControlLib.AxQTControl QTControl;

         private System.Windows.Forms.ToolStripComboBox cb_preview;

         private System.Windows.Forms.ToolStripLabel lbl_preview;

         private System.Windows.Forms.ToolStripLabel toolStripLabel2;

         private System.Windows.Forms.ToolStripComboBox cb_duration;

-        private System.Windows.Forms.ToolStripStatusLabel lbl_encode;

+        private System.Windows.Forms.ToolStripStatusLabel lbl_status;

+        private System.Windows.Forms.ToolStripButton btn_playVLC;

     }

 }
\ No newline at end of file