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

diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs
index a760f5a3acf6028f8330c54000b91ca6e9be234a..3c899413812571063878ebc9e332a6397b3e521b 100644 (file)
--- a/client/Maestro/MaestroForm.Metadata.cs
+++ b/client/Maestro/MaestroForm.Metadata.cs
@@ -78,9 +78,7 @@ namespace Maestro {
             ArchiveMetadata form = new ArchiveMetadata(model);\r
             form.ShowDialog();\r
         }\r
-\r
         \r
-\r
         private IDTypes GetTypeOfSelectedMetadata() {\r
             IDTypes result = IDTypes.None;\r
             if (String.IsNullOrEmpty(selectedMetadata.ID))\r
@@ -90,7 +88,7 @@ namespace Maestro {
             if (match.Success) {\r
                 result = IDTypes.TrafficID;\r
             } else {\r
-                pattern = "[0-9]{7}";\r
+                pattern = "[0-9]";\r
                 match = Regex.Match(selectedMetadata.ID, pattern);\r
                 result = match.Success ? IDTypes.OctopusID : IDTypes.None;\r
             }\r

diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs
index 269b5e0a1cac78f5ccf477d17be4593bd30e53fe..8eb4f33cefcf0e054a65cf05b6baef1fe2d4f2fd 100644 (file)
--- a/client/Maestro/MaestroForm.Target.cs
+++ b/client/Maestro/MaestroForm.Target.cs
@@ -70,7 +70,7 @@ namespace Maestro {
         }\r
 \r
         private void OnInfoTextChanged(object sender, EventArgs e) {\r
-            ApplyProcessorButtonsLogic();\r
+            //ApplyProcessorButtonsLogic();\r
             ApplyMetaDataButtonLogic();\r
         }\r
 \r
@@ -84,7 +84,7 @@ namespace Maestro {
             else {\r
                 String calculatedHouseID = selectedSources[0];\r
                 foreach (String actual in selectedSources)\r
-                    if (!actual.StartsWith(calculatedHouseID))\r
+                    if (!actual.StartsWith(startingName))\r
                         buttonMetadata.Enabled = false;\r
             }\r
         }\r
@@ -186,7 +186,7 @@ namespace Maestro {
                 IDType = IDTypes.TrafficID;\r
                 return;\r
             } else {\r
-                pattern = "[0-9]{7}";\r
+                pattern = "[0-9]";\r
                 match = Regex.Match(startingName, pattern);\r
                 IDType = match.Success ? IDTypes.OctopusID : IDTypes.None;\r
             }\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 5d354e0c9a889b4ae0aa88fec75b4d283bad04a4..231f65b106f88974272f86e690173e63e13e7157 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -178,10 +178,9 @@ namespace Maestro {
                 case Metadata.IDTypes.OctopusID:\r
                     SetOctopusIDToMetadataText();\r
                     break;\r
-                case Metadata.IDTypes.None:\r
-                    //todo, itt talán kellene az, hogy nem ID\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
@@ -199,7 +198,9 @@ namespace Maestro {
             }\r
             List<Story> list = stories.ToList();\r
             if (list.Count == 1) {\r
+                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
                 textSelectedMetadata.Text = list[0].ID;\r
+                //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
                 return;\r
             }\r
             SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
@@ -216,7 +217,9 @@ namespace Maestro {
                 return;\r
             }\r
             if (list.Count == 1) {\r
+                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
                 textSelectedMetadata.Text = list[0].ID;\r
+                //octopusIDSelector.IDSelectedFromOutside(list[0].ID);\r
                 return;\r
             }\r
             SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected);\r
@@ -236,6 +239,7 @@ namespace Maestro {
                 return;\r
             }\r
             if (result.Count == 1) {\r
+                EnableArchiveMetadataButtonAndCreateMetadataModel();\r
                 textSelectedMetadata.Text = result[0].MediaID;\r
                 return;\r
             }\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index 93705fc7687bfca07d6677a9999567d8ecb949af..65a2fe9e4eee6d4eb5a0caa9e79dd7185fe7690c 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -146,9 +146,9 @@ namespace OctopusClient {
             e.Node.Checked = !e.Node.Checked;\r
         }\r
 \r
-        public void IDChangeEventCalledFromOutside(string id) {\r
-            IDChangedEvent?.Invoke(id);\r
-        }\r
+        //public void IDChangeEventCalledFromOutside(string id) {\r
+        //    IDChangedEvent?.Invoke(id);\r
+        //}\r
 \r
         private void tabControl1_Selected(object sender, TabControlEventArgs e) {\r
             treeContent.Nodes.Clear();\r
@@ -179,7 +179,6 @@ namespace OctopusClient {
             treeView.SelectedNode.BackColor = System.Drawing.Color.Gainsboro;\r
             treeView.SelectedNode.ForeColor = System.Drawing.Color.Black;\r
             previousSelectedNode = treeView.SelectedNode;\r
-            //RefreshPlaceHolderIDS(id);\r
         }\r
 \r
         private void RefreshPlaceHolderIDS(String ID) {\r
@@ -212,6 +211,18 @@ namespace OctopusClient {
             InnerAfterCheck(node);\r
         }\r
 \r
+        public void IDSelectedFromOutside(string id) {\r
+            this.id = id;\r
+            if (tabControl1.SelectedIndex == 0) {\r
+                refreshStoryFolders();\r
+                refreshRundowns();\r
+            } else {\r
+                refreshRundowns();\r
+                refreshStoryFolders();\r
+            }\r
+            //InitCheckID(treeContent.Nodes);\r
+        }\r
+\r
         private void InnerAfterCheck(TreeNode node) {\r
             string text = node.Name;\r
             checkFromCode = false;\r

diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
index fdbcc86244b075a848c4c19be0db6d6eb2ff1f2c..f4054d21f4eaa772fb36c137fa8ecd4ecdc8abf3 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs
@@ -30,6 +30,8 @@
         {\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
             this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker();\r
             this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker();\r
@@ -70,6 +72,7 @@
             this.dataGridView1.AllowUserToDeleteRows = false;\r
             this.dataGridView1.AllowUserToResizeRows = false;\r
             this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells;\r
+            this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dataGridView1.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dataGridView1.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\r
@@ -82,12 +85,24 @@
             dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
             this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\r
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\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);\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.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2;\r
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridView1.Location = new System.Drawing.Point(0, 0);\r
             this.dataGridView1.MultiSelect = false;\r
             this.dataGridView1.Name = "dataGridView1";\r
             this.dataGridView1.RowHeadersVisible = false;\r
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridView1.Size = new System.Drawing.Size(263, 217);\r
             this.dataGridView1.TabIndex = 0;\r
             this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);\r