From: Sweidan Omar Date: Wed, 12 Jan 2022 18:32:50 +0000 (+0000) Subject: #309 X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=3e1bc4cbd79d8d915e4e91f2bc7463a33cea81c6;p=mediacube.git #309 git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32728 --- diff --git a/client/DxPlay/Controls/PlayerControls.Designer.cs b/client/DxPlay/Controls/PlayerControls.Designer.cs index 0493bb4c..06440fb6 100644 --- a/client/DxPlay/Controls/PlayerControls.Designer.cs +++ b/client/DxPlay/Controls/PlayerControls.Designer.cs @@ -36,6 +36,7 @@ this.controlsPanel = new System.Windows.Forms.TableLayoutPanel(); this.buttonsPanel = new System.Windows.Forms.FlowLayoutPanel(); this.btnPlay = new MaestroShared.Controls.NoFocusCueButton(); + this.btnPause = new MaestroShared.Controls.NoFocusCueButton(); this.btnRewind = new MaestroShared.Controls.NoFocusCueButton(); this.btnStepBack = new MaestroShared.Controls.NoFocusCueButton(); this.btnStop = new MaestroShared.Controls.NoFocusCueButton(); @@ -50,7 +51,6 @@ // // mainPanel // - this.mainPanel.AutoSize = true; this.mainPanel.ColumnCount = 1; this.mainPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.mainPanel.Controls.Add(this.trackBar, 0, 1); @@ -63,8 +63,8 @@ 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, 65F)); - this.mainPanel.Size = new System.Drawing.Size(835, 121); + this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F)); + this.mainPanel.Size = new System.Drawing.Size(1113, 152); this.mainPanel.TabIndex = 0; // // trackBar @@ -79,10 +79,11 @@ 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(3, 43); + this.trackBar.Location = new System.Drawing.Point(4, 53); + this.trackBar.Margin = new System.Windows.Forms.Padding(4); this.trackBar.Maximum = 1; this.trackBar.Name = "trackBar"; - this.trackBar.Size = new System.Drawing.Size(829, 10); + this.trackBar.Size = new System.Drawing.Size(1105, 12); this.trackBar.SmallChange = ((uint)(1u)); this.trackBar.TabIndex = 19; this.trackBar.Text = "colorSlider1"; @@ -98,8 +99,8 @@ this.timecodePanel.AutoSize = true; this.timecodePanel.ColumnCount = 3; this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); - this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F)); - this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 42.22821F)); + this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 37.8257F)); this.timecodePanel.Controls.Add(this.lbCurrentTC, 0, 1); this.timecodePanel.Controls.Add(this.lbStartTC, 0, 1); this.timecodePanel.Controls.Add(this.lbStart, 0, 0); @@ -113,7 +114,7 @@ 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(835, 40); + this.timecodePanel.Size = new System.Drawing.Size(1113, 49); this.timecodePanel.TabIndex = 0; // // lbCurrentTC @@ -123,9 +124,10 @@ | 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(170, 13); + this.lbCurrentTC.Location = new System.Drawing.Point(226, 16); + this.lbCurrentTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbCurrentTC.Name = "lbCurrentTC"; - this.lbCurrentTC.Size = new System.Drawing.Size(495, 27); + this.lbCurrentTC.Size = new System.Drawing.Size(461, 33); this.lbCurrentTC.TabIndex = 25; this.lbCurrentTC.Text = "00:00:00.00"; this.lbCurrentTC.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -136,9 +138,10 @@ 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(3, 13); + this.lbStartTC.Location = new System.Drawing.Point(4, 16); + this.lbStartTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbStartTC.Name = "lbStartTC"; - this.lbStartTC.Size = new System.Drawing.Size(161, 17); + this.lbStartTC.Size = new System.Drawing.Size(214, 21); this.lbStartTC.TabIndex = 23; this.lbStartTC.Text = "00:00:00.00"; // @@ -147,9 +150,10 @@ 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(3, 0); + this.lbStart.Location = new System.Drawing.Point(4, 0); + this.lbStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbStart.Name = "lbStart"; - this.lbStart.Size = new System.Drawing.Size(161, 13); + this.lbStart.Size = new System.Drawing.Size(214, 16); this.lbStart.TabIndex = 19; this.lbStart.Text = "START"; this.lbStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -159,9 +163,10 @@ 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(170, 0); + this.lbStatus.Location = new System.Drawing.Point(226, 0); + this.lbStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbStatus.Name = "lbStatus"; - this.lbStatus.Size = new System.Drawing.Size(495, 13); + this.lbStatus.Size = new System.Drawing.Size(461, 16); this.lbStatus.TabIndex = 21; this.lbStatus.Text = "NO INPUT"; this.lbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -171,9 +176,10 @@ 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(671, 0); + this.lbDuration.Location = new System.Drawing.Point(695, 0); + this.lbDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbDuration.Name = "lbDuration"; - this.lbDuration.Size = new System.Drawing.Size(161, 13); + this.lbDuration.Size = new System.Drawing.Size(414, 16); this.lbDuration.TabIndex = 22; this.lbDuration.Text = "DURATION"; this.lbDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -184,9 +190,10 @@ 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(671, 13); + this.lbEndTC.Location = new System.Drawing.Point(695, 16); + this.lbEndTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lbEndTC.Name = "lbEndTC"; - this.lbEndTC.Size = new System.Drawing.Size(161, 17); + this.lbEndTC.Size = new System.Drawing.Size(414, 21); this.lbEndTC.TabIndex = 24; this.lbEndTC.Text = "00:00:00.00"; this.lbEndTC.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -195,16 +202,17 @@ // this.controlsPanel.AutoSize = true; this.controlsPanel.ColumnCount = 2; - this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 75F)); - this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); + 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.Controls.Add(this.buttonsPanel, 0, 0); this.controlsPanel.Controls.Add(this.logoPanel, 1, 0); this.controlsPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.controlsPanel.Location = new System.Drawing.Point(3, 59); + this.controlsPanel.Location = new System.Drawing.Point(4, 73); + this.controlsPanel.Margin = new System.Windows.Forms.Padding(4); this.controlsPanel.Name = "controlsPanel"; this.controlsPanel.RowCount = 1; this.controlsPanel.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.controlsPanel.Size = new System.Drawing.Size(829, 59); + this.controlsPanel.Size = new System.Drawing.Size(1105, 75); this.controlsPanel.TabIndex = 21; // // buttonsPanel @@ -212,6 +220,7 @@ this.buttonsPanel.AutoSize = true; this.buttonsPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.buttonsPanel.Controls.Add(this.btnPlay); + this.buttonsPanel.Controls.Add(this.btnPause); this.buttonsPanel.Controls.Add(this.btnRewind); this.buttonsPanel.Controls.Add(this.btnStepBack); this.buttonsPanel.Controls.Add(this.btnStop); @@ -221,7 +230,7 @@ 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(360, 60); + this.buttonsPanel.Size = new System.Drawing.Size(560, 75); this.buttonsPanel.TabIndex = 20; // // btnPlay @@ -232,14 +241,32 @@ 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(3, 3); + this.btnPlay.Location = new System.Drawing.Point(4, 4); + this.btnPlay.Margin = new System.Windows.Forms.Padding(4); this.btnPlay.Name = "btnPlay"; - this.btnPlay.Size = new System.Drawing.Size(54, 54); - this.btnPlay.TabIndex = 17; + this.btnPlay.Size = new System.Drawing.Size(72, 66); + this.btnPlay.TabIndex = 23; this.btnPlay.TabStop = false; this.btnPlay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.btnPlay.UseVisualStyleBackColor = false; // + // btnPause + // + this.btnPause.AutoSize = true; + this.btnPause.BackColor = System.Drawing.Color.Transparent; + this.btnPause.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnPause.FlatAppearance.BorderSize = 0; + this.btnPause.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnPause.Image = global::DxPlay.Properties.Resources.ic_pause_black_24dp_2x; + this.btnPause.Location = new System.Drawing.Point(84, 4); + this.btnPause.Margin = new System.Windows.Forms.Padding(4); + this.btnPause.Name = "btnPause"; + this.btnPause.Size = new System.Drawing.Size(72, 66); + this.btnPause.TabIndex = 25; + this.btnPause.TabStop = false; + this.btnPause.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + this.btnPause.UseVisualStyleBackColor = false; + // // btnRewind // this.btnRewind.AutoSize = true; @@ -248,9 +275,10 @@ 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(63, 3); + this.btnRewind.Location = new System.Drawing.Point(164, 4); + this.btnRewind.Margin = new System.Windows.Forms.Padding(4); this.btnRewind.Name = "btnRewind"; - this.btnRewind.Size = new System.Drawing.Size(54, 54); + this.btnRewind.Size = new System.Drawing.Size(72, 66); this.btnRewind.TabIndex = 18; this.btnRewind.TabStop = false; this.btnRewind.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -264,9 +292,10 @@ 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(123, 3); + this.btnStepBack.Location = new System.Drawing.Point(244, 4); + this.btnStepBack.Margin = new System.Windows.Forms.Padding(4); this.btnStepBack.Name = "btnStepBack"; - this.btnStepBack.Size = new System.Drawing.Size(54, 54); + this.btnStepBack.Size = new System.Drawing.Size(72, 66); this.btnStepBack.TabIndex = 21; this.btnStepBack.TabStop = false; this.btnStepBack.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -280,9 +309,10 @@ 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(183, 3); + this.btnStop.Location = new System.Drawing.Point(324, 4); + this.btnStop.Margin = new System.Windows.Forms.Padding(4); this.btnStop.Name = "btnStop"; - this.btnStop.Size = new System.Drawing.Size(54, 54); + this.btnStop.Size = new System.Drawing.Size(72, 66); this.btnStop.TabIndex = 19; this.btnStop.TabStop = false; this.btnStop.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -296,9 +326,10 @@ 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(243, 3); + this.btnStepForward.Location = new System.Drawing.Point(404, 4); + this.btnStepForward.Margin = new System.Windows.Forms.Padding(4); this.btnStepForward.Name = "btnStepForward"; - this.btnStepForward.Size = new System.Drawing.Size(54, 54); + this.btnStepForward.Size = new System.Drawing.Size(72, 66); this.btnStepForward.TabIndex = 22; this.btnStepForward.TabStop = false; this.btnStepForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -312,9 +343,10 @@ 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(303, 3); + this.btnForward.Location = new System.Drawing.Point(484, 4); + this.btnForward.Margin = new System.Windows.Forms.Padding(4); this.btnForward.Name = "btnForward"; - this.btnForward.Size = new System.Drawing.Size(54, 54); + this.btnForward.Size = new System.Drawing.Size(72, 66); this.btnForward.TabIndex = 20; this.btnForward.TabStop = false; this.btnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -326,21 +358,21 @@ 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(621, 0); + 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(208, 60); + this.logoPanel.Size = new System.Drawing.Size(232, 75); this.logoPanel.TabIndex = 21; // // PlayerControls // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); 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(835, 126); + this.Size = new System.Drawing.Size(1113, 203); this.mainPanel.ResumeLayout(false); this.mainPanel.PerformLayout(); this.timecodePanel.ResumeLayout(false); @@ -349,7 +381,6 @@ this.buttonsPanel.ResumeLayout(false); this.buttonsPanel.PerformLayout(); this.ResumeLayout(false); - this.PerformLayout(); } @@ -373,5 +404,7 @@ private System.Windows.Forms.Panel logoPanel; private MaestroShared.Controls.NoFocusCueButton btnStepBack; private MaestroShared.Controls.NoFocusCueButton btnStepForward; + private MaestroShared.Controls.NoFocusCueButton btnPause; + //private VideoSpeedTrackbar playSpeed; } } diff --git a/client/DxPlay/Controls/PlayerControls.cs b/client/DxPlay/Controls/PlayerControls.cs index 21cf06cf..d6042c7e 100644 --- a/client/DxPlay/Controls/PlayerControls.cs +++ b/client/DxPlay/Controls/PlayerControls.cs @@ -14,6 +14,7 @@ namespace DxPlay.Controls { public Label EndTC { get => lbEndTC; } public Label CurrentTC { get => lbCurrentTC; } public ColorSlider TrackBar { get => trackBar; } + public NoFocusCueButton Pause { get => btnPause; } public NoFocusCueButton Play { get => btnPlay; } public NoFocusCueButton Stop { get => btnStop; } public NoFocusCueButton Rewind { get => btnRewind; }