#309
authorSweidan Omar <TFS\sweidan.omar>
Wed, 12 Jan 2022 18:32:50 +0000 (18:32 +0000)
committerSweidan Omar <TFS\sweidan.omar>
Wed, 12 Jan 2022 18:32:50 +0000 (18:32 +0000)
git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32728

client/DxPlay/Controls/PlayerControls.Designer.cs
client/DxPlay/Controls/PlayerControls.cs

index 0493bb4c135af6a23bac5548e4cf1016981ddea0..06440fb606c64b95cd9a65d8c53f487fbd5d0353 100644 (file)
@@ -36,6 +36,7 @@
             this.controlsPanel = new System.Windows.Forms.TableLayoutPanel();\r
             this.buttonsPanel = new System.Windows.Forms.FlowLayoutPanel();\r
             this.btnPlay = new MaestroShared.Controls.NoFocusCueButton();\r
+            this.btnPause = new MaestroShared.Controls.NoFocusCueButton();\r
             this.btnRewind = new MaestroShared.Controls.NoFocusCueButton();\r
             this.btnStepBack = new MaestroShared.Controls.NoFocusCueButton();\r
             this.btnStop = new MaestroShared.Controls.NoFocusCueButton();\r
@@ -50,7 +51,6 @@
             // \r
             // mainPanel\r
             // \r
-            this.mainPanel.AutoSize = true;\r
             this.mainPanel.ColumnCount = 1;\r
             this.mainPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.mainPanel.Controls.Add(this.trackBar, 0, 1);\r
@@ -63,8 +63,8 @@
             this.mainPanel.RowCount = 3;\r
             this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 65F));\r
-            this.mainPanel.Size = new System.Drawing.Size(835, 121);\r
+            this.mainPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 80F));\r
+            this.mainPanel.Size = new System.Drawing.Size(1113, 152);\r
             this.mainPanel.TabIndex = 0;\r
             // \r
             // trackBar\r
             this.trackBar.ElapsedInnerColor = System.Drawing.Color.Black;\r
             this.trackBar.ElapsedOuterColor = System.Drawing.Color.DarkGray;\r
             this.trackBar.LargeChange = ((uint)(0u));\r
-            this.trackBar.Location = new System.Drawing.Point(3, 43);\r
+            this.trackBar.Location = new System.Drawing.Point(4, 53);\r
+            this.trackBar.Margin = new System.Windows.Forms.Padding(4);\r
             this.trackBar.Maximum = 1;\r
             this.trackBar.Name = "trackBar";\r
-            this.trackBar.Size = new System.Drawing.Size(829, 10);\r
+            this.trackBar.Size = new System.Drawing.Size(1105, 12);\r
             this.trackBar.SmallChange = ((uint)(1u));\r
             this.trackBar.TabIndex = 19;\r
             this.trackBar.Text = "colorSlider1";\r
@@ -98,8 +99,8 @@
             this.timecodePanel.AutoSize = true;\r
             this.timecodePanel.ColumnCount = 3;\r
             this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));\r
-            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 60F));\r
-            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));\r
+            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 42.22821F));\r
+            this.timecodePanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 37.8257F));\r
             this.timecodePanel.Controls.Add(this.lbCurrentTC, 0, 1);\r
             this.timecodePanel.Controls.Add(this.lbStartTC, 0, 1);\r
             this.timecodePanel.Controls.Add(this.lbStart, 0, 0);\r
             this.timecodePanel.RowCount = 2;\r
             this.timecodePanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
             this.timecodePanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.timecodePanel.Size = new System.Drawing.Size(835, 40);\r
