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

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index d861d1c167ec5bfae02c008abb0a5859d0b22dad..c00ab5c14b8ea1a9be62ea1e967f83ffe73cd122 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -26,21 +26,21 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\r
             this.components = new System.ComponentModel.Container();\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
+            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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MaestroForm));\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = 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 dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = 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 dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = 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 dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();\r
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dgSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -50,7 +50,7 @@ namespace Maestro {
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();\r
             this.textSelectedSource = new System.Windows.Forms.TextBox();\r
             this.label1 = new System.Windows.Forms.Label();\r
-            this.buttonMetadata = new System.Windows.Forms.Button();\r
+            this.btnLookupBySource = new System.Windows.Forms.Button();\r
             this.ctxmActions = new System.Windows.Forms.ContextMenuStrip(this.components);\r
             this.ctxiDefineSegments = new System.Windows.Forms.ToolStripMenuItem();\r
             this.ctxiModifyArchiveMetadata = new System.Windows.Forms.ToolStripMenuItem();\r
@@ -63,6 +63,7 @@ namespace Maestro {
             this.tpTraffic = new System.Windows.Forms.TabPage();\r
             this.trafficIDSelector = new TrafficClient.TrafficIDSelector();\r
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();\r
+            this.btnLookupMetadata = new System.Windows.Forms.Button();\r
             this.mActions = new Maestro.MenuButton();\r
             this.labelSelectedMetadata = new System.Windows.Forms.Label();\r
             this.textSelectedMetadata = new System.Windows.Forms.TextBox();\r
@@ -159,32 +160,32 @@ namespace Maestro {
             this.dgSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dgSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dgSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
-            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle15.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;\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.dgSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dgSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgSource.DataSource = this.bindingSource;\r
-            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle16.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle16.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgSource.DefaultCellStyle = dataGridViewCellStyle16;\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.dgSource.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.dgSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgSource.EnableHeadersVisualStyles = false;\r
             this.dgSource.Location = new System.Drawing.Point(10, 47);\r
             this.dgSource.Name = "dgSource";\r
             this.dgSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle17;\r
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
             this.dgSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgSource.Size = new System.Drawing.Size(347, 352);\r
@@ -248,7 +249,7 @@ namespace Maestro {
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
             this.tableLayoutPanel2.Controls.Add(this.textSelectedSource, 0, 1);\r
             this.tableLayoutPanel2.Controls.Add(this.label1, 0, 0);\r
-            this.tableLayoutPanel2.Controls.Add(this.buttonMetadata, 1, 1);\r
+            this.tableLayoutPanel2.Controls.Add(this.btnLookupBySource, 1, 1);\r
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;\r
             this.tableLayoutPanel2.Location = new System.Drawing.Point(10, 399);\r
             this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);\r
@@ -268,7 +269,7 @@ namespace Maestro {
             this.textSelectedSource.Location = new System.Drawing.Point(3, 28);\r
             this.textSelectedSource.Name = "textSelectedSource";\r
             this.textSelectedSource.ReadOnly = true;\r
-            this.textSelectedSource.Size = new System.Drawing.Size(309, 26);\r
+            this.textSelectedSource.Size = new System.Drawing.Size(305, 26);\r
             this.textSelectedSource.TabIndex = 10;\r
             // \r
             // label1\r
@@ -284,21 +285,22 @@ namespace Maestro {
             this.label1.TabIndex = 13;\r
             this.label1.Text = "Selected source";\r
             // \r
-            // buttonMetadata\r
-            // \r
-            this.buttonMetadata.BackColor = System.Drawing.SystemColors.ButtonFace;\r
-            this.buttonMetadata.Cursor = System.Windows.Forms.Cursors.Hand;\r
-            this.buttonMetadata.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.buttonMetadata.Enabled = false;\r
-            this.buttonMetadata.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
-            this.buttonMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);\r
-            this.buttonMetadata.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x;\r
-            this.buttonMetadata.Location = new System.Drawing.Point(318, 28);\r
-            this.buttonMetadata.Name = "buttonMetadata";\r
-            this.buttonMetadata.Size = new System.Drawing.Size(26, 26);\r
-            this.buttonMetadata.TabIndex = 14;\r
-            this.buttonMetadata.UseVisualStyleBackColor = false;\r
-            this.buttonMetadata.Click += new System.EventHandler(this.buttonMetadata_Click);\r
+            // btnLookupBySource\r
+            // \r
+            this.btnLookupBySource.BackColor = System.Drawing.Color.Transparent;\r
+            this.btnLookupBySource.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.btnLookupBySource.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.btnLookupBySource.Enabled = false;\r
+            this.btnLookupBySource.FlatAppearance.BorderSize = 0;\r
+            this.btnLookupBySource.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btnLookupBySource.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);\r
+            this.btnLookupBySource.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x;\r
+            this.btnLookupBySource.Location = new System.Drawing.Point(314, 28);\r
+            this.btnLookupBySource.Name = "btnLookupBySource";\r
+            this.btnLookupBySource.Size = new System.Drawing.Size(30, 26);\r
+            this.btnLookupBySource.TabIndex = 14;\r
+            this.btnLookupBySource.UseVisualStyleBackColor = false;\r
+            this.btnLookupBySource.Click += new System.EventHandler(this.OnLookupBySource);\r
             // \r
             // ctxmActions\r
             // \r
@@ -439,6 +441,7 @@ namespace Maestro {
             this.tableLayoutPanel1.ColumnCount = 2;\r
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));\r
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());\r
+            this.tableLayoutPanel1.Controls.Add(this.btnLookupMetadata, 0, 1);\r
             this.tableLayoutPanel1.Controls.Add(this.mActions, 0, 0);\r
             this.tableLayoutPanel1.Controls.Add(this.labelSelectedMetadata, 0, 0);\r
             this.tableLayoutPanel1.Controls.Add(this.textSelectedMetadata, 0, 1);\r
@@ -452,30 +455,48 @@ namespace Maestro {
             this.tableLayoutPanel1.Size = new System.Drawing.Size(286, 62);\r
             this.tableLayoutPanel1.TabIndex = 4;\r
             // \r
+            // btnLookupMetadata\r
+            // \r
+            this.btnLookupMetadata.BackColor = System.Drawing.Color.Transparent;\r
+            this.btnLookupMetadata.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.btnLookupMetadata.Dock = System.Windows.Forms.DockStyle.Top;\r
+            this.btnLookupMetadata.Enabled = false;\r
+            this.btnLookupMetadata.FlatAppearance.BorderSize = 0;\r
+            this.btnLookupMetadata.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
+            this.btnLookupMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F);\r
+            this.btnLookupMetadata.Image = global::Maestro.Properties.Resources.ic_search_black_24dp_1x;\r
+            this.btnLookupMetadata.Location = new System.Drawing.Point(253, 29);\r
+            this.btnLookupMetadata.Name = "btnLookupMetadata";\r
+            this.btnLookupMetadata.Size = new System.Drawing.Size(30, 26);\r
+            this.btnLookupMetadata.TabIndex = 16;\r
+            this.btnLookupMetadata.UseVisualStyleBackColor = false;\r
+            // \r
             // mActions\r
             // \r
-            this.mActions.BackColor = System.Drawing.SystemColors.Control;\r
-            this.mActions.Dock = System.Windows.Forms.DockStyle.Top;\r
-            this.mActions.FlatStyle = System.Windows.Forms.FlatStyle.Popup;\r
+            this.mActions.BackColor = System.Drawing.Color.Transparent;\r
+            this.mActions.Cursor = System.Windows.Forms.Cursors.Hand;\r
+            this.mActions.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.mActions.FlatAppearance.BorderSize = 0;\r
+            this.mActions.FlatStyle = System.Windows.Forms.FlatStyle.Flat;\r
             this.mActions.Font = new System.Drawing.Font("Microsoft Sans Serif", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.mActions.Location = new System.Drawing.Point(196, 0);\r
-            this.mActions.Margin = new System.Windows.Forms.Padding(0);\r
+            this.mActions.Image = global::Maestro.Properties.Resources.ic_playlist_add_check_black_24dp_1x;\r
+            this.mActions.Location = new System.Drawing.Point(253, 0);\r
+            this.mActions.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);\r
             this.mActions.Menu = this.ctxmActions;\r
             this.mActions.Name = "mActions";\r
-            this.mActions.Size = new System.Drawing.Size(90, 26);\r
+            this.mActions.Size = new System.Drawing.Size(30, 26);\r
             this.mActions.TabIndex = 15;\r
-            this.mActions.Text = "Actions";\r
             this.mActions.UseVisualStyleBackColor = false;\r
             // \r
             // labelSelectedMetadata\r
             // \r
             this.labelSelectedMetadata.AutoSize = true;\r
-            this.labelSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Left;\r
+            this.labelSelectedMetadata.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.labelSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.labelSelectedMetadata.Location = new System.Drawing.Point(3, 0);\r
             this.labelSelectedMetadata.Name = "labelSelectedMetadata";\r
             this.labelSelectedMetadata.Padding = new System.Windows.Forms.Padding(0, 5, 0, 5);\r
-            this.labelSelectedMetadata.Size = new System.Drawing.Size(110, 26);\r
+            this.labelSelectedMetadata.Size = new System.Drawing.Size(244, 26);\r
             this.labelSelectedMetadata.TabIndex = 13;\r
             this.labelSelectedMetadata.Text = "Selected metadata";\r
             // \r
@@ -487,7 +508,7 @@ namespace Maestro {
             this.textSelectedMetadata.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.textSelectedMetadata.Location = new System.Drawing.Point(3, 29);\r
             this.textSelectedMetadata.Name = "textSelectedMetadata";\r
-            this.textSelectedMetadata.Size = new System.Drawing.Size(190, 26);\r
+            this.textSelectedMetadata.Size = new System.Drawing.Size(244, 26);\r
             this.textSelectedMetadata.TabIndex = 12;\r
             this.textSelectedMetadata.TextChanged += new System.EventHandler(this.OnMetadataIDChanged);\r
             // \r
@@ -614,14 +635,14 @@ namespace Maestro {
             this.dgJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dgJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dgJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle18.BackColor = System.Drawing.SystemColors.Control;\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.WindowText;\r
-            dataGridViewCellStyle18.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle18.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;\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.dgJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\r
             this.dgJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnLabel,\r
@@ -634,32 +655,32 @@ namespace Maestro {
             this.columnOutput,\r
             this.columnKillDate});\r
             this.dgJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle21.NullValue = null;\r
-            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle21.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle21;\r
+            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle7.NullValue = null;\r
+            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgJobs.DefaultCellStyle = dataGridViewCellStyle7;\r
             this.dgJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgJobs.EnableHeadersVisualStyles = false;\r
             this.dgJobs.GridColor = System.Drawing.Color.White;\r
             this.dgJobs.Location = new System.Drawing.Point(3, 3);\r
             this.dgJobs.Name = "dgJobs";\r
-            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle22;\r
+            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;\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.WindowText;\r
+            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;\r
             this.dgJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle23;\r
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgJobs.RowsDefaultCellStyle = dataGridViewCellStyle9;\r
             this.dgJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgJobs.Size = new System.Drawing.Size(988, 92);\r
@@ -679,8 +700,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\r
-            dataGridViewCellStyle19.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnID.DefaultCellStyle = dataGridViewCellStyle19;\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
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
             this.columnID.Width = 44;\r
@@ -697,8 +718,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\r
-            dataGridViewCellStyle20.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle20;\r
+            dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.columnStatus.DefaultCellStyle = dataGridViewCellStyle6;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
             this.columnStatus.Width = 66;\r
@@ -763,14 +784,14 @@ namespace Maestro {
             this.dgMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dgMessages.BackgroundColor = System.Drawing.Color.White;\r
             this.dgMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle24.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle24.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle24.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle24.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle24;\r
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;\r
             this.dgMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dgMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.dataGridViewTextBoxColumn1,\r
@@ -778,15 +799,15 @@ namespace Maestro {
             this.timeDataGridViewTextBoxColumn,\r
             this.messageDataGridViewTextBoxColumn});\r
             this.dgMessages.DataSource = this.systemMessageBindingSource;\r
-            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle26.NullValue = null;\r
-            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.Color.Red;\r
-            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle26;\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.Color.Red;\r
+            dataGridViewCellStyle12.NullValue = null;\r
+            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Red;\r
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dgMessages.DefaultCellStyle = dataGridViewCellStyle12;\r
             this.dgMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dgMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dgMessages.EnableHeadersVisualStyles = false;\r
@@ -794,17 +815,17 @@ namespace Maestro {
             this.dgMessages.Location = new System.Drawing.Point(3, 3);\r
             this.dgMessages.Name = "dgMessages";\r
             this.dgMessages.ReadOnly = true;\r
-            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle27.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle27;\r
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dgMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle13;\r
             this.dgMessages.RowHeadersVisible = false;\r
-            dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle28;\r
+            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dgMessages.RowsDefaultCellStyle = dataGridViewCellStyle14;\r
             this.dgMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dgMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dgMessages.Size = new System.Drawing.Size(988, 92);\r
@@ -823,8 +844,8 @@ namespace Maestro {
             // \r
             this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;\r
             this.dataGridViewTextBoxColumn2.DataPropertyName = "Message";\r
-            dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle25;\r
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle11;\r
             this.dataGridViewTextBoxColumn2.HeaderText = "Üzenet";\r
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";\r
             this.dataGridViewTextBoxColumn2.ReadOnly = true;\r
@@ -942,7 +963,7 @@ namespace Maestro {
         private System.Windows.Forms.Label label1;\r
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;\r
         private TrafficClient.TrafficIDSelector trafficIDSelector;\r
-        private System.Windows.Forms.Button buttonMetadata;\r
+        private System.Windows.Forms.Button btnLookupBySource;\r
         private System.Windows.Forms.TabControl tabSystem;\r
         private System.Windows.Forms.TabPage tabPage1;\r
         private System.Windows.Forms.TabPage tabPage2;\r
@@ -965,6 +986,7 @@ namespace Maestro {
         private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn;\r
         private System.Windows.Forms.PictureBox picClearFilter;\r
         private MenuButton mActions;\r
+        private System.Windows.Forms.Button btnLookupMetadata;\r
     }\r
 }\r
 \r

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index db8149da059988fdc8faff47e3ca1c2b95ec66c9..992234aa31b7a941cdda967f1c5177a3620a32ab 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -18,6 +18,7 @@ namespace Maestro {
         private const string REGEXP_TRAFFICMATERIALID = "^M{1}[0-9]{6}[A-Z]{1}$";\r
         private const string REGEXP_TRAFFICADID = "^R{1}[0-9]{6}[A-Z]{1}$";\r
         private const string REGEXP_TRAFFICPROMOID = "^P{1}[0-9]{6}[A-Z]{1}$";\r
+        private const string REGEXP_OCTOPUSSTORYID = "^[0-9]+$";\r
         private const string REGEXP_OCTOPUSPLACEHOLDERID = "^[0-9]+_[0-9]+$";\r
         private const string REGEXP_OCTOPUSPLACEHOLDERVERSIONEDID = "^[0-9]+_[0-9]+-[0-9]{3}$";\r
 \r
@@ -117,6 +118,10 @@ namespace Maestro {
             if (match.Success)\r
                 return MetadataType.TrafficAD;\r
 \r
+            match = Regex.Match(id, REGEXP_OCTOPUSSTORYID);\r
+            if (match.Success)\r
+                return MetadataType.OctopusStory;\r
+\r
             match = Regex.Match(id, REGEXP_OCTOPUSPLACEHOLDERID);\r
             if (match.Success)\r
                 return MetadataType.OctopusPlaceHolder;\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index e3e4c60d5af8a2819d29842fe7db15f11f0980c2..7b794b980212792e4bf4e481ec00cd52cb29fe87 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -214,7 +214,7 @@ namespace Maestro {
             UpdateCheckStates(dgSource.SelectedRows);\r
         }\r
 \r
-        private void buttonMetadata_Click(object sender, EventArgs e) {\r
+        private void OnLookupBySource(object sender, EventArgs e) {\r
             Cursor.Current = Cursors.WaitCursor;\r
             MetadataType metadataType = GuessMetadataType(SelectedSource?.Prefix);\r
             switch (metadataType) {\r
@@ -303,7 +303,7 @@ namespace Maestro {
 \r
         private void UpdateLookupMetadataEnabled() {\r
             MetadataType metadataType = GuessMetadataType(SelectedSource?.Prefix);\r
-            buttonMetadata.Enabled = metadataType != MetadataType.MediaCube && metadataType != MetadataType.None;\r
+            btnLookupBySource.Enabled = metadataType != MetadataType.MediaCube && metadataType != MetadataType.None;\r
         }\r
 \r
         private void picClearFilter_Click(object sender, EventArgs e) {\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 6ec946e7c24f7f030f33b4fb7a9d5e97f2c853c1..eaaddd52397ff14328337ebbcad58d48757f9768 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -239,6 +239,5 @@ namespace Maestro {
             var actualRow = dgJobs.SelectedRows[0];\r
             dgJobs.Rows.Remove(actualRow);\r
         }\r
-\r
     }\r
 }\r