git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/DxPlay/PlayerForm.Designer.cs b/client/DxPlay/PlayerForm.Designer.cs
index 661baf5651a643f03fd58ded6e97aeff7bdca2ea..5c8a8f6ae88e727196392b93888e94e56fe6b334 100644 (file)
--- a/client/DxPlay/PlayerForm.Designer.cs
+++ b/client/DxPlay/PlayerForm.Designer.cs
@@ -38,7 +38,7 @@ namespace DxPlay {
         /// </summary>\r
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.panelVideo = new System.Windows.Forms.Panel();\r
             this.panel2 = new System.Windows.Forms.Panel();\r
             this.btnStop = new System.Windows.Forms.Button();\r
@@ -60,6 +60,9 @@ namespace DxPlay {
             this.ctxmSegmentActions = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.defineOneSegmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
             this.splitSegmentAtCurrentPositionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.deleteSegmentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.actualPositionToIntroToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();\r
+            this.actualPositionToOutroToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();\r
             this.panel2.SuspendLayout();\r
             this.panel3.SuspendLayout();\r
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();\r
@@ -280,14 +283,14 @@ namespace DxPlay {
             this.dgSegments.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgSegments.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgSegments.DataSource = this.bsSegments;\r
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgSegments.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgSegments.DefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgSegments.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgSegments.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnF2;\r
             this.dgSegments.Location = new System.Drawing.Point(0, 23);\r
@@ -314,24 +317,48 @@ namespace DxPlay {
             // \r
             this.ctxmSegmentActions.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {\r
             this.defineOneSegmentToolStripMenuItem,\r
-            this.splitSegmentAtCurrentPositionToolStripMenuItem});\r
+            this.splitSegmentAtCurrentPositionToolStripMenuItem,\r
+            this.deleteSegmentToolStripMenuItem,\r
+            this.actualPositionToIntroToolStripMenuItem1,\r
+            this.actualPositionToOutroToolStripMenuItem1});\r
             this.ctxmSegmentActions.Name = "ctxmSegmentActions";\r
-            this.ctxmSegmentActions.Size = new System.Drawing.Size(247, 48);\r
+            this.ctxmSegmentActions.Size = new System.Drawing.Size(302, 114);\r
             // \r
             // defineOneSegmentToolStripMenuItem\r
             // \r
             this.defineOneSegmentToolStripMenuItem.Name = "defineOneSegmentToolStripMenuItem";\r
-            this.defineOneSegmentToolStripMenuItem.Size = new System.Drawing.Size(246, 22);\r
+            this.defineOneSegmentToolStripMenuItem.Size = new System.Drawing.Size(301, 22);\r
             this.defineOneSegmentToolStripMenuItem.Text = "Define one segment for movie";\r
             this.defineOneSegmentToolStripMenuItem.Click += new System.EventHandler(this.OnDefineOneSegmentClick);\r
             // \r
             // splitSegmentAtCurrentPositionToolStripMenuItem\r
             // \r
             this.splitSegmentAtCurrentPositionToolStripMenuItem.Name = "splitSegmentAtCurrentPositionToolStripMenuItem";\r
-            this.splitSegmentAtCurrentPositionToolStripMenuItem.Size = new System.Drawing.Size(246, 22);\r
+            this.splitSegmentAtCurrentPositionToolStripMenuItem.Size = new System.Drawing.Size(301, 22);\r
             this.splitSegmentAtCurrentPositionToolStripMenuItem.Text = "Split segment at current position";\r
             this.splitSegmentAtCurrentPositionToolStripMenuItem.Click += new System.EventHandler(this.OnSplitSegmentAtCurrentPositionClick);\r
             // \r
+            // deleteSegmentToolStripMenuItem\r
+            // \r
+            this.deleteSegmentToolStripMenuItem.Name = "deleteSegmentToolStripMenuItem";\r
+            this.deleteSegmentToolStripMenuItem.Size = new System.Drawing.Size(301, 22);\r
+            this.deleteSegmentToolStripMenuItem.Text = "Delete segment";\r
+            this.deleteSegmentToolStripMenuItem.Click += new System.EventHandler(this.OnDeleteSegmentClick);\r
+            // \r
+            // actualPositionToIntroToolStripMenuItem1\r
+            // \r
+            this.actualPositionToIntroToolStripMenuItem1.Name = "actualPositionToIntroToolStripMenuItem1";\r
+            this.actualPositionToIntroToolStripMenuItem1.Size = new System.Drawing.Size(301, 22);\r
+            this.actualPositionToIntroToolStripMenuItem1.Text = "actualPositionToIntroToolStripMenuItem1";\r
+            this.actualPositionToIntroToolStripMenuItem1.Click += new System.EventHandler(this.OnActualPositionToIntroToolStripMenuItem1Click);\r
+            // \r
+            // actualPositionToOutroToolStripMenuItem1\r
+            // \r
+            this.actualPositionToOutroToolStripMenuItem1.Name = "actualPositionToOutroToolStripMenuItem1";\r
+            this.actualPositionToOutroToolStripMenuItem1.Size = new System.Drawing.Size(301, 22);\r
+            this.actualPositionToOutroToolStripMenuItem1.Text = "actualPositionToOutroToolStripMenuItem1";\r
+            this.actualPositionToOutroToolStripMenuItem1.Click += new System.EventHandler(this.OnActualPositionToOutroToolStripMenuItem1Click);\r
+            // \r
             // PlayerForm\r
             // \r
             this.AllowDrop = true;\r
@@ -378,6 +405,9 @@ namespace DxPlay {
         private ToolStripMenuItem splitSegmentAtCurrentPositionToolStripMenuItem;\r
         private DataGridView dgSegments;\r
         private BindingSource bsSegments;\r
+        private ToolStripMenuItem deleteSegmentToolStripMenuItem;\r
+        private ToolStripMenuItem actualPositionToIntroToolStripMenuItem1;\r
+        private ToolStripMenuItem actualPositionToOutroToolStripMenuItem1;\r
     }\r
 }\r
 \r