+            this.timecodePanel.Size = new System.Drawing.Size(1113, 49);\r
             this.timecodePanel.TabIndex = 0;\r
             // \r
             // lbCurrentTC\r
             | System.Windows.Forms.AnchorStyles.Right)));\r
             this.lbCurrentTC.BackColor = System.Drawing.Color.Transparent;\r
             this.lbCurrentTC.Font = new System.Drawing.Font("Calibri", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbCurrentTC.Location = new System.Drawing.Point(170, 13);\r
+            this.lbCurrentTC.Location = new System.Drawing.Point(226, 16);\r
+            this.lbCurrentTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbCurrentTC.Name = "lbCurrentTC";\r
-            this.lbCurrentTC.Size = new System.Drawing.Size(495, 27);\r
+            this.lbCurrentTC.Size = new System.Drawing.Size(461, 33);\r
             this.lbCurrentTC.TabIndex = 25;\r
             this.lbCurrentTC.Text = "00:00:00.00";\r
             this.lbCurrentTC.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
             this.lbStartTC.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbStartTC.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.lbStartTC.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            this.lbStartTC.Location = new System.Drawing.Point(3, 13);\r
+            this.lbStartTC.Location = new System.Drawing.Point(4, 16);\r
+            this.lbStartTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStartTC.Name = "lbStartTC";\r
-            this.lbStartTC.Size = new System.Drawing.Size(161, 17);\r
+            this.lbStartTC.Size = new System.Drawing.Size(214, 21);\r
             this.lbStartTC.TabIndex = 23;\r
             this.lbStartTC.Text = "00:00:00.00";\r
             // \r
             this.lbStart.BackColor = System.Drawing.Color.Transparent;\r
             this.lbStart.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbStart.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbStart.Location = new System.Drawing.Point(3, 0);\r
+            this.lbStart.Location = new System.Drawing.Point(4, 0);\r
+            this.lbStart.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStart.Name = "lbStart";\r
-            this.lbStart.Size = new System.Drawing.Size(161, 13);\r
+            this.lbStart.Size = new System.Drawing.Size(214, 16);\r
             this.lbStart.TabIndex = 19;\r
             this.lbStart.Text = "START";\r
             this.lbStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;\r
             this.lbStatus.BackColor = System.Drawing.Color.Transparent;\r
             this.lbStatus.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbStatus.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbStatus.Location = new System.Drawing.Point(170, 0);\r
+            this.lbStatus.Location = new System.Drawing.Point(226, 0);\r
+            this.lbStatus.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbStatus.Name = "lbStatus";\r
-            this.lbStatus.Size = new System.Drawing.Size(495, 13);\r
+            this.lbStatus.Size = new System.Drawing.Size(461, 16);\r
             this.lbStatus.TabIndex = 21;\r
             this.lbStatus.Text = "NO INPUT";\r
             this.lbStatus.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;\r
             this.lbDuration.BackColor = System.Drawing.Color.Transparent;\r
             this.lbDuration.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbDuration.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.lbDuration.Location = new System.Drawing.Point(671, 0);\r
+            this.lbDuration.Location = new System.Drawing.Point(695, 0);\r
+            this.lbDuration.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbDuration.Name = "lbDuration";\r
-            this.lbDuration.Size = new System.Drawing.Size(161, 13);\r
+            this.lbDuration.Size = new System.Drawing.Size(414, 16);\r
             this.lbDuration.TabIndex = 22;\r
             this.lbDuration.Text = "DURATION";\r
             this.lbDuration.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             this.lbEndTC.Dock = System.Windows.Forms.DockStyle.Top;\r
             this.lbEndTC.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.lbEndTC.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            this.lbEndTC.Location = new System.Drawing.Point(671, 13);\r
+            this.lbEndTC.Location = new System.Drawing.Point(695, 16);\r
+            this.lbEndTC.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);\r
             this.lbEndTC.Name = "lbEndTC";\r
-            this.lbEndTC.Size = new System.Drawing.Size(161, 17);\r
+            this.lbEndTC.Size = new System.Drawing.Size(414, 21);\r
             this.lbEndTC.TabIndex = 24;\r
             this.lbEndTC.Text = "00:00:00.00";\r
             this.lbEndTC.TextAlign = System.Drawing.ContentAlignment.MiddleRight;\r
             // \r
             this.controlsPanel.AutoSize = true;\r
             this.controlsPanel.ColumnCount = 2;\r
-            this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 75F));\r
-            this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));\r
+            this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 79.09502F));\r
+            this.controlsPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.90498F));\r
             this.controlsPanel.Controls.Add(this.buttonsPanel, 0, 0);\r
             this.controlsPanel.Controls.Add(this.logoPanel, 1, 0);\r
             this.controlsPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.controlsPanel.Location = new System.Drawing.Point(3, 59);\r
+            this.controlsPanel.Location = new System.Drawing.Point(4, 73);\r
+            this.controlsPanel.Margin = new System.Windows.Forms.Padding(4);\r
             this.controlsPanel.Name = "controlsPanel";\r
             this.controlsPanel.RowCount = 1;\r
             this.controlsPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());\r
-            this.controlsPanel.Size = new System.Drawing.Size(829, 59);\r
+            this.controlsPanel.Size = new System.Drawing.Size(1105, 75);\r
             this.controlsPanel.TabIndex = 21;\r
             // \r
             // buttonsPanel\r
             this.buttonsPanel.AutoSize = true;\r
             this.buttonsPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.buttonsPanel.Controls.Add(this.btnPlay);\r
