From 5680b256e398c3c4c28c36e479e8983284b0a340 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 12 Apr 2009 20:10:47 +0000 Subject: WinGui: - Improvements to the preview window design. - Code tweaks to make it less crash / error prone (QT Control) git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2320 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/C#/frmPreview.Designer.cs | 81 +++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 38 deletions(-) (limited to 'win/C#/frmPreview.Designer.cs') diff --git a/win/C#/frmPreview.Designer.cs b/win/C#/frmPreview.Designer.cs index 0beebf6e0..464ac255b 100644 --- a/win/C#/frmPreview.Designer.cs +++ b/win/C#/frmPreview.Designer.cs @@ -39,12 +39,12 @@ 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.statusStrip = new System.Windows.Forms.StatusStrip(); - this.lbl_status = new System.Windows.Forms.ToolStripStatusLabel(); this.QTControl = new AxQTOControlLib.AxQTControl(); + this.panel1 = new System.Windows.Forms.Panel(); + this.lbl_status = new System.Windows.Forms.Label(); this.toolBar.SuspendLayout(); - this.statusStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.QTControl)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // toolBar @@ -60,7 +60,7 @@ this.toolBar.Location = new System.Drawing.Point(0, 0); this.toolBar.Name = "toolBar"; this.toolBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.toolBar.Size = new System.Drawing.Size(774, 39); + this.toolBar.Size = new System.Drawing.Size(774, 25); this.toolBar.TabIndex = 37; this.toolBar.Text = "toolStrip1"; // @@ -68,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(100, 36); + this.lbl_preview.Size = new System.Drawing.Size(100, 22); this.lbl_preview.Text = "Start at Preview:"; // // cb_preview @@ -88,13 +88,13 @@ "9", "10"}); this.cb_preview.Name = "cb_preview"; - this.cb_preview.Size = new System.Drawing.Size(75, 39); + 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(111, 36); + this.toolStripLabel2.Size = new System.Drawing.Size(111, 22); this.toolStripLabel2.Text = "Duration (seconds)"; // // cb_duration @@ -117,64 +117,69 @@ "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, 39); + this.cb_duration.Size = new System.Drawing.Size(75, 25); // // btn_playQT // - this.btn_playQT.Image = global::Handbrake.Properties.Resources.Play; + 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(113, 36); + this.btn_playQT.Size = new System.Drawing.Size(99, 22); 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.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(117, 36); + this.btn_playVLC.Size = new System.Drawing.Size(103, 22); 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_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; - this.QTControl.Location = new System.Drawing.Point(0, 42); + 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, 64); + this.QTControl.Size = new System.Drawing.Size(64, 72); this.QTControl.TabIndex = 39; this.QTControl.Visible = false; // + // panel1 + // + this.panel1.Controls.Add(this.lbl_status); + 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(774, 483); + this.panel1.TabIndex = 40; + // + // lbl_status + // + this.lbl_status.AutoSize = true; + this.lbl_status.BackColor = System.Drawing.Color.Transparent; + this.lbl_status.Dock = System.Windows.Forms.DockStyle.Top; + this.lbl_status.Font = new System.Drawing.Font("Tahoma", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbl_status.ForeColor = System.Drawing.Color.White; + this.lbl_status.Location = new System.Drawing.Point(0, 0); + this.lbl_status.Name = "lbl_status"; + this.lbl_status.Size = new System.Drawing.Size(51, 25); + this.lbl_status.TabIndex = 40; + this.lbl_status.Text = "{0}"; + this.lbl_status.Visible = false; + // // frmPreview // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Black; this.ClientSize = new System.Drawing.Size(774, 508); - this.Controls.Add(this.QTControl); - this.Controls.Add(this.statusStrip); + this.Controls.Add(this.panel1); this.Controls.Add(this.toolBar); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "frmPreview"; @@ -183,9 +188,9 @@ this.TopMost = true; this.toolBar.ResumeLayout(false); this.toolBar.PerformLayout(); - this.statusStrip.ResumeLayout(false); - this.statusStrip.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.QTControl)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -195,13 +200,13 @@ private System.Windows.Forms.ToolStrip toolBar; 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_status; private System.Windows.Forms.ToolStripButton btn_playVLC; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label lbl_status; } } \ No newline at end of file -- cgit v1.2.3