WinGui:

- Remove built-in quicktime based video preview support.
- Resigned the Preview window as a result. Currently only supports VLC launching, but will later add an option to use the systems default player for the format produced.

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

1 files changed, 87 insertions, 150 deletions

diff --git a/win/CS/frmPreview.Designer.cs b/win/CS/frmPreview.Designer.cs
index 729e65b2b..0dc245869 100644
--- a/win/CS/frmPreview.Designer.cs
+++ b/win/CS/frmPreview.Designer.cs
@@ -32,58 +32,19 @@
         private void InitializeComponent()

         {

             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmPreview));

-            this.toolBar = new System.Windows.Forms.ToolStrip();

-            this.lbl_preview = new System.Windows.Forms.ToolStripLabel();

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

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

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

-            this.ProgressBarStatus = new System.Windows.Forms.ToolStripProgressBar();

-            this.lbl_encodeStatus = new System.Windows.Forms.ToolStripLabel();

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

-            this.QTControl = new AxQTOControlLib.AxQTControl();

-            this.toolBar.SuspendLayout();

-            this.panel1.SuspendLayout();

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

+            this.startPoint = new System.Windows.Forms.ComboBox();

+            this.endPoint = new System.Windows.Forms.ComboBox();

+            this.label1 = new System.Windows.Forms.Label();

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

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

+            this.lbl_progress = new System.Windows.Forms.Label();

+            this.btn_play = new System.Windows.Forms.Button();

             this.SuspendLayout();

             // 

-            // toolBar

-            // 

-            this.toolBar.AutoSize = false;

-            this.toolBar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;

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

-            this.lbl_preview,

-            this.cb_preview,

-            this.toolStripLabel2,

-            this.cb_duration,

-            this.btn_playQT,

-            this.btn_playVLC,

-            this.toolStripSeparator1,

-            this.ProgressBarStatus,

-            this.lbl_encodeStatus});

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

-            this.toolBar.Name = "toolBar";

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

-            this.toolBar.Size = new System.Drawing.Size(722, 25);

-            this.toolBar.TabIndex = 37;

-            this.toolBar.Text = "toolStrip1";

-            // 

-            // lbl_preview

-            // 

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

-            this.lbl_preview.Name = "lbl_preview";

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

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

-            // 

-            // cb_preview

-            // 

-            this.cb_preview.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.cb_preview.DropDownWidth = 75;

-            this.cb_preview.FlatStyle = System.Windows.Forms.FlatStyle.Standard;

-            this.cb_preview.Font = new System.Drawing.Font("Tahoma", 9F);