+            this.buttonsPanel.Controls.Add(this.btnPause);\r
             this.buttonsPanel.Controls.Add(this.btnRewind);\r
             this.buttonsPanel.Controls.Add(this.btnStepBack);\r
             this.buttonsPanel.Controls.Add(this.btnStop);\r
             this.buttonsPanel.Location = new System.Drawing.Point(0, 0);\r
             this.buttonsPanel.Margin = new System.Windows.Forms.Padding(0);\r
             this.buttonsPanel.Name = "buttonsPanel";\r
-            this.buttonsPanel.Size = new System.Drawing.Size(360, 60);\r
+            this.buttonsPanel.Size = new System.Drawing.Size(560, 75);\r
             this.buttonsPanel.TabIndex = 20;\r
             // \r
             // btnPlay\r
             this.btnPlay.FlatAppearance.BorderSize = 0;\r
             this.btnPlay.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnPlay.Image = global::DxPlay.Properties.Resources.ic_play_arrow_black_24dp_2x;\r
-            this.btnPlay.Location = new System.Drawing.Point(3, 3);\r
+            this.btnPlay.Location = new System.Drawing.Point(4, 4);\r
+            this.btnPlay.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnPlay.Name = "btnPlay";\r
-            this.btnPlay.Size = new System.Drawing.Size(54, 54);\r
-            this.btnPlay.TabIndex = 17;\r
+            this.btnPlay.Size = new System.Drawing.Size(72, 66);\r
+            this.btnPlay.TabIndex = 23;\r
             this.btnPlay.TabStop = false;\r
             this.btnPlay.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnPlay.UseVisualStyleBackColor = false;\r
             // \r
+            // btnPause\r
+            // \r
+            this.btnPause.AutoSize = true;\r
+            this.btnPause.BackColor = System.Drawing.Color.Transparent;\r
+            this.btnPause.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.btnPause.FlatAppearance.BorderSize = 0;\r
+            this.btnPause.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btnPause.Image = global::DxPlay.Properties.Resources.ic_pause_black_24dp_2x;\r
+            this.btnPause.Location = new System.Drawing.Point(84, 4);\r
+            this.btnPause.Margin = new System.Windows.Forms.Padding(4);\r
+            this.btnPause.Name = "btnPause";\r
+            this.btnPause.Size = new System.Drawing.Size(72, 66);\r
+            this.btnPause.TabIndex = 25;\r
+            this.btnPause.TabStop = false;\r
+            this.btnPause.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
+            this.btnPause.UseVisualStyleBackColor = false;\r
+            // \r
             // btnRewind\r
             // \r
             this.btnRewind.AutoSize = true;\r
             this.btnRewind.FlatAppearance.BorderSize = 0;\r
             this.btnRewind.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnRewind.Image = ((System.Drawing.Image)(resources.GetObject("btnRewind.Image")));\r
-            this.btnRewind.Location = new System.Drawing.Point(63, 3);\r
+            this.btnRewind.Location = new System.Drawing.Point(164, 4);\r
+            this.btnRewind.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnRewind.Name = "btnRewind";\r
-            this.btnRewind.Size = new System.Drawing.Size(54, 54);\r
+            this.btnRewind.Size = new System.Drawing.Size(72, 66);\r
             this.btnRewind.TabIndex = 18;\r
             this.btnRewind.TabStop = false;\r
             this.btnRewind.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnStepBack.FlatAppearance.BorderSize = 0;\r
             this.btnStepBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStepBack.Image = global::DxPlay.Properties.Resources.baseline_skip_previous_black_24dp;\r
-            this.btnStepBack.Location = new System.Drawing.Point(123, 3);\r
+            this.btnStepBack.Location = new System.Drawing.Point(244, 4);\r
+            this.btnStepBack.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStepBack.Name = "btnStepBack";\r
-            this.btnStepBack.Size = new System.Drawing.Size(54, 54);\r
+            this.btnStepBack.Size = new System.Drawing.Size(72, 66);\r
             this.btnStepBack.TabIndex = 21;\r
             this.btnStepBack.TabStop = false;\r
             this.btnStepBack.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnStop.FlatAppearance.BorderSize = 0;\r
             this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStop.Image = global::DxPlay.Properties.Resources.ic_stop_black_24dp_2x;\r
-            this.btnStop.Location = new System.Drawing.Point(183, 3);\r
+            this.btnStop.Location = new System.Drawing.Point(324, 4);\r
+            this.btnStop.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStop.Name = "btnStop";\r
-            this.btnStop.Size = new System.Drawing.Size(54, 54);\r
+            this.btnStop.Size = new System.Drawing.Size(72, 66);\r
             this.btnStop.TabIndex = 19;\r
             this.btnStop.TabStop = false;\r
             this.btnStop.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnStepForward.FlatAppearance.BorderSize = 0;\r
             this.btnStepForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnStepForward.Image = global::DxPlay.Properties.Resources.baseline_skip_next_black_24dp;\r
-            this.btnStepForward.Location = new System.Drawing.Point(243, 3);\r
+            this.btnStepForward.Location = new System.Drawing.Point(404, 4);\r
+            this.btnStepForward.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnStepForward.Name = "btnStepForward";\r
-            this.btnStepForward.Size = new System.Drawing.Size(54, 54);\r
+            this.btnStepForward.Size = new System.Drawing.Size(72, 66);\r
             this.btnStepForward.TabIndex = 22;\r
             this.btnStepForward.TabStop = false;\r
             this.btnStepForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.btnForward.FlatAppearance.BorderSize = 0;\r
             this.btnForward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.btnForward.Image = global::DxPlay.Properties.Resources.baseline_fast_forward_black_24dp;\r
-            this.btnForward.Location = new System.Drawing.Point(303, 3);\r
+            this.btnForward.Location = new System.Drawing.Point(484, 4);\r
+            this.btnForward.Margin = new System.Windows.Forms.Padding(4);\r
             this.btnForward.Name = "btnForward";\r
-            this.btnForward.Size = new System.Drawing.Size(54, 54);\r
+            this.btnForward.Size = new System.Drawing.Size(72, 66);\r
             this.btnForward.TabIndex = 20;\r
             this.btnForward.TabStop = false;\r
             this.btnForward.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;\r
             this.logoPanel.BackgroundImage = global::DxPlay.Properties.Resources.bs_user_logo;\r
             this.logoPanel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;\r
             this.logoPanel.Dock = System.Windows.Forms.DockStyle.Fill;\r
-            this.logoPanel.Location = new System.Drawing.Point(621, 0);\r
+            this.logoPanel.Location = new System.Drawing.Point(873, 0);\r
             this.logoPanel.Margin = new System.Windows.Forms.Padding(0);\r
             this.logoPanel.Name = "logoPanel";\r
-            this.logoPanel.Size = new System.Drawing.Size(208, 60);\r
+            this.logoPanel.Size = new System.Drawing.Size(232, 75);\r
             this.logoPanel.TabIndex = 21;\r
             // \r
             // PlayerControls\r
             // \r
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);\r
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);\r
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
             this.AutoSize = true;\r
             this.Controls.Add(this.mainPanel);\r
             this.Margin = new System.Windows.Forms.Padding(0);\r
             this.Name = "PlayerControls";\r
-            this.Size = new System.Drawing.Size(835, 126);\r
+            this.Size = new System.Drawing.Size(1113, 203);\r
             this.mainPanel.ResumeLayout(false);\r
             this.mainPanel.PerformLayout();\r
             this.timecodePanel.ResumeLayout(false);\r
             this.buttonsPanel.ResumeLayout(false);\r
             this.buttonsPanel.PerformLayout();\r
             this.ResumeLayout(false);\r
-            this.PerformLayout();\r
 \r
         }\r
 \r
         private System.Windows.Forms.Panel logoPanel;\r
         private MaestroShared.Controls.NoFocusCueButton btnStepBack;\r
         private MaestroShared.Controls.NoFocusCueButton btnStepForward;\r
+        private MaestroShared.Controls.NoFocusCueButton btnPause;\r
+        //private VideoSpeedTrackbar playSpeed;\r
     }\r
 }\r
index 21cf06cf2071c75e8b7ce2ba5be94a48b6ed90a0..d6042c7e5a4623f2a4a48f007972817c91f1fadd 100644 (file)
@@ -14,6 +14,7 @@ namespace DxPlay.Controls {
         public Label EndTC { get => lbEndTC; }\r
         public Label CurrentTC { get => lbCurrentTC; }\r
         public ColorSlider TrackBar { get => trackBar; }\r
+        public NoFocusCueButton Pause { get => btnPause; }\r
         public NoFocusCueButton Play { get => btnPlay; }\r
         public NoFocusCueButton Stop { get => btnStop; }\r
         public NoFocusCueButton Rewind { get => btnRewind; }\r