From: Bellai Ádám Date: Wed, 4 Oct 2017 11:38:15 +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=de531fd22c65e417cb65162fb3b2e5e49818c31f;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30522 --- diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs index 661baf56..5c8a8f6a 100644 --- a/client/DxPlay/PlayerForm.Designer.cs +++ b/client/DxPlay/PlayerForm.Designer.cs @@ -38,7 +38,7 @@ namespace DxPlay { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelVideo = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.btnStop = new System.Windows.Forms.Button(); @@ -60,6 +60,9 @@ namespace DxPlay { this.ctxmSegmentActions = new System.Windows.Forms.ContextMenuStrip(this.components); this.defineOneSegmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitSegmentAtCurrentPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteSegmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.actualPositionToIntroToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.actualPositionToOutroToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); @@ -280,14 +283,14 @@ namespace DxPlay { this.dgSegments.BorderStyle = System.Windows.Forms.BorderStyle.None; 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", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgSegments.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgSegments.DefaultCellStyle = dataGridViewCellStyle1; this.dgSegments.Dock = System.Windows.Forms.DockStyle.Fill; this.dgSegments.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2; this.dgSegments.Location = new System.Drawing.Point(0, 23); @@ -314,24 +317,48 @@ namespace DxPlay { // this.ctxmSegmentActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.defineOneSegmentToolStripMenuItem, - this.splitSegmentAtCurrentPositionToolStripMenuItem}); + this.splitSegmentAtCurrentPositionToolStripMenuItem, + this.deleteSegmentToolStripMenuItem, + this.actualPositionToIntroToolStripMenuItem1, + this.actualPositionToOutroToolStripMenuItem1}); this.ctxmSegmentActions.Name = "ctxmSegmentActions"; - this.ctxmSegmentActions.Size = new System.Drawing.Size(247, 48); + this.ctxmSegmentActions.Size = new System.Drawing.Size(302, 114); // // defineOneSegmentToolStripMenuItem // this.defineOneSegmentToolStripMenuItem.Name = "defineOneSegmentToolStripMenuItem"; - this.defineOneSegmentToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.defineOneSegmentToolStripMenuItem.Size = new System.Drawing.Size(301, 22); this.defineOneSegmentToolStripMenuItem.Text = "Define one segment for movie"; this.defineOneSegmentToolStripMenuItem.Click += new System.EventHandler(this.OnDefineOneSegmentClick); // // splitSegmentAtCurrentPositionToolStripMenuItem // this.splitSegmentAtCurrentPositionToolStripMenuItem.Name = "splitSegmentAtCurrentPositionToolStripMenuItem"; - this.splitSegmentAtCurrentPositionToolStripMenuItem.Size = new System.Drawing.Size(246, 22); + this.splitSegmentAtCurrentPositionToolStripMenuItem.Size = new System.Drawing.Size(301, 22); this.splitSegmentAtCurrentPositionToolStripMenuItem.Text = "Split segment at current position"; this.splitSegmentAtCurrentPositionToolStripMenuItem.Click += new System.EventHandler(this.OnSplitSegmentAtCurrentPositionClick); // + // deleteSegmentToolStripMenuItem + // + this.deleteSegmentToolStripMenuItem.Name = "deleteSegmentToolStripMenuItem"; + this.deleteSegmentToolStripMenuItem.Size = new System.Drawing.Size(301, 22); + this.deleteSegmentToolStripMenuItem.Text = "Delete segment"; + this.deleteSegmentToolStripMenuItem.Click += new System.EventHandler(this.OnDeleteSegmentClick); + // + // actualPositionToIntroToolStripMenuItem1 + // + this.actualPositionToIntroToolStripMenuItem1.Name = "actualPositionToIntroToolStripMenuItem1"; + this.actualPositionToIntroToolStripMenuItem1.Size = new System.Drawing.Size(301, 22); + this.actualPositionToIntroToolStripMenuItem1.Text = "actualPositionToIntroToolStripMenuItem1"; + this.actualPositionToIntroToolStripMenuItem1.Click += new System.EventHandler(this.OnActualPositionToIntroToolStripMenuItem1Click); + // + // actualPositionToOutroToolStripMenuItem1 + // + this.actualPositionToOutroToolStripMenuItem1.Name = "actualPositionToOutroToolStripMenuItem1"; + this.actualPositionToOutroToolStripMenuItem1.Size = new System.Drawing.Size(301, 22); + this.actualPositionToOutroToolStripMenuItem1.Text = "actualPositionToOutroToolStripMenuItem1"; + this.actualPositionToOutroToolStripMenuItem1.Click += new System.EventHandler(this.OnActualPositionToOutroToolStripMenuItem1Click); + // // PlayerForm // this.AllowDrop = true; @@ -378,6 +405,9 @@ namespace DxPlay { private ToolStripMenuItem splitSegmentAtCurrentPositionToolStripMenuItem; private DataGridView dgSegments; private BindingSource bsSegments; + private ToolStripMenuItem deleteSegmentToolStripMenuItem; + private ToolStripMenuItem actualPositionToIntroToolStripMenuItem1; + private ToolStripMenuItem actualPositionToOutroToolStripMenuItem1; } } diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs index 90688723..6a2a24de 100644 --- a/client/DxPlay/PlayerForm.cs +++ b/client/DxPlay/PlayerForm.cs @@ -312,6 +312,26 @@ namespace DxPlay { segments.Add(segment); } + private void OnDeleteSegmentClick(object sender, EventArgs e) { + DataGridViewRow selectedRow = dgSegments.SelectedRows[0]; + for (int i = 0; i < dgSegments.Rows.Count; i++) { + DataGridViewRow actual = dgSegments.Rows[i]; + if (selectedRow.Equals(actual)) { + segments.Remove(segments[i]); + return; + } + } + + } + + private void OnActualPositionToIntroToolStripMenuItem1Click(object sender, EventArgs e) { + //todo + } + + private void OnActualPositionToOutroToolStripMenuItem1Click(object sender, EventArgs e) { + //todo + } + private void OnSplitSegmentAtCurrentPositionClick(object sender, EventArgs e) { MovieSegment segment = segments.Where(s => m_play.CurrentTC.Frames > s.TCIn.Frames && m_play.CurrentTC.Frames < s.TCOut.Frames).FirstOrDefault(); diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index f5b7787f..528a7acf 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -26,16 +26,16 @@ namespace Maestro { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupSource = new System.Windows.Forms.GroupBox(); this.dataGridSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -133,31 +133,31 @@ namespace Maestro { this.dataGridSource.BackgroundColor = System.Drawing.Color.White; this.dataGridSource.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, 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.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dataGridSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridSource.DataSource = this.bindingSource; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle12; this.dataGridSource.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridSource.Location = new System.Drawing.Point(10, 43); this.dataGridSource.Name = "dataGridSource"; this.dataGridSource.RowHeadersVisible = false; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle13; this.dataGridSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dataGridSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridSource.Size = new System.Drawing.Size(394, 304); @@ -322,7 +322,6 @@ namespace Maestro { this.tabControl1.SelectedIndex = 0; this.tabControl1.Size = new System.Drawing.Size(264, 324); this.tabControl1.TabIndex = 1; - this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); // // tpOctopus // @@ -534,14 +533,14 @@ namespace Maestro { this.dataGridJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dataGridJobs.BackgroundColor = System.Drawing.Color.White; this.dataGridJobs.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; this.dataGridJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.columnID, @@ -552,29 +551,29 @@ namespace Maestro { this.columnProgress, this.columnStatus}); this.dataGridJobs.DataSource = this.bindingSourceJobs; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle18; this.dataGridJobs.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridJobs.Location = new System.Drawing.Point(10, 23); this.dataGridJobs.Name = "dataGridJobs"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; this.dataGridJobs.RowHeadersVisible = false; - dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle20; this.dataGridJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dataGridJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridJobs.Size = new System.Drawing.Size(1002, 105); @@ -585,8 +584,8 @@ namespace Maestro { // this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnID.DataPropertyName = "ID"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnID.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnID.DefaultCellStyle = dataGridViewCellStyle15; this.columnID.Frozen = true; this.columnID.HeaderText = "ID"; this.columnID.Name = "columnID"; @@ -628,10 +627,10 @@ namespace Maestro { // this.columnProgress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.columnProgress.DataPropertyName = "Progress"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle6.NullValue = null; - this.columnProgress.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle16.NullValue = null; + this.columnProgress.DefaultCellStyle = dataGridViewCellStyle16; this.columnProgress.HeaderText = "Progress"; this.columnProgress.Name = "columnProgress"; this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -642,8 +641,8 @@ namespace Maestro { // this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnStatus.DataPropertyName = "Status"; - dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnStatus.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnStatus.DefaultCellStyle = dataGridViewCellStyle17; this.columnStatus.HeaderText = "Status"; this.columnStatus.Name = "columnStatus"; this.columnStatus.Width = 66; diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 80ff6e43..ec86e3a4 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -189,13 +189,21 @@ namespace Maestro { return; } string query = selectedRows[0].Cells[1].Value as string; - int separatorPosition = query.IndexOf("-") < 0 ? query.IndexOf("_") : query.IndexOf("-"); + int separatorPosition = query.IndexOf("-");//< 0 ? query.IndexOf("_") : query.IndexOf("-"); + int separatorPosition2 = query.IndexOf("_"); + int realseparatorPosition = 0; + if (separatorPosition < 0) + realseparatorPosition = separatorPosition2; + else if (separatorPosition2 < 0) + realseparatorPosition = separatorPosition; + else + realseparatorPosition = separatorPosition < separatorPosition2 ? separatorPosition : separatorPosition2; int dotPosition = query.IndexOf("."); - if (separatorPosition > 0) { - startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition); + if (realseparatorPosition > 0) { + startingName = realseparatorPosition < 0 ? query : query.Substring(0, realseparatorPosition); } else { if (dotPosition < 0) - startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition); + startingName = realseparatorPosition < 0 ? query : query.Substring(0, realseparatorPosition); else startingName = query.Substring(0, dotPosition); } diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 7886e035..2bf54e9a 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -150,16 +150,6 @@ namespace Maestro { InitializeComponents(); } - private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { - //TabControl actual = sender as TabControl; - //if (actual.SelectedIndex == 1) - // if (!traffiTabcInitialized) { - // trafficIDSelector.RefreshDataGridSource(); - // traffiTabcInitialized = true; - // } - } - - private void textBox1_KeyUp(object sender, KeyEventArgs e) { if (e.KeyCode != Keys.Return) return; @@ -178,9 +168,9 @@ namespace Maestro { case Metadata.IDTypes.OctopusID: SetOctopusIDToMetadataText(); break; - //case Metadata.IDTypes.None: - // MessageBox.Show(this, StringResources.NINCS_TALALAT); - // break; + //case Metadata.IDTypes.None: + // MessageBox.Show(this, StringResources.NINCS_TALALAT); + // break; } } @@ -231,7 +221,14 @@ namespace Maestro { private void SetTrafficIDToMetadataText() { TrafficAPI api = trafficIDSelector.trafficAPI; Cursor.Current = Cursors.WaitCursor; - List result = api.SearchBroadcast(startingName, null, null, true); + List result = null; + if (startingName.StartsWith("M")) + result = api.SearchBroadcast(startingName, null, null, true); + else if (startingName.StartsWith("P")) + result = api.SearchPromotional(startingName); + //todo ha az adatbázis felvan töltve normális adatokkal, megnézni hogy tényleg R betüvel kezdődnek-e a reklámok + else if (startingName.StartsWith("R")) + result = api.SearchAdvertisement(startingName); ProcessMamResults(result); }