From 2d839ba00224f5b06fd0adf9fae8ce4f1b73d1b1 Mon Sep 17 00:00:00 2001 From: elgekko Date: Tue, 7 Jun 2022 09:52:24 +0200 Subject: [PATCH] Elvesztett player layout vissza --- .../Controls/PlayerControls.Designer.cs | 239 ++++++++++-------- client/DxPlay/Controls/PlayerControls.cs | 1 + 2 files changed, 138 insertions(+), 102 deletions(-) diff --git a/client/DxPlay/Controls/PlayerControls.Designer.cs b/client/DxPlay/Controls/PlayerControls.Designer.cs index 35083e2a..e806d78d 100644 --- a/client/DxPlay/Controls/PlayerControls.Designer.cs +++ b/client/DxPlay/Controls/PlayerControls.Designer.cs @@ -42,6 +42,10 @@ namespace DxPlay.Controls this.lbDuration = new System.Windows.Forms.Label(); this.lbEndTC = new System.Windows.Forms.Label(); this.controlsPanel = new System.Windows.Forms.TableLayoutPanel(); + this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); + this.playSpeed = new DxPlay.Controls.VideoSpeedTrackbar(); + this.lblPlaySpeed = new System.Windows.Forms.Label(); + this.logoPanel = new System.Windows.Forms.Panel(); this.buttonsPanel = new System.Windows.Forms.FlowLayoutPanel(); this.btnPlay = new MaestroShared.Controls.NoFocusCueButton(); this.btnRewind = new MaestroShared.Controls.NoFocusCueButton(); @@ -49,16 +53,16 @@ namespace DxPlay.Controls this.btnStop = new MaestroShared.Controls.NoFocusCueButton(); this.btnStepForward = new MaestroShared.Controls.NoFocusCueButton(); this.btnForward = new MaestroShared.Controls.NoFocusCueButton(); - this.lblPlaySpeed = new System.Windows.Forms.Label(); - this.playSpeed = new DxPlay.Controls.VideoSpeedTrackbar(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.audioLabel = new System.Windows.Forms.Label(); this.audioTracks = new System.Windows.Forms.ComboBox(); - this.logoPanel = new System.Windows.Forms.Panel(); this.mainPanel.SuspendLayout(); this.timecodePanel.SuspendLayout(); this.controlsPanel.SuspendLayout(); - this.buttonsPanel.SuspendLayout(); + this.tableLayoutPanel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.playSpeed)).BeginInit(); + this.buttonsPanel.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // mainPanel @@ -75,8 +79,8 @@ namespace DxPlay.Controls this.mainPanel.RowCount = 3; this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F)); - this.mainPanel.Size = new System.Drawing.Size(1113, 203); + this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 65F)); + this.mainPanel.Size = new System.Drawing.Size(835, 165); this.mainPanel.TabIndex = 0; // // trackBar @@ -91,11 +95,10 @@ namespace DxPlay.Controls this.trackBar.ElapsedInnerColor = System.Drawing.Color.Black; this.trackBar.ElapsedOuterColor = System.Drawing.Color.DarkGray; this.trackBar.LargeChange = ((uint)(0u)); - this.trackBar.Location = new System.Drawing.Point(4, 53); - this.trackBar.Margin = new System.Windows.Forms.Padding(4); + this.trackBar.Location = new System.Drawing.Point(3, 43); this.trackBar.Maximum = 1; this.trackBar.Name = "trackBar"; - this.trackBar.Size = new System.Drawing.Size(1105, 12); + this.trackBar.Size = new System.Drawing.Size(829, 10); this.trackBar.SmallChange = ((uint)(1u)); this.trackBar.TabIndex = 19; this.trackBar.Text = "colorSlider1"; @@ -126,7 +129,7 @@ namespace DxPlay.Controls this.timecodePanel.RowCount = 2; this.timecodePanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.timecodePanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.timecodePanel.Size = new System.Drawing.Size(1113, 49); + this.timecodePanel.Size = new System.Drawing.Size(835, 40); this.timecodePanel.TabIndex = 0; // // lbCurrentTC @@ -136,10 +139,9 @@ namespace DxPlay.Controls | System.Windows.Forms.AnchorStyles.Right))); this.lbCurrentTC.BackColor = System.Drawing.Color.Transparent; this.lbCurrentTC.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lbCurrentTC.Location = new System.Drawing.Point(297, 16); - this.lbCurrentTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbCurrentTC.Location = new System.Drawing.Point(223, 13); this.lbCurrentTC.Name = "lbCurrentTC"; - this.lbCurrentTC.Size = new System.Drawing.Size(511, 33); + this.lbCurrentTC.Size = new System.Drawing.Size(383, 27); this.lbCurrentTC.TabIndex = 25; this.lbCurrentTC.Text = "00:00:00.00"; this.lbCurrentTC.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -150,10 +152,9 @@ namespace DxPlay.Controls this.lbStartTC.Dock = System.Windows.Forms.DockStyle.Top; this.lbStartTC.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.lbStartTC.ForeColor = System.Drawing.SystemColors.WindowText; - this.lbStartTC.Location = new System.Drawing.Point(4, 16); - this.lbStartTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbStartTC.Location = new System.Drawing.Point(3, 13); this.lbStartTC.Name = "lbStartTC"; - this.lbStartTC.Size = new System.Drawing.Size(285, 21); + this.lbStartTC.Size = new System.Drawing.Size(214, 17); this.lbStartTC.TabIndex = 23; this.lbStartTC.Text = "00:00:00.00"; // @@ -162,10 +163,9 @@ namespace DxPlay.Controls this.lbStart.BackColor = System.Drawing.Color.Transparent; this.lbStart.Dock = System.Windows.Forms.DockStyle.Top; this.lbStart.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lbStart.Location = new System.Drawing.Point(4, 0); - this.lbStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbStart.Location = new System.Drawing.Point(3, 0); this.lbStart.Name = "lbStart"; - this.lbStart.Size = new System.Drawing.Size(285, 16); + this.lbStart.Size = new System.Drawing.Size(214, 13); this.lbStart.TabIndex = 19; this.lbStart.Text = "START"; this.lbStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -175,10 +175,9 @@ namespace DxPlay.Controls this.lbStatus.BackColor = System.Drawing.Color.Transparent; this.lbStatus.Dock = System.Windows.Forms.DockStyle.Top; this.lbStatus.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lbStatus.Location = new System.Drawing.Point(297, 0); - this.lbStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbStatus.Location = new System.Drawing.Point(223, 0); this.lbStatus.Name = "lbStatus"; - this.lbStatus.Size = new System.Drawing.Size(511, 16); + this.lbStatus.Size = new System.Drawing.Size(383, 13); this.lbStatus.TabIndex = 21; this.lbStatus.Text = "NO INPUT"; this.lbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -188,10 +187,9 @@ namespace DxPlay.Controls this.lbDuration.BackColor = System.Drawing.Color.Transparent; this.lbDuration.Dock = System.Windows.Forms.DockStyle.Top; this.lbDuration.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.lbDuration.Location = new System.Drawing.Point(816, 0); - this.lbDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbDuration.Location = new System.Drawing.Point(612, 0); this.lbDuration.Name = "lbDuration"; - this.lbDuration.Size = new System.Drawing.Size(293, 16); + this.lbDuration.Size = new System.Drawing.Size(220, 13); this.lbDuration.TabIndex = 22; this.lbDuration.Text = "DURATION"; this.lbDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -202,10 +200,9 @@ namespace DxPlay.Controls this.lbEndTC.Dock = System.Windows.Forms.DockStyle.Top; this.lbEndTC.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.lbEndTC.ForeColor = System.Drawing.SystemColors.WindowText; - this.lbEndTC.Location = new System.Drawing.Point(816, 16); - this.lbEndTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lbEndTC.Location = new System.Drawing.Point(612, 13); this.lbEndTC.Name = "lbEndTC"; - this.lbEndTC.Size = new System.Drawing.Size(293, 21); + this.lbEndTC.Size = new System.Drawing.Size(220, 17); this.lbEndTC.TabIndex = 24; this.lbEndTC.Text = "00:00:00.00"; this.lbEndTC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -213,20 +210,79 @@ namespace DxPlay.Controls // controlsPanel // this.controlsPanel.AutoSize = true; - this.controlsPanel.ColumnCount = 2; - this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 79.09502F)); - this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.90498F)); + this.controlsPanel.ColumnCount = 3; + this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 200F)); + this.controlsPanel.Controls.Add(this.tableLayoutPanel2, 0, 0); + this.controlsPanel.Controls.Add(this.logoPanel, 2, 0); this.controlsPanel.Controls.Add(this.buttonsPanel, 0, 0); - this.controlsPanel.Controls.Add(this.logoPanel, 1, 0); + this.controlsPanel.Controls.Add(this.tableLayoutPanel1, 0, 1); this.controlsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.controlsPanel.Location = new System.Drawing.Point(4, 73); - this.controlsPanel.Margin = new System.Windows.Forms.Padding(4); + this.controlsPanel.Location = new System.Drawing.Point(3, 59); this.controlsPanel.Name = "controlsPanel"; - this.controlsPanel.RowCount = 1; + this.controlsPanel.RowCount = 2; this.controlsPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.controlsPanel.Size = new System.Drawing.Size(1105, 126); + this.controlsPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 50F)); + this.controlsPanel.Size = new System.Drawing.Size(829, 103); this.controlsPanel.TabIndex = 21; // + // tableLayoutPanel2 + // + this.tableLayoutPanel2.ColumnCount = 2; + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 104F)); + this.tableLayoutPanel2.Controls.Add(this.playSpeed, 1, 0); + this.tableLayoutPanel2.Controls.Add(this.lblPlaySpeed, 0, 0); + this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Left; + this.tableLayoutPanel2.Location = new System.Drawing.Point(363, 3); + this.tableLayoutPanel2.Name = "tableLayoutPanel2"; + this.tableLayoutPanel2.RowCount = 1; + this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel2.Size = new System.Drawing.Size(126, 54); + this.tableLayoutPanel2.TabIndex = 23; + // + // playSpeed + // + this.playSpeed.AutoSize = false; + this.playSpeed.CurrentSpeed = 0F; + this.playSpeed.Dock = System.Windows.Forms.DockStyle.Bottom; + this.playSpeed.LargeChange = 1; + this.playSpeed.Location = new System.Drawing.Point(24, 21); + this.playSpeed.Margin = new System.Windows.Forms.Padding(2); + this.playSpeed.Maximum = 5; + this.playSpeed.Name = "playSpeed"; + this.playSpeed.Size = new System.Drawing.Size(100, 31); + this.playSpeed.TabIndex = 26; + this.playSpeed.Tag = "PlaySpeed"; + this.playSpeed.TickStyle = System.Windows.Forms.TickStyle.None; + this.playSpeed.Value = 2; + // + // lblPlaySpeed + // + this.lblPlaySpeed.AutoSize = true; + this.lblPlaySpeed.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblPlaySpeed.Location = new System.Drawing.Point(2, 5); + this.lblPlaySpeed.Margin = new System.Windows.Forms.Padding(2, 5, 2, 0); + this.lblPlaySpeed.Name = "lblPlaySpeed"; + this.lblPlaySpeed.Size = new System.Drawing.Size(18, 49); + this.lblPlaySpeed.TabIndex = 27; + this.lblPlaySpeed.Text = "x1"; + this.lblPlaySpeed.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // logoPanel + // + this.logoPanel.AutoSize = true; + this.logoPanel.BackgroundImage = global::DxPlay.Properties.Resources.bs_user_logo; + this.logoPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.logoPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.logoPanel.Location = new System.Drawing.Point(629, 0); + this.logoPanel.Margin = new System.Windows.Forms.Padding(0); + this.logoPanel.Name = "logoPanel"; + this.controlsPanel.SetRowSpan(this.logoPanel, 2); + this.logoPanel.Size = new System.Drawing.Size(200, 110); + this.logoPanel.TabIndex = 21; + // // buttonsPanel // this.buttonsPanel.AutoSize = true; @@ -237,15 +293,10 @@ namespace DxPlay.Controls this.buttonsPanel.Controls.Add(this.btnStop); this.buttonsPanel.Controls.Add(this.btnStepForward); this.buttonsPanel.Controls.Add(this.btnForward); - this.buttonsPanel.Controls.Add(this.lblPlaySpeed); - this.buttonsPanel.Controls.Add(this.playSpeed); - this.buttonsPanel.Controls.Add(this.audioLabel); - this.buttonsPanel.Controls.Add(this.audioTracks); - this.buttonsPanel.Dock = System.Windows.Forms.DockStyle.Left; this.buttonsPanel.Location = new System.Drawing.Point(0, 0); this.buttonsPanel.Margin = new System.Windows.Forms.Padding(0); this.buttonsPanel.Name = "buttonsPanel"; - this.buttonsPanel.Size = new System.Drawing.Size(844, 126); + this.buttonsPanel.Size = new System.Drawing.Size(360, 60); this.buttonsPanel.TabIndex = 20; // // btnPlay @@ -256,10 +307,9 @@ namespace DxPlay.Controls this.btnPlay.FlatAppearance.BorderSize = 0; this.btnPlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnPlay.Image = global::DxPlay.Properties.Resources.ic_play_arrow_black_24dp_2x; - this.btnPlay.Location = new System.Drawing.Point(4, 4); - this.btnPlay.Margin = new System.Windows.Forms.Padding(4); + this.btnPlay.Location = new System.Drawing.Point(3, 3); this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(72, 66); + this.btnPlay.Size = new System.Drawing.Size(54, 54); this.btnPlay.TabIndex = 23; this.btnPlay.TabStop = false; this.btnPlay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -273,10 +323,9 @@ namespace DxPlay.Controls this.btnRewind.FlatAppearance.BorderSize = 0; this.btnRewind.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRewind.Image = ((System.Drawing.Image)(resources.GetObject("btnRewind.Image"))); - this.btnRewind.Location = new System.Drawing.Point(84, 4); - this.btnRewind.Margin = new System.Windows.Forms.Padding(4); + this.btnRewind.Location = new System.Drawing.Point(63, 3); this.btnRewind.Name = "btnRewind"; - this.btnRewind.Size = new System.Drawing.Size(72, 66); + this.btnRewind.Size = new System.Drawing.Size(54, 54); this.btnRewind.TabIndex = 18; this.btnRewind.TabStop = false; this.btnRewind.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -290,10 +339,9 @@ namespace DxPlay.Controls this.btnStepBack.FlatAppearance.BorderSize = 0; this.btnStepBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStepBack.Image = global::DxPlay.Properties.Resources.baseline_skip_previous_black_24dp; - this.btnStepBack.Location = new System.Drawing.Point(164, 4); - this.btnStepBack.Margin = new System.Windows.Forms.Padding(4); + this.btnStepBack.Location = new System.Drawing.Point(123, 3); this.btnStepBack.Name = "btnStepBack"; - this.btnStepBack.Size = new System.Drawing.Size(72, 66); + this.btnStepBack.Size = new System.Drawing.Size(54, 54); this.btnStepBack.TabIndex = 21; this.btnStepBack.TabStop = false; this.btnStepBack.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -307,10 +355,9 @@ namespace DxPlay.Controls this.btnStop.FlatAppearance.BorderSize = 0; this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop.Image = global::DxPlay.Properties.Resources.ic_stop_black_24dp_2x; - this.btnStop.Location = new System.Drawing.Point(244, 4); - this.btnStop.Margin = new System.Windows.Forms.Padding(4); + this.btnStop.Location = new System.Drawing.Point(183, 3); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(72, 66); + this.btnStop.Size = new System.Drawing.Size(54, 54); this.btnStop.TabIndex = 19; this.btnStop.TabStop = false; this.btnStop.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -324,10 +371,9 @@ namespace DxPlay.Controls this.btnStepForward.FlatAppearance.BorderSize = 0; this.btnStepForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStepForward.Image = global::DxPlay.Properties.Resources.baseline_skip_next_black_24dp; - this.btnStepForward.Location = new System.Drawing.Point(324, 4); - this.btnStepForward.Margin = new System.Windows.Forms.Padding(4); + this.btnStepForward.Location = new System.Drawing.Point(243, 3); this.btnStepForward.Name = "btnStepForward"; - this.btnStepForward.Size = new System.Drawing.Size(72, 66); + this.btnStepForward.Size = new System.Drawing.Size(54, 54); this.btnStepForward.TabIndex = 22; this.btnStepForward.TabStop = false; this.btnStepForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -341,44 +387,37 @@ namespace DxPlay.Controls this.btnForward.FlatAppearance.BorderSize = 0; this.btnForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnForward.Image = global::DxPlay.Properties.Resources.baseline_fast_forward_black_24dp; - this.btnForward.Location = new System.Drawing.Point(404, 4); - this.btnForward.Margin = new System.Windows.Forms.Padding(4); + this.btnForward.Location = new System.Drawing.Point(303, 3); this.btnForward.Name = "btnForward"; - this.btnForward.Size = new System.Drawing.Size(72, 66); + this.btnForward.Size = new System.Drawing.Size(54, 54); this.btnForward.TabIndex = 20; this.btnForward.TabStop = false; this.btnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.btnForward.UseVisualStyleBackColor = false; // - // lblPlaySpeed - // - this.lblPlaySpeed.AutoSize = true; - this.lblPlaySpeed.Location = new System.Drawing.Point(483, 0); - this.lblPlaySpeed.Name = "lblPlaySpeed"; - this.lblPlaySpeed.Size = new System.Drawing.Size(22, 17); - this.lblPlaySpeed.TabIndex = 27; - this.lblPlaySpeed.Text = "x1"; - // - // playSpeed - // - this.playSpeed.CurrentSpeed = 0F; - this.playSpeed.LargeChange = 1; - this.playSpeed.Location = new System.Drawing.Point(511, 2); - this.playSpeed.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.playSpeed.Maximum = 5; - this.playSpeed.Name = "playSpeed"; - this.playSpeed.Size = new System.Drawing.Size(106, 56); - this.playSpeed.TabIndex = 26; - this.playSpeed.Tag = "PlaySpeed"; - this.playSpeed.TickStyle = System.Windows.Forms.TickStyle.None; - this.playSpeed.Value = 2; + // tableLayoutPanel1 + // + this.tableLayoutPanel1.ColumnCount = 2; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.audioLabel, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.audioTracks, 1, 0); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 63); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 1; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(354, 44); + this.tableLayoutPanel1.TabIndex = 22; // // audioLabel // this.audioLabel.AutoSize = true; - this.audioLabel.Location = new System.Drawing.Point(623, 0); + this.audioLabel.Location = new System.Drawing.Point(2, 5); + this.audioLabel.Margin = new System.Windows.Forms.Padding(2, 5, 2, 0); this.audioLabel.Name = "audioLabel"; - this.audioLabel.Size = new System.Drawing.Size(44, 17); + this.audioLabel.Size = new System.Drawing.Size(34, 13); this.audioLabel.TabIndex = 28; this.audioLabel.Tag = ""; this.audioLabel.Text = "Audio"; @@ -387,45 +426,39 @@ namespace DxPlay.Controls // audioTracks // this.audioTracks.AllowDrop = true; + this.audioTracks.Dock = System.Windows.Forms.DockStyle.Top; this.audioTracks.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.audioTracks.FormattingEnabled = true; this.audioTracks.IntegralHeight = false; - this.audioTracks.ItemHeight = 16; - this.audioTracks.Location = new System.Drawing.Point(673, 3); + this.audioTracks.ItemHeight = 13; + this.audioTracks.Location = new System.Drawing.Point(40, 2); + this.audioTracks.Margin = new System.Windows.Forms.Padding(2); this.audioTracks.Name = "audioTracks"; - this.audioTracks.Size = new System.Drawing.Size(168, 24); + this.audioTracks.Size = new System.Drawing.Size(312, 21); this.audioTracks.TabIndex = 29; this.audioTracks.Visible = false; // - // logoPanel - // - this.logoPanel.AutoSize = true; - this.logoPanel.BackgroundImage = global::DxPlay.Properties.Resources.bs_user_logo; - this.logoPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.logoPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.logoPanel.Location = new System.Drawing.Point(873, 0); - this.logoPanel.Margin = new System.Windows.Forms.Padding(0); - this.logoPanel.Name = "logoPanel"; - this.logoPanel.Size = new System.Drawing.Size(232, 126); - this.logoPanel.TabIndex = 21; - // // PlayerControls // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSize = true; this.Controls.Add(this.mainPanel); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "PlayerControls"; - this.Size = new System.Drawing.Size(1113, 203); + this.Size = new System.Drawing.Size(835, 165); this.mainPanel.ResumeLayout(false); this.mainPanel.PerformLayout(); this.timecodePanel.ResumeLayout(false); this.controlsPanel.ResumeLayout(false); this.controlsPanel.PerformLayout(); + this.tableLayoutPanel2.ResumeLayout(false); + this.tableLayoutPanel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.playSpeed)).EndInit(); this.buttonsPanel.ResumeLayout(false); this.buttonsPanel.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.playSpeed)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); this.ResumeLayout(false); } @@ -452,6 +485,8 @@ namespace DxPlay.Controls private MaestroShared.Controls.NoFocusCueButton btnStepForward; private VideoSpeedTrackbar playSpeed; private System.Windows.Forms.Label lblPlaySpeed; + private TableLayoutPanel tableLayoutPanel2; + private TableLayoutPanel tableLayoutPanel1; private Label audioLabel; private ComboBox audioTracks; } diff --git a/client/DxPlay/Controls/PlayerControls.cs b/client/DxPlay/Controls/PlayerControls.cs index 6bee2b3e..1ff0bcbc 100644 --- a/client/DxPlay/Controls/PlayerControls.cs +++ b/client/DxPlay/Controls/PlayerControls.cs @@ -32,5 +32,6 @@ namespace DxPlay.Controls public VideoSpeedTrackbar PlaySpeed { get => playSpeed; } public Label AudioLabel { get => audioLabel; } public ComboBox AudioTracks { get => audioTracks; } + } } \ No newline at end of file -- 2.54.0