diff --git a/client/DxPlay/PlayerForm.cs b/client/DxPlay/PlayerForm.cs
index 9068872327483aa20a9238ebbf2558061764e4aa..6a2a24dee58de90738fd67e492aeaad3b2ac0f5d 100644 (file)
--- a/client/DxPlay/PlayerForm.cs
+++ b/client/DxPlay/PlayerForm.cs
@@ -312,6 +312,26 @@ namespace DxPlay {
             segments.Add(segment);\r
         }\r
 \r
+        private void OnDeleteSegmentClick(object sender, EventArgs e) {\r
+            DataGridViewRow selectedRow = dgSegments.SelectedRows[0];\r
+            for (int i = 0; i < dgSegments.Rows.Count; i++) {\r
+                DataGridViewRow actual = dgSegments.Rows[i];\r
+                if (selectedRow.Equals(actual)) {\r
+                    segments.Remove(segments[i]);\r
+                    return;\r
+                }\r
+            }\r
+\r
+        }\r
+\r
+        private void OnActualPositionToIntroToolStripMenuItem1Click(object sender, EventArgs e) {\r
+            //todo\r
+        }\r
+\r
+        private void OnActualPositionToOutroToolStripMenuItem1Click(object sender, EventArgs e) {\r
+            //todo\r
+        }\r
+\r
         private void OnSplitSegmentAtCurrentPositionClick(object sender, EventArgs e) {\r
 \r
             MovieSegment segment = segments.Where(s => m_play.CurrentTC.Frames > s.TCIn.Frames && m_play.CurrentTC.Frames < s.TCOut.Frames).FirstOrDefault();\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index f5b7787fd854e1d1c9b2623857e5fe8a5f742872..528a7acf1863772cf7f59c1be7e5c765c487b6fe 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -26,16 +26,16 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dataGridSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -133,31 +133,31 @@ namespace Maestro {
             this.dataGridSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dataGridSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;\r
             this.dataGridSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridSource.DataSource = this.bindingSource;\r
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle2;\r
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle12;\r
             this.dataGridSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridSource.Location = new System.Drawing.Point(10, 43);\r
             this.dataGridSource.Name = "dataGridSource";\r
             this.dataGridSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle13;\r
             this.dataGridSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridSource.Size = new System.Drawing.Size(394, 304);\r
@@ -322,7 +322,6 @@ namespace Maestro {
             this.tabControl1.SelectedIndex = 0;\r
             this.tabControl1.Size = new System.Drawing.Size(264, 324);\r
             this.tabControl1.TabIndex = 1;\r
-            this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);\r
             // \r
             // tpOctopus\r
             // \r
@@ -534,14 +533,14 @@ namespace Maestro {
             this.dataGridJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dataGridJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;\r
             this.dataGridJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnID,\r
@@ -552,29 +551,29 @@ namespace Maestro {
             this.columnProgress,\r
             this.columnStatus});\r
             this.dataGridJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle8;\r
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle18.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle18.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle18;\r
             this.dataGridJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridJobs.Location = new System.Drawing.Point(10, 23);\r
             this.dataGridJobs.Name = "dataGridJobs";\r
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;\r
+            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle19;\r
             this.dataGridJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
+            dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle20;\r
             this.dataGridJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridJobs.Size = new System.Drawing.Size(1002, 105);\r
@@ -585,8 +584,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle5;\r
+            dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnID.DefaultCellStyle = dataGridViewCellStyle15;\r
             this.columnID.Frozen = true;\r
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
@@ -628,10 +627,10 @@ namespace Maestro {
             // \r
             this.columnProgress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;\r
             this.columnProgress.DataPropertyName = "Progress";\r
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
-            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle6.NullValue = null;\r
-            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle6;\r
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
+            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle16.NullValue = null;\r
+            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle16;\r
             this.columnProgress.HeaderText = "Progress";\r
             this.columnProgress.Name = "columnProgress";\r
             this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
@@ -642,8 +641,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\r
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle7;\r
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle17;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
             this.columnStatus.Width = 66;\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index 80ff6e434a69be9b027cdf40548f26a6770e69d7..ec86e3a42509d237ac08ec5690221b6bd98f88f3 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -189,13 +189,21 @@ namespace Maestro {
                     return;\r
                 }\r
             string query = selectedRows[0].Cells[1].Value as string;\r
-            int separatorPosition = query.IndexOf("-") < 0 ? query.IndexOf("_") : query.IndexOf("-");\r
+            int separatorPosition = query.IndexOf("-");//< 0 ? query.IndexOf("_") : query.IndexOf("-");\r
+            int separatorPosition2 = query.IndexOf("_");\r
+            int realseparatorPosition = 0;\r
+            if (separatorPosition < 0)\r
+                realseparatorPosition = separatorPosition2;\r
+            else if (separatorPosition2 < 0)\r
+                realseparatorPosition = separatorPosition;\r
+            else\r
+                realseparatorPosition = separatorPosition < separatorPosition2 ? separatorPosition : separatorPosition2;\r
             int dotPosition = query.IndexOf(".");\r
-            if (separatorPosition > 0) {\r
-                startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition);\r
+            if (realseparatorPosition > 0) {\r
+                startingName = realseparatorPosition < 0 ? query : query.Substring(0, realseparatorPosition);\r
             } else {\r
                 if (dotPosition < 0)\r
-                    startingName = separatorPosition < 0 ? query : query.Substring(0, separatorPosition);\r
+                    startingName = realseparatorPosition < 0 ? query : query.Substring(0, realseparatorPosition);\r
                 else\r
                     startingName = query.Substring(0, dotPosition);\r
             }\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 7886e035696826fdb86f80b77b9e44d49215da50..2bf54e9a9a67b954121d7a83887822b75bbb3db2 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -150,16 +150,6 @@ namespace Maestro {
             InitializeComponents();\r
         }\r
 \r
-        private void tabControl1_SelectedIndexChanged(object sender, EventArgs e) {\r
-            //TabControl actual = sender as TabControl;\r
-            //if (actual.SelectedIndex == 1) \r
-            //    if (!traffiTabcInitialized) {\r
-            //        trafficIDSelector.RefreshDataGridSource();\r
-            //        traffiTabcInitialized = true;\r
-            //    }\r
-        }\r
-\r
-\r
         private void textBox1_KeyUp(object sender, KeyEventArgs e) {\r
             if (e.KeyCode != Keys.Return)\r
                 return;\r
@@ -178,9 +168,9 @@ namespace Maestro {
                 case Metadata.IDTypes.OctopusID:\r
                     SetOctopusIDToMetadataText();\r
                     break;\r
-                //case Metadata.IDTypes.None:\r
-                //    MessageBox.Show(this, StringResources.NINCS_TALALAT);\r
-                //    break;\r
+                    //case Metadata.IDTypes.None:\r
+                    //    MessageBox.Show(this, StringResources.NINCS_TALALAT);\r
+                    //    break;\r
             }\r
         }\r
 \r
@@ -231,7 +221,14 @@ namespace Maestro {
         private void SetTrafficIDToMetadataText() {\r
             TrafficAPI api = trafficIDSelector.trafficAPI;\r
             Cursor.Current = Cursors.WaitCursor;\r
-            List<MamResultWrapper> result = api.SearchBroadcast(startingName, null, null, true);\r
+            List<MamResultWrapper> result = null;\r
+            if (startingName.StartsWith("M"))\r
+                result = api.SearchBroadcast(startingName, null, null, true);\r
+            else if (startingName.StartsWith("P"))\r
+                result = api.SearchPromotional(startingName);\r
+            //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\r
+            else if (startingName.StartsWith("R"))\r
+                result = api.SearchAdvertisement(startingName);\r
             ProcessMamResults(result);\r
         }\r
 \r