From: Bellai Ádám Date: Thu, 12 Oct 2017 11:21:45 +0000 (+0000) Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=b2c2599665d5d8367d3df049acf0234f3f31c26b;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30606 --- diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 1b4434f8..732c967d 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -43,11 +43,13 @@ namespace Maestro { this.groupSource = new System.Windows.Forms.GroupBox(); this.dataGridSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); - this.txtSorceFilter = new System.Windows.Forms.TextBox(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.textSelectedSource = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.buttonMetadata = new System.Windows.Forms.Button(); + this.panel2 = new System.Windows.Forms.Panel(); + this.buttonDeleteFilter = new System.Windows.Forms.Button(); + this.txtSorceFilter = new System.Windows.Forms.TextBox(); this.ctxmActions = new System.Windows.Forms.ContextMenuStrip(this.components); this.ctxiDefineSegments = new System.Windows.Forms.ToolStripMenuItem(); this.ctxiModifyArchiveMetadata = new System.Windows.Forms.ToolStripMenuItem(); @@ -91,6 +93,7 @@ namespace Maestro { ((System.ComponentModel.ISupportInitialize)(this.dataGridSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); this.tableLayoutPanel2.SuspendLayout(); + this.panel2.SuspendLayout(); this.ctxmActions.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); @@ -126,8 +129,8 @@ namespace Maestro { // this.groupSource.BackColor = System.Drawing.Color.Transparent; this.groupSource.Controls.Add(this.dataGridSource); - this.groupSource.Controls.Add(this.txtSorceFilter); this.groupSource.Controls.Add(this.tableLayoutPanel2); + this.groupSource.Controls.Add(this.panel2); this.groupSource.Dock = System.Windows.Forms.DockStyle.Fill; this.groupSource.Location = new System.Drawing.Point(0, 0); this.groupSource.Name = "groupSource"; @@ -188,16 +191,6 @@ namespace Maestro { this.dataGridSource.SelectionChanged += new System.EventHandler(this.sourceGridView_SelectionChanged); this.dataGridSource.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridSource_KeyDown); // - // txtSorceFilter - // - this.txtSorceFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtSorceFilter.Dock = System.Windows.Forms.DockStyle.Top; - this.txtSorceFilter.Location = new System.Drawing.Point(10, 23); - this.txtSorceFilter.Name = "txtSorceFilter"; - this.txtSorceFilter.Size = new System.Drawing.Size(394, 20); - this.txtSorceFilter.TabIndex = 13; - this.txtSorceFilter.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyUp); - // // tableLayoutPanel2 // this.tableLayoutPanel2.ColumnCount = 2; @@ -256,6 +249,37 @@ namespace Maestro { this.buttonMetadata.UseVisualStyleBackColor = false; this.buttonMetadata.Click += new System.EventHandler(this.buttonMetadata_Click); // + // panel2 + // + this.panel2.Controls.Add(this.buttonDeleteFilter); + this.panel2.Controls.Add(this.txtSorceFilter); + this.panel2.Dock = System.Windows.Forms.DockStyle.Top; + this.panel2.Location = new System.Drawing.Point(10, 23); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(394, 20); + this.panel2.TabIndex = 14; + // + // buttonDeleteFilter + // + this.buttonDeleteFilter.Dock = System.Windows.Forms.DockStyle.Right; + this.buttonDeleteFilter.Location = new System.Drawing.Point(374, 0); + this.buttonDeleteFilter.Name = "buttonDeleteFilter"; + this.buttonDeleteFilter.Size = new System.Drawing.Size(20, 20); + this.buttonDeleteFilter.TabIndex = 3; + this.buttonDeleteFilter.Text = "button1"; + this.buttonDeleteFilter.UseVisualStyleBackColor = true; + this.buttonDeleteFilter.Click += new System.EventHandler(this.buttonDeleteFilter_Click); + // + // txtSorceFilter + // + this.txtSorceFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtSorceFilter.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtSorceFilter.Location = new System.Drawing.Point(0, 0); + this.txtSorceFilter.Name = "txtSorceFilter"; + this.txtSorceFilter.Size = new System.Drawing.Size(394, 20); + this.txtSorceFilter.TabIndex = 13; + this.txtSorceFilter.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBox1_KeyUp); + // // ctxmActions // this.ctxmActions.ImageScalingSize = new System.Drawing.Size(19, 19); @@ -715,8 +739,8 @@ namespace Maestro { dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window; dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.Transparent; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.Color.Transparent; dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dataGridMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -727,10 +751,10 @@ namespace Maestro { this.dataGridMessages.DataSource = this.systemMessageBindingSource; dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + dataGridViewCellStyle12.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Transparent; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.ControlText; dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridMessages.DefaultCellStyle = dataGridViewCellStyle12; this.dataGridMessages.Dock = System.Windows.Forms.DockStyle.Fill; @@ -741,14 +765,16 @@ namespace Maestro { dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; this.dataGridMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; this.dataGridMessages.RowHeadersVisible = false; dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); this.dataGridMessages.RowsDefaultCellStyle = dataGridViewCellStyle14; + this.dataGridMessages.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.Transparent; this.dataGridMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); + this.dataGridMessages.RowTemplate.DefaultCellStyle.SelectionBackColor = System.Drawing.Color.Transparent; this.dataGridMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridMessages.Size = new System.Drawing.Size(988, 92); this.dataGridMessages.TabIndex = 0; @@ -770,10 +796,11 @@ namespace Maestro { // // messageDataGridViewTextBoxColumn // + this.messageDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.messageDataGridViewTextBoxColumn.DataPropertyName = "message"; this.messageDataGridViewTextBoxColumn.HeaderText = "Üzenet"; + this.messageDataGridViewTextBoxColumn.MinimumWidth = 71; this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn"; - this.messageDataGridViewTextBoxColumn.Width = 71; // // systemMessageBindingSource // @@ -798,11 +825,12 @@ namespace Maestro { this.Shown += new System.EventHandler(this.MaestroForm_Shown); this.Resize += new System.EventHandler(this.MaestroForm_Resize); this.groupSource.ResumeLayout(false); - this.groupSource.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit(); this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ctxmActions.ResumeLayout(false); this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); @@ -871,7 +899,6 @@ namespace Maestro { private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; private TrafficClient.TrafficIDSelector trafficIDSelector; private System.Windows.Forms.Button buttonMetadata; - private System.Windows.Forms.TextBox txtSorceFilter; private System.Windows.Forms.DataGridViewTextBoxColumn columnID; private System.Windows.Forms.DataGridViewTextBoxColumn columnStatus; private Commons.DataGridViewProgressColumn columnProgress; @@ -884,6 +911,9 @@ namespace Maestro { private System.Windows.Forms.TabPage tabPage2; private System.Windows.Forms.DataGridView dataGridMessages; private System.Windows.Forms.BindingSource systemMessageBindingSource; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button buttonDeleteFilter; + private System.Windows.Forms.TextBox txtSorceFilter; private System.Windows.Forms.DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn; private System.Windows.Forms.DataGridViewTextBoxColumn Level; private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn; diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index 81a55b80..30e7ee39 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -134,7 +134,7 @@ namespace Maestro { private void groupBox_Enter(object sender, EventArgs e) { Control control = sender as Control; - control.Font = new Font(control.Font, FontStyle.Bold); + control.Font = new Font(control.Font, FontStyle.Regular); control.BackColor = Color.White; } @@ -264,7 +264,7 @@ namespace Maestro { public void ReportError(DateTime time, String level, String message, Color color) { systemMessageBindingSource.Insert(0, new SystemMessage() { Time = time, message = message, Level = level }); - UpdateDataChanged(); + //UpdateDataChanged(); newMSGColor = color; } @@ -274,7 +274,18 @@ namespace Maestro { } private void dataGridMessages_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e) { - dataGridMessages.Rows[0].DefaultCellStyle.BackColor = newMSGColor; + SystemMessage actual = systemMessageBindingSource.Current as SystemMessage; + if (actual == null) + return; + if (actual.Level.Equals("Error")) { + dataGridMessages.Rows[e.RowIndex].DefaultCellStyle.BackColor = newMSGColor; + dataGridMessages.Rows[e.RowIndex].DefaultCellStyle.SelectionBackColor = newMSGColor; + } + } + + private void buttonDeleteFilter_Click(object sender, EventArgs e) { + bindingSource.RemoveFilter(); + txtSorceFilter.Text = string.Empty; } } } diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs index f2911f61..1c0cb664 100644 --- a/client/OctopusClient/OctopusAPI.cs +++ b/client/OctopusClient/OctopusAPI.cs @@ -86,8 +86,11 @@ namespace OctopusClient { var dt = scheduledDate.ToUniversalTime().ToString("s", CultureInfo.InvariantCulture); request.AddParameter("scheduledDate", dt, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -113,8 +116,11 @@ namespace OctopusClient { var request = new RestRequest("stories/{rundownID}", Method.GET); request.AddParameter("rundownID", rundownID, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -148,8 +154,11 @@ namespace OctopusClient { var request = new RestRequest("storiesByStoryFolderID/{storyFolderID}", Method.GET); request.AddParameter("storyFolderID", storyFolderID, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -220,8 +229,11 @@ namespace OctopusClient { try { var request = new RestRequest("storyfolders", Method.GET); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -244,8 +256,11 @@ namespace OctopusClient { try { var request = new RestRequest("stories", Method.GET); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -275,8 +290,11 @@ namespace OctopusClient { var request = new RestRequest("getStoriesByIDRegex/{id}", Method.GET); request.AddParameter("id", id, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -306,8 +324,11 @@ namespace OctopusClient { var request = new RestRequest("getStoryFolders/{id}", Method.GET); request.AddParameter("id", id, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -332,8 +353,11 @@ namespace OctopusClient { var request = new RestRequest("getRundownByStoryID/{id}", Method.GET); request.AddParameter("id", id, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -359,8 +383,11 @@ namespace OctopusClient { var request = new RestRequest("getMosObjectsByID/{id}", Method.GET); request.AddParameter("id", id, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -388,8 +415,11 @@ namespace OctopusClient { var request = new RestRequest("getRundownsByPlaceHolderId/{id}", Method.GET); request.AddParameter("id", placeHolderID, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -414,8 +444,11 @@ namespace OctopusClient { var request = new RestRequest("getStoryFoldersByPlaceHolderId/{id}", Method.GET); request.AddParameter("id", placeHolderID, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => { @@ -439,8 +472,11 @@ namespace OctopusClient { var request = new RestRequest("getStoriesByPlaceHolderId/{id}", Method.GET); request.AddParameter("id", placeHolderID, ParameterType.UrlSegment); var response = client.Execute(request); - if (response.ContentLength == 0) - throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + if (response.ContentLength == 0) { + if (response.ErrorException != null) + throw new Exception(String.Format("[Octopus] {0}", response.ErrorMessage)); + else return null; + } JArray resultObject = JArray.Parse(response.Content); result = resultObject.Children().Select(d => {