From: Vásáry Dániel Date: Wed, 4 Dec 2019 13:08:35 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=fff631df3e3a748668fc30f00c9489def84f5769;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31659 --- diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs index dd35ccd7..6902b5da 100644 --- a/client/DxPlay/PlayerForm.Designer.cs +++ b/client/DxPlay/PlayerForm.Designer.cs @@ -4,8 +4,6 @@ using System.Windows.Forms; namespace DxPlay { partial class PlayerForm : Form { - private Panel pVideo; - /// /// Clean up any resources being used. /// @@ -23,14 +21,21 @@ namespace DxPlay { } #region Windows Form Designer generated code + /// /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PlayerForm)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = + new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = + new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = + new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = + new System.ComponentModel.ComponentResourceManager(typeof(PlayerForm)); this.pVideo = new System.Windows.Forms.Panel(); this.mainSplit = new System.Windows.Forms.SplitContainer(); this.panelPlayer = new System.Windows.Forms.Panel(); @@ -62,7 +67,10 @@ namespace DxPlay { this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.menuRedefineSegments = new DxPlay.Controls.BindableToolStripMenuItem(); this.playerControls = new DxPlay.Controls.PlayerControls(); - ((System.ComponentModel.ISupportInitialize)(this.mainSplit)).BeginInit(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.btnSave = new System.Windows.Forms.Button(); + this.btnCancel = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize) (this.mainSplit)).BeginInit(); this.mainSplit.Panel1.SuspendLayout(); this.mainSplit.Panel2.SuspendLayout(); this.mainSplit.SuspendLayout(); @@ -71,11 +79,12 @@ namespace DxPlay { this.tabEditor.SuspendLayout(); this.tpMetadata.SuspendLayout(); this.tpSegments.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgSegments)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsSegments)).BeginInit(); + ((System.ComponentModel.ISupportInitialize) (this.dgSegments)).BeginInit(); + ((System.ComponentModel.ISupportInitialize) (this.bsSegments)).BeginInit(); this.segmentActions.SuspendLayout(); this.pMetadataDisplay.SuspendLayout(); this.mainMenu.SuspendLayout(); + this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // pVideo @@ -85,7 +94,7 @@ namespace DxPlay { this.pVideo.Dock = System.Windows.Forms.DockStyle.Fill; this.pVideo.Location = new System.Drawing.Point(0, 0); this.pVideo.Name = "pVideo"; - this.pVideo.Size = new System.Drawing.Size(478, 414); + this.pVideo.Size = new System.Drawing.Size(478, 331); this.pVideo.TabIndex = 0; this.pVideo.TabStop = true; this.pVideo.SizeChanged += new System.EventHandler(this.panel1_SizeChanged); @@ -108,7 +117,7 @@ namespace DxPlay { this.mainSplit.Panel2.Controls.Add(this.tableLayoutPanel1); this.mainSplit.Panel2.Controls.Add(this.pMetadataDisplay); this.mainSplit.Panel2MinSize = 300; - this.mainSplit.Size = new System.Drawing.Size(784, 416); + this.mainSplit.Size = new System.Drawing.Size(784, 333); this.mainSplit.SplitterDistance = 480; this.mainSplit.TabIndex = 20; // @@ -118,14 +127,15 @@ namespace DxPlay { this.panelPlayer.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPlayer.Location = new System.Drawing.Point(0, 0); this.panelPlayer.Name = "panelPlayer"; - this.panelPlayer.Size = new System.Drawing.Size(478, 414); + this.panelPlayer.Size = new System.Drawing.Size(478, 331); this.panelPlayer.TabIndex = 0; // // 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.Percent, 100F)); this.tableLayoutPanel1.Controls.Add(this.tabEditor, 1, 0); this.tableLayoutPanel1.Controls.Add(this.btnToggleSegmentEditor, 0, 0); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; @@ -133,8 +143,9 @@ namespace DxPlay { this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); 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(298, 351); + this.tableLayoutPanel1.RowStyles.Add( + new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(298, 268); this.tableLayoutPanel1.TabIndex = 4; // // tabEditor @@ -143,27 +154,29 @@ namespace DxPlay { this.tabEditor.Controls.Add(this.tpMetadata); this.tabEditor.Controls.Add(this.tpSegments); this.tabEditor.Dock = System.Windows.Forms.DockStyle.Fill; - this.tabEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.tabEditor.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, + System.Drawing.GraphicsUnit.Point, ((byte) (238))); this.tabEditor.ImageList = this.imagesTabEdit; - this.tabEditor.Location = new System.Drawing.Point(23, 4); + this.tabEditor.Location = new System.Drawing.Point(28, 4); this.tabEditor.Margin = new System.Windows.Forms.Padding(0, 4, 4, 4); this.tabEditor.Multiline = true; this.tabEditor.Name = "tabEditor"; this.tabEditor.Padding = new System.Drawing.Point(10, 5); this.tabEditor.SelectedIndex = 0; - this.tabEditor.Size = new System.Drawing.Size(271, 343); + this.tabEditor.Size = new System.Drawing.Size(266, 260); this.tabEditor.TabIndex = 2; // // tpMetadata // this.tpMetadata.BackColor = System.Drawing.Color.Transparent; this.tpMetadata.Controls.Add(this.trafficBrowser); - this.tpMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.tpMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); this.tpMetadata.ImageIndex = 0; this.tpMetadata.Location = new System.Drawing.Point(4, 4); this.tpMetadata.Name = "tpMetadata"; this.tpMetadata.Padding = new System.Windows.Forms.Padding(3); - this.tpMetadata.Size = new System.Drawing.Size(263, 304); + this.tpMetadata.Size = new System.Drawing.Size(258, 221); this.tpMetadata.TabIndex = 0; this.tpMetadata.Text = "Metadata"; // @@ -175,19 +188,21 @@ namespace DxPlay { this.trafficBrowser.Location = new System.Drawing.Point(3, 3); this.trafficBrowser.Margin = new System.Windows.Forms.Padding(0); this.trafficBrowser.Name = "trafficBrowser"; - this.trafficBrowser.Size = new System.Drawing.Size(257, 298); + this.trafficBrowser.Parameters = null; + this.trafficBrowser.Size = new System.Drawing.Size(252, 215); this.trafficBrowser.TabIndex = 0; // // tpSegments // this.tpSegments.Controls.Add(this.dgSegments); this.tpSegments.Controls.Add(this.segmentActions); - this.tpSegments.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.tpSegments.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); this.tpSegments.ImageIndex = 1; this.tpSegments.Location = new System.Drawing.Point(4, 4); this.tpSegments.Name = "tpSegments"; this.tpSegments.Padding = new System.Windows.Forms.Padding(3); - this.tpSegments.Size = new System.Drawing.Size(263, 304); + this.tpSegments.Size = new System.Drawing.Size(317, 325); this.tpSegments.TabIndex = 1; this.tpSegments.Text = "Segments"; this.tpSegments.UseVisualStyleBackColor = true; @@ -200,32 +215,61 @@ namespace DxPlay { this.dgSegments.AutoGenerateColumns = false; this.dgSegments.BackgroundColor = System.Drawing.Color.White; this.dgSegments.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.dgSegments.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgSegments.DataSource = this.bsSegments; dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgSegments.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgSegments.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + this.dgSegments.ColumnHeadersHeightSizeMode = + System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgSegments.DataSource = this.bsSegments; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.FromArgb(((int) (((byte) (0)))), + ((int) (((byte) (0)))), ((int) (((byte) (0))))); + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int) (((byte) (224)))), + ((int) (((byte) (224)))), ((int) (((byte) (224))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgSegments.DefaultCellStyle = dataGridViewCellStyle2; this.dgSegments.Dock = System.Windows.Forms.DockStyle.Fill; this.dgSegments.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; - this.dgSegments.Location = new System.Drawing.Point(3, 28); + this.dgSegments.Location = new System.Drawing.Point(3, 33); this.dgSegments.MultiSelect = false; this.dgSegments.Name = "dgSegments"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); + dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgSegments.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dgSegments.RowHeadersVisible = false; this.dgSegments.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgSegments.Size = new System.Drawing.Size(257, 273); + this.dgSegments.Size = new System.Drawing.Size(311, 289); this.dgSegments.TabIndex = 1; - this.dgSegments.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.OnSegmentsCellBeginEdit); - this.dgSegments.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellContentClick); - this.dgSegments.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.OnSegmentsCellMouseDoubleClick); - this.dgSegments.CellMouseEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellMouseEnter); - this.dgSegments.CellMouseLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellMouseLeave); - this.dgSegments.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnSegmentsCellPainting); - this.dgSegments.ColumnAdded += new System.Windows.Forms.DataGridViewColumnEventHandler(this.OnSegmentsColumnAdded); + this.dgSegments.CellBeginEdit += + new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.OnSegmentsCellBeginEdit); + this.dgSegments.CellContentClick += + new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellContentClick); + this.dgSegments.CellMouseDoubleClick += + new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.OnSegmentsCellMouseDoubleClick); + this.dgSegments.CellMouseEnter += + new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellMouseEnter); + this.dgSegments.CellMouseLeave += + new System.Windows.Forms.DataGridViewCellEventHandler(this.OnSegmentsCellMouseLeave); + this.dgSegments.CellPainting += + new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnSegmentsCellPainting); + this.dgSegments.ColumnAdded += + new System.Windows.Forms.DataGridViewColumnEventHandler(this.OnSegmentsColumnAdded); this.dgSegments.MouseClick += new System.Windows.Forms.MouseEventHandler(this.OnSegmentsMouseClick); // // segmentActions @@ -233,88 +277,86 @@ namespace DxPlay { this.segmentActions.AutoSize = false; this.segmentActions.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.segmentActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.tbDefineSegment, - this.toolStripSeparator2, - this.tbPositionAsTCIn, - this.tbSplitSegment, - this.tbPositionAsTCOut, - this.toolStripSeparator1, - this.tbDeleteSegment}); + this.tbDefineSegment, this.toolStripSeparator2, this.tbPositionAsTCIn, this.tbSplitSegment, + this.tbPositionAsTCOut, this.toolStripSeparator1, this.tbDeleteSegment + }); this.segmentActions.Location = new System.Drawing.Point(3, 3); this.segmentActions.Name = "segmentActions"; this.segmentActions.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.segmentActions.Size = new System.Drawing.Size(257, 25); + this.segmentActions.Size = new System.Drawing.Size(311, 30); this.segmentActions.TabIndex = 0; this.segmentActions.Text = "toolStrip1"; // // tbDefineSegment // this.tbDefineSegment.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tbDefineSegment.Image = ((System.Drawing.Image)(resources.GetObject("tbDefineSegment.Image"))); + this.tbDefineSegment.Image = ((System.Drawing.Image) (resources.GetObject("tbDefineSegment.Image"))); this.tbDefineSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbDefineSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbDefineSegment.Name = "tbDefineSegment"; - this.tbDefineSegment.Size = new System.Drawing.Size(23, 22); + this.tbDefineSegment.Size = new System.Drawing.Size(23, 27); this.tbDefineSegment.Text = "toolStripButton5"; this.tbDefineSegment.Click += new System.EventHandler(this.OnDefineOneSegmentClick); // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 30); // // tbPositionAsTCIn // this.tbPositionAsTCIn.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tbPositionAsTCIn.Image = ((System.Drawing.Image)(resources.GetObject("tbPositionAsTCIn.Image"))); + this.tbPositionAsTCIn.Image = ((System.Drawing.Image) (resources.GetObject("tbPositionAsTCIn.Image"))); this.tbPositionAsTCIn.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbPositionAsTCIn.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbPositionAsTCIn.Name = "tbPositionAsTCIn"; - this.tbPositionAsTCIn.Size = new System.Drawing.Size(23, 22); + this.tbPositionAsTCIn.Size = new System.Drawing.Size(23, 27); this.tbPositionAsTCIn.Text = "toolStripButton1"; this.tbPositionAsTCIn.Click += new System.EventHandler(this.OnActualPositionToTCInToolStripMenuItem1Click); // // tbSplitSegment // this.tbSplitSegment.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tbSplitSegment.Image = ((System.Drawing.Image)(resources.GetObject("tbSplitSegment.Image"))); + this.tbSplitSegment.Image = ((System.Drawing.Image) (resources.GetObject("tbSplitSegment.Image"))); this.tbSplitSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbSplitSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbSplitSegment.Name = "tbSplitSegment"; - this.tbSplitSegment.Size = new System.Drawing.Size(23, 22); + this.tbSplitSegment.Size = new System.Drawing.Size(23, 27); this.tbSplitSegment.Text = "toolStripButton4"; this.tbSplitSegment.Click += new System.EventHandler(this.OnSplitSegmentAtCurrentPositionClick); // // tbPositionAsTCOut // this.tbPositionAsTCOut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tbPositionAsTCOut.Image = ((System.Drawing.Image)(resources.GetObject("tbPositionAsTCOut.Image"))); + this.tbPositionAsTCOut.Image = ((System.Drawing.Image) (resources.GetObject("tbPositionAsTCOut.Image"))); this.tbPositionAsTCOut.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbPositionAsTCOut.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbPositionAsTCOut.Name = "tbPositionAsTCOut"; - this.tbPositionAsTCOut.Size = new System.Drawing.Size(23, 22); + this.tbPositionAsTCOut.Size = new System.Drawing.Size(23, 27); this.tbPositionAsTCOut.Text = "toolStripButton2"; - this.tbPositionAsTCOut.Click += new System.EventHandler(this.OnActualPositionToTCOutToolStripMenuItem1Click); + this.tbPositionAsTCOut.Click += + new System.EventHandler(this.OnActualPositionToTCOutToolStripMenuItem1Click); // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 30); // // tbDeleteSegment // this.tbDeleteSegment.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tbDeleteSegment.Image = ((System.Drawing.Image)(resources.GetObject("tbDeleteSegment.Image"))); + this.tbDeleteSegment.Image = ((System.Drawing.Image) (resources.GetObject("tbDeleteSegment.Image"))); this.tbDeleteSegment.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.tbDeleteSegment.ImageTransparentColor = System.Drawing.Color.Magenta; this.tbDeleteSegment.Name = "tbDeleteSegment"; - this.tbDeleteSegment.Size = new System.Drawing.Size(23, 22); + this.tbDeleteSegment.Size = new System.Drawing.Size(23, 27); this.tbDeleteSegment.Text = "toolStripButton3"; this.tbDeleteSegment.Click += new System.EventHandler(this.OnDeleteSegmentClick); // // imagesTabEdit // - this.imagesTabEdit.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imagesTabEdit.ImageStream"))); + this.imagesTabEdit.ImageStream = + ((System.Windows.Forms.ImageListStreamer) (resources.GetObject("imagesTabEdit.ImageStream"))); this.imagesTabEdit.TransparentColor = System.Drawing.Color.Transparent; this.imagesTabEdit.Images.SetKeyName(0, "round_publish_black_24dp.png"); this.imagesTabEdit.Images.SetKeyName(1, "ic_playlist_add_check_black_24dp_1x.png"); @@ -324,11 +366,12 @@ namespace DxPlay { this.btnToggleSegmentEditor.BackColor = System.Drawing.Color.White; this.btnToggleSegmentEditor.FlatAppearance.BorderSize = 0; this.btnToggleSegmentEditor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnToggleSegmentEditor.Image = ((System.Drawing.Image)(resources.GetObject("btnToggleSegmentEditor.Image"))); + this.btnToggleSegmentEditor.Image = + ((System.Drawing.Image) (resources.GetObject("btnToggleSegmentEditor.Image"))); this.btnToggleSegmentEditor.Location = new System.Drawing.Point(0, 4); this.btnToggleSegmentEditor.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.btnToggleSegmentEditor.Name = "btnToggleSegmentEditor"; - this.btnToggleSegmentEditor.Size = new System.Drawing.Size(23, 63); + this.btnToggleSegmentEditor.Size = new System.Drawing.Size(28, 77); this.btnToggleSegmentEditor.TabIndex = 0; this.btnToggleSegmentEditor.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; this.btnToggleSegmentEditor.UseVisualStyleBackColor = false; @@ -338,13 +381,14 @@ namespace DxPlay { // this.pMetadataDisplay.AutoSize = true; this.pMetadataDisplay.ColumnCount = 2; - this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.pMetadataDisplay.ColumnStyles.Add( + new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.pMetadataDisplay.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.pMetadataDisplay.Controls.Add(this.btnApprove, 1, 1); this.pMetadataDisplay.Controls.Add(this.labelSelectedMetadata, 0, 0); this.pMetadataDisplay.Controls.Add(this.txtSelectedID, 0, 1); this.pMetadataDisplay.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pMetadataDisplay.Location = new System.Drawing.Point(0, 351); + this.pMetadataDisplay.Location = new System.Drawing.Point(0, 268); this.pMetadataDisplay.Margin = new System.Windows.Forms.Padding(0); this.pMetadataDisplay.Name = "pMetadataDisplay"; this.pMetadataDisplay.RowCount = 2; @@ -360,8 +404,9 @@ namespace DxPlay { this.btnApprove.BackColor = System.Drawing.Color.White; this.btnApprove.FlatAppearance.BorderSize = 0; this.btnApprove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.btnApprove.Image = ((System.Drawing.Image)(resources.GetObject("btnApprove.Image"))); + this.btnApprove.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Bold, + System.Drawing.GraphicsUnit.Point, ((byte) (238))); + this.btnApprove.Image = ((System.Drawing.Image) (resources.GetObject("btnApprove.Image"))); this.btnApprove.Location = new System.Drawing.Point(196, 29); this.btnApprove.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0); this.btnApprove.Name = "btnApprove"; @@ -377,7 +422,8 @@ namespace DxPlay { this.labelSelectedMetadata.AutoSize = true; this.labelSelectedMetadata.BackColor = System.Drawing.Color.Transparent; this.labelSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill; - this.labelSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.labelSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, + System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (238))); this.labelSelectedMetadata.ForeColor = System.Drawing.SystemColors.ActiveCaption; this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0); this.labelSelectedMetadata.Name = "labelSelectedMetadata"; @@ -391,7 +437,8 @@ namespace DxPlay { this.txtSelectedID.BackColor = System.Drawing.SystemColors.ActiveCaption; this.txtSelectedID.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSelectedID.Dock = System.Windows.Forms.DockStyle.Fill; - this.txtSelectedID.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.txtSelectedID.Font = new System.Drawing.Font("Microsoft Sans Serif", 16F, + System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte) (238))); this.txtSelectedID.Location = new System.Drawing.Point(3, 28); this.txtSelectedID.Name = "txtSelectedID"; this.txtSelectedID.Size = new System.Drawing.Size(190, 32); @@ -399,8 +446,7 @@ namespace DxPlay { // // mainMenu // - this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.fileToolStripMenuItem}); + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {this.fileToolStripMenuItem}); this.mainMenu.Location = new System.Drawing.Point(0, 0); this.mainMenu.Name = "mainMenu"; this.mainMenu.Size = new System.Drawing.Size(784, 24); @@ -409,11 +455,8 @@ namespace DxPlay { // // fileToolStripMenuItem // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.menuOpenFile, - this.menuApprove, - this.toolStripSeparator3, - this.menuRedefineSegments}); + this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] + {this.menuOpenFile, this.menuApprove, this.toolStripSeparator3, this.menuRedefineSegments}); this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); this.fileToolStripMenuItem.Text = "File"; @@ -421,7 +464,8 @@ namespace DxPlay { // menuOpenFile // this.menuOpenFile.Name = "menuOpenFile"; - this.menuOpenFile.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.menuOpenFile.ShortcutKeys = + ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); this.menuOpenFile.Size = new System.Drawing.Size(215, 22); this.menuOpenFile.Text = "Open file"; this.menuOpenFile.Click += new System.EventHandler(this.menuOpenFile_Click); @@ -429,7 +473,8 @@ namespace DxPlay { // menuApprove // this.menuApprove.Name = "menuApprove"; - this.menuApprove.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.menuApprove.ShortcutKeys = + ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); this.menuApprove.Size = new System.Drawing.Size(215, 22); this.menuApprove.Text = "Approve"; this.menuApprove.Click += new System.EventHandler(this.OnApprove); @@ -442,7 +487,8 @@ namespace DxPlay { // menuRedefineSegments // this.menuRedefineSegments.Name = "menuRedefineSegments"; - this.menuRedefineSegments.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); + this.menuRedefineSegments.ShortcutKeys = + ((System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R))); this.menuRedefineSegments.Size = new System.Drawing.Size(215, 22); this.menuRedefineSegments.Text = "Redefine segments"; this.menuRedefineSegments.Click += new System.EventHandler(this.OnRedefineSegments); @@ -453,24 +499,55 @@ namespace DxPlay { this.playerControls.BackColor = System.Drawing.Color.Transparent; this.playerControls.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.playerControls.Dock = System.Windows.Forms.DockStyle.Bottom; - this.playerControls.Location = new System.Drawing.Point(0, 440); + this.playerControls.Location = new System.Drawing.Point(0, 357); this.playerControls.Margin = new System.Windows.Forms.Padding(0); this.playerControls.Name = "playerControls"; - this.playerControls.Size = new System.Drawing.Size(784, 121); + this.playerControls.Size = new System.Drawing.Size(784, 170); this.playerControls.TabIndex = 22; // + // flowLayoutPanel1 + // + this.flowLayoutPanel1.AutoSize = true; + this.flowLayoutPanel1.Controls.Add(this.btnSave); + this.flowLayoutPanel1.Controls.Add(this.btnCancel); + this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 527); + this.flowLayoutPanel1.Name = "flowLayoutPanel1"; + this.flowLayoutPanel1.RightToLeft = System.Windows.Forms.RightToLeft.Yes; + this.flowLayoutPanel1.Size = new System.Drawing.Size(784, 34); + this.flowLayoutPanel1.TabIndex = 23; + // + // btnSave + // + this.btnSave.Location = new System.Drawing.Point(691, 3); + this.btnSave.Name = "btnSave"; + this.btnSave.Size = new System.Drawing.Size(90, 28); + this.btnSave.TabIndex = 0; + this.btnSave.Text = "Save"; + this.btnSave.UseVisualStyleBackColor = true; + // + // btnCancel + // + this.btnCancel.Location = new System.Drawing.Point(595, 3); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(90, 28); + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "Cancel"; + this.btnCancel.UseVisualStyleBackColor = true; + // // PlayerForm // this.AllowDrop = true; - this.AutoScaleBaseSize = new System.Drawing.Size(5, 13); + this.AutoScaleBaseSize = new System.Drawing.Size(6, 16); this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(784, 561); this.Controls.Add(this.mainSplit); this.Controls.Add(this.mainMenu); this.Controls.Add(this.playerControls); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.Controls.Add(this.flowLayoutPanel1); + this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon"))); this.KeyPreview = true; - this.MinimumSize = new System.Drawing.Size(640, 480); + this.MinimumSize = new System.Drawing.Size(768, 591); this.Name = "PlayerForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "MediaCube Player"; @@ -485,57 +562,63 @@ namespace DxPlay { this.mainSplit.Panel1.ResumeLayout(false); this.mainSplit.Panel2.ResumeLayout(false); this.mainSplit.Panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.mainSplit)).EndInit(); + ((System.ComponentModel.ISupportInitialize) (this.mainSplit)).EndInit(); this.mainSplit.ResumeLayout(false); this.panelPlayer.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false); this.tabEditor.ResumeLayout(false); this.tpMetadata.ResumeLayout(false); this.tpSegments.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgSegments)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsSegments)).EndInit(); + ((System.ComponentModel.ISupportInitialize) (this.dgSegments)).EndInit(); + ((System.ComponentModel.ISupportInitialize) (this.bsSegments)).EndInit(); this.segmentActions.ResumeLayout(false); this.segmentActions.PerformLayout(); this.pMetadataDisplay.ResumeLayout(false); this.pMetadataDisplay.PerformLayout(); this.mainMenu.ResumeLayout(false); this.mainMenu.PerformLayout(); + this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); - } + #endregion - private SplitContainer mainSplit; - private Panel panelPlayer; + private System.ComponentModel.IContainer components; - private DataGridView dgSegments; - private BindingSource bsSegments; - private MenuStrip mainMenu; - private ToolStripMenuItem fileToolStripMenuItem; private DxPlay.Controls.BindableToolStripMenuItem menuOpenFile; private DxPlay.Controls.BindableToolStripMenuItem menuApprove; - private Controls.PlayerControls playerControls; - private TabControl tabEditor; - private TabPage tpMetadata; - private TabPage tpSegments; - private ToolStrip segmentActions; - private ToolStripButton tbPositionAsTCIn; - private ToolStripButton tbPositionAsTCOut; - private ToolStripButton tbDeleteSegment; - private ToolStripButton tbSplitSegment; - private ToolStripButton tbDefineSegment; - private ImageList imagesTabEdit; private TrafficClient.TrafficIDSelector trafficBrowser; - private ToolStripSeparator toolStripSeparator2; - private ToolStripSeparator toolStripSeparator1; - private TableLayoutPanel tableLayoutPanel1; - private NoFocusCueButton btnToggleSegmentEditor; - private TableLayoutPanel pMetadataDisplay; - private NoFocusCueButton btnApprove; - private Label labelSelectedMetadata; - private TextBox txtSelectedID; - private ToolStripSeparator toolStripSeparator3; private DxPlay.Controls.BindableToolStripMenuItem menuRedefineSegments; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnSave; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.TextBox txtSelectedID; + private System.Windows.Forms.Label labelSelectedMetadata; + private MaestroShared.Controls.NoFocusCueButton btnApprove; + private System.Windows.Forms.TableLayoutPanel pMetadataDisplay; + private MaestroShared.Controls.NoFocusCueButton btnToggleSegmentEditor; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ImageList imagesTabEdit; + private System.Windows.Forms.ToolStripButton tbDefineSegment; + private System.Windows.Forms.ToolStripButton tbSplitSegment; + private System.Windows.Forms.ToolStripButton tbDeleteSegment; + private System.Windows.Forms.ToolStripButton tbPositionAsTCOut; + private System.Windows.Forms.ToolStripButton tbPositionAsTCIn; + private System.Windows.Forms.ToolStrip segmentActions; + private System.Windows.Forms.TabPage tpSegments; + private System.Windows.Forms.TabPage tpMetadata; + private System.Windows.Forms.TabControl tabEditor; + private DxPlay.Controls.PlayerControls playerControls; + private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; + private System.Windows.Forms.MenuStrip mainMenu; + private System.Windows.Forms.BindingSource bsSegments; + private System.Windows.Forms.DataGridView dgSegments; + private System.Windows.Forms.Panel panelPlayer; + private System.Windows.Forms.SplitContainer mainSplit; + private System.Windows.Forms.Panel pVideo; } } diff --git a/client/DxPlay/PlayerForm.resx b/client/DxPlay/PlayerForm.resx index 7a8247ef..91538d64 100644 --- a/client/DxPlay/PlayerForm.resx +++ b/client/DxPlay/PlayerForm.resx @@ -173,7 +173,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABo - CAAAAk1TRnQBSQFMAgEBAgEAASABAgEgAQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATgBAgE4AQIBGAEAARgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABYAMAARgDAAEBAQABCAYAAQkYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 98dee561..15697f5f 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -60,6 +60,8 @@ namespace TrafficClient { return parameters; } set { + if (value == null) + return; parameters = value; var server = parameters.Configuration?.Server; if (server != null && server.Address != null)