-            this.cb_preview.Items.AddRange(new object[] {

+            // startPoint

+            // 

+            this.startPoint.FormattingEnabled = true;

+            this.startPoint.Items.AddRange(new object[] {

             "1",

             "2",

             "3",

@@ -94,23 +55,15 @@
             "8",

             "9",

             "10"});

-            this.cb_preview.Name = "cb_preview";

-            this.cb_preview.Size = new System.Drawing.Size(75, 25);

-            // 

-            // toolStripLabel2

-            // 

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

-            this.toolStripLabel2.Name = "toolStripLabel2";

-            this.toolStripLabel2.Size = new System.Drawing.Size(107, 22);

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

+            this.startPoint.Location = new System.Drawing.Point(107, 6);

+            this.startPoint.Name = "startPoint";

+            this.startPoint.Size = new System.Drawing.Size(72, 21);

+            this.startPoint.TabIndex = 38;

             // 

-            // cb_duration

+            // endPoint

             // 

-            this.cb_duration.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.cb_duration.DropDownWidth = 75;

-            this.cb_duration.FlatStyle = System.Windows.Forms.FlatStyle.Standard;

-            this.cb_duration.Font = new System.Drawing.Font("Tahoma", 9F);

-            this.cb_duration.Items.AddRange(new object[] {

+            this.endPoint.FormattingEnabled = true;

+            this.endPoint.Items.AddRange(new object[] {

             "5",

             "10",

             "15",

@@ -123,89 +76,77 @@
             "50",

             "55",

             "60"});

-            this.cb_duration.Margin = new System.Windows.Forms.Padding(0);

-            this.cb_duration.Name = "cb_duration";

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

-            // 

-            // btn_playQT

-            // 

-            this.btn_playQT.Image = global::Handbrake.Properties.Resources.Play_small;

-            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(96, 22);

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

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

-            // 

-            // btn_playVLC

-            // 

-            this.btn_playVLC.Image = global::Handbrake.Properties.Resources.Play_small;

-            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(101, 22);

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

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

-            // 

-            // toolStripSeparator1

-            // 

-            this.toolStripSeparator1.Name = "toolStripSeparator1";

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

-            // 

-            // ProgressBarStatus

-            // 

-            this.ProgressBarStatus.Name = "ProgressBarStatus";

-            this.ProgressBarStatus.Size = new System.Drawing.Size(100, 22);

-            this.ProgressBarStatus.Visible = false;

-            // 

-            // lbl_encodeStatus

-            // 

-            this.lbl_encodeStatus.Name = "lbl_encodeStatus";

-            this.lbl_encodeStatus.Size = new System.Drawing.Size(38, 22);

-            this.lbl_encodeStatus.Text = "0.00%";

-            this.lbl_encodeStatus.Visible = false;

-            // 

-            // panel1

-            // 

-            this.panel1.AutoSize = true;

-            this.panel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

-            this.panel1.Controls.Add(this.QTControl);

-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;

-            this.panel1.Location = new System.Drawing.Point(0, 25);

-            this.panel1.Name = "panel1";

-            this.panel1.Size = new System.Drawing.Size(722, 481);

-            this.panel1.TabIndex = 40;

-            // 

-            // QTControl

-            // 

-            this.QTControl.Enabled = true;

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

-            this.QTControl.Name = "QTControl";

-            this.QTControl.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("QTControl.OcxState")));

-            this.QTControl.Size = new System.Drawing.Size(64, 72);

-            this.QTControl.TabIndex = 39;

-            this.QTControl.Visible = false;

+            this.endPoint.Location = new System.Drawing.Point(289, 6);

+            this.endPoint.Name = "endPoint";

+            this.endPoint.Size = new System.Drawing.Size(70, 21);

+            this.endPoint.TabIndex = 39;

+            // 

+            // label1

+            // 

+            this.label1.AutoSize = true;

+            this.label1.Location = new System.Drawing.Point(12, 9);

+            this.label1.Name = "label1";

+            this.label1.Size = new System.Drawing.Size(89, 13);

+            this.label1.TabIndex = 40;

+            this.label1.Text = "Start at Preview:";

+            // 

+            // label2

+            // 

+            this.label2.AutoSize = true;

+            this.label2.Location = new System.Drawing.Point(185, 9);

+            this.label2.Name = "label2";

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

+            this.label2.TabIndex = 41;

+            this.label2.Text = "Duration (seconds)";

+            // 

+            // progressBar

+            // 

+            this.progressBar.Location = new System.Drawing.Point(12, 33);

+            this.progressBar.Name = "progressBar";

+            this.progressBar.Size = new System.Drawing.Size(301, 18);

+            this.progressBar.TabIndex = 42;

+            // 

+            // lbl_progress

+            // 

+            this.lbl_progress.AutoSize = true;

+            this.lbl_progress.Location = new System.Drawing.Point(319, 36);

+            this.lbl_progress.Name = "lbl_progress";

+            this.lbl_progress.Size = new System.Drawing.Size(40, 13);

+            this.lbl_progress.TabIndex = 43;

+            this.lbl_progress.Text = "0.00%";

+            // 

+            // btn_play

+            // 

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

+            this.btn_play.ForeColor = System.Drawing.Color.DarkOrange;

+            this.btn_play.Location = new System.Drawing.Point(302, 57);

+            this.btn_play.Name = "btn_play";

+            this.btn_play.Size = new System.Drawing.Size(57, 24);

+            this.btn_play.TabIndex = 44;

+            this.btn_play.Text = "Play";

+            this.btn_play.UseVisualStyleBackColor = true;

+            this.btn_play.Click += new System.EventHandler(this.btn_play_Click);

             // 

             // frmPreview

             // 

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

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

-            this.AutoSize = true;

-            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;

-            this.BackColor = System.Drawing.Color.Black;

-            this.ClientSize = new System.Drawing.Size(722, 506);

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

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

+            this.ClientSize = new System.Drawing.Size(369, 91);

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

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

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

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

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

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

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

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

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

-            this.MinimumSize = new System.Drawing.Size(730, 32);

+            this.MaximizeBox = false;

+            this.MinimizeBox = false;

             this.Name = "frmPreview";

+            this.ShowIcon = false;

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

             this.Text = "Video Preview";

-            this.toolBar.ResumeLayout(false);

-            this.toolBar.PerformLayout();

-            this.panel1.ResumeLayout(false);

-            ((System.ComponentModel.ISupportInitialize)(this.QTControl)).EndInit();

             this.ResumeLayout(false);

             this.PerformLayout();

 

@@ -213,17 +154,13 @@
 

         #endregion

 

-        private System.Windows.Forms.ToolStrip toolBar;

-        private System.Windows.Forms.ToolStripButton btn_playQT;

-        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.ToolStripButton btn_playVLC;

-        private System.Windows.Forms.Panel panel1;

-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;

-        private System.Windows.Forms.ToolStripProgressBar ProgressBarStatus;

-        private System.Windows.Forms.ToolStripLabel lbl_encodeStatus;

+        private System.Windows.Forms.ComboBox startPoint;

+        private System.Windows.Forms.ComboBox endPoint;

+        private System.Windows.Forms.Label label1;

+        private System.Windows.Forms.Label label2;

+        private System.Windows.Forms.ProgressBar progressBar;

+        private System.Windows.Forms.Label lbl_progress;

+        private System.Windows.Forms.Button btn_play;

+

     }

 }
\ No newline at end of file