From 5093f15bafe28756c37b36e28a9a545e40bba64e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bellai=20=C3=81d=C3=A1m?= Date: Mon, 2 Oct 2017 11:15:05 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30496 --- client/Maestro/MaestroForm.Metadata.cs | 4 +--- client/Maestro/MaestroForm.Target.cs | 6 +++--- client/Maestro/MaestroForm.cs | 12 ++++++++---- client/OctopusClient/OctopusIDSelector.cs | 19 +++++++++++++++---- .../TrafficIDSelector.Designer.cs | 15 +++++++++++++++ 5 files changed, 42 insertions(+), 14 deletions(-) diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index a760f5a3..3c899413 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -78,9 +78,7 @@ namespace Maestro { ArchiveMetadata form = new ArchiveMetadata(model); form.ShowDialog(); } - - private IDTypes GetTypeOfSelectedMetadata() { IDTypes result = IDTypes.None; if (String.IsNullOrEmpty(selectedMetadata.ID)) @@ -90,7 +88,7 @@ namespace Maestro { if (match.Success) { result = IDTypes.TrafficID; } else { - pattern = "[0-9]{7}"; + pattern = "[0-9]"; match = Regex.Match(selectedMetadata.ID, pattern); result = match.Success ? IDTypes.OctopusID : IDTypes.None; } diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index 269b5e0a..8eb4f33c 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -70,7 +70,7 @@ namespace Maestro { } private void OnInfoTextChanged(object sender, EventArgs e) { - ApplyProcessorButtonsLogic(); + //ApplyProcessorButtonsLogic(); ApplyMetaDataButtonLogic(); } @@ -84,7 +84,7 @@ namespace Maestro { else { String calculatedHouseID = selectedSources[0]; foreach (String actual in selectedSources) - if (!actual.StartsWith(calculatedHouseID)) + if (!actual.StartsWith(startingName)) buttonMetadata.Enabled = false; } } @@ -186,7 +186,7 @@ namespace Maestro { IDType = IDTypes.TrafficID; return; } else { - pattern = "[0-9]{7}"; + pattern = "[0-9]"; match = Regex.Match(startingName, pattern); IDType = match.Success ? IDTypes.OctopusID : IDTypes.None; } diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 5d354e0c..231f65b1 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -178,10 +178,9 @@ namespace Maestro { case Metadata.IDTypes.OctopusID: SetOctopusIDToMetadataText(); break; - case Metadata.IDTypes.None: - //todo, itt talán kellene az, hogy nem ID - MessageBox.Show(this, StringResources.NINCS_TALALAT); - break; + //case Metadata.IDTypes.None: + // MessageBox.Show(this, StringResources.NINCS_TALALAT); + // break; } } @@ -199,7 +198,9 @@ namespace Maestro { } List list = stories.ToList(); if (list.Count == 1) { + EnableArchiveMetadataButtonAndCreateMetadataModel(); textSelectedMetadata.Text = list[0].ID; + //octopusIDSelector.IDSelectedFromOutside(list[0].ID); return; } SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected); @@ -216,7 +217,9 @@ namespace Maestro { return; } if (list.Count == 1) { + EnableArchiveMetadataButtonAndCreateMetadataModel(); textSelectedMetadata.Text = list[0].ID; + //octopusIDSelector.IDSelectedFromOutside(list[0].ID); return; } SearchMessageBox box = new SearchMessageBox(list, octopusMetadataSelected); @@ -236,6 +239,7 @@ namespace Maestro { return; } if (result.Count == 1) { + EnableArchiveMetadataButtonAndCreateMetadataModel(); textSelectedMetadata.Text = result[0].MediaID; return; } diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index 93705fc7..65a2fe9e 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -146,9 +146,9 @@ namespace OctopusClient { e.Node.Checked = !e.Node.Checked; } - public void IDChangeEventCalledFromOutside(string id) { - IDChangedEvent?.Invoke(id); - } + //public void IDChangeEventCalledFromOutside(string id) { + // IDChangedEvent?.Invoke(id); + //} private void tabControl1_Selected(object sender, TabControlEventArgs e) { treeContent.Nodes.Clear(); @@ -179,7 +179,6 @@ namespace OctopusClient { treeView.SelectedNode.BackColor = System.Drawing.Color.Gainsboro; treeView.SelectedNode.ForeColor = System.Drawing.Color.Black; previousSelectedNode = treeView.SelectedNode; - //RefreshPlaceHolderIDS(id); } private void RefreshPlaceHolderIDS(String ID) { @@ -212,6 +211,18 @@ namespace OctopusClient { InnerAfterCheck(node); } + public void IDSelectedFromOutside(string id) { + this.id = id; + if (tabControl1.SelectedIndex == 0) { + refreshStoryFolders(); + refreshRundowns(); + } else { + refreshRundowns(); + refreshStoryFolders(); + } + //InitCheckID(treeContent.Nodes); + } + private void InnerAfterCheck(TreeNode node) { string text = node.Name; checkFromCode = false; diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs index fdbcc862..f4054d21 100644 --- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs +++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs @@ -30,6 +30,8 @@ { 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(); this.trafficAPIBindingSource = new System.Windows.Forms.BindingSource(this.components); this.backgroundWorker1 = new System.ComponentModel.BackgroundWorker(); this.backgroundWorker2 = new System.ComponentModel.BackgroundWorker(); @@ -70,6 +72,7 @@ this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToResizeRows = false; this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; + this.dataGridView1.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dataGridView1.BackgroundColor = System.Drawing.Color.White; this.dataGridView1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridView1.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; @@ -82,12 +85,24 @@ dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + 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.dataGridView1.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridView1.Location = new System.Drawing.Point(0, 0); this.dataGridView1.MultiSelect = false; this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.RowHeadersVisible = false; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle3; + this.dataGridView1.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView1.Size = new System.Drawing.Size(263, 217); this.dataGridView1.TabIndex = 0; this.dataGridView1.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick); -- 2.54.0