From: Bellai Ádám Date: Wed, 18 Oct 2017 14:06:58 +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=390a393be0a94844e370d3009f20cadcac0e080e;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30646 --- diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 2693d0d4..a3442bed 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -26,20 +26,20 @@ namespace Maestro { /// private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle(); + 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); this.groupSource = new System.Windows.Forms.GroupBox(); this.dataGridSource = new System.Windows.Forms.DataGridView(); this.bindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -157,31 +157,31 @@ namespace Maestro { this.dataGridSource.BackgroundColor = System.Drawing.Color.White; this.dataGridSource.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dataGridSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised; - dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle29.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dataGridSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridSource.DataSource = this.bindingSource; - dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle30.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle30.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle30.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle30.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle30.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle30.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridSource.DefaultCellStyle = dataGridViewCellStyle30; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + 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.dataGridSource.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridSource.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridSource.Location = new System.Drawing.Point(10, 56); this.dataGridSource.Name = "dataGridSource"; this.dataGridSource.RowHeadersVisible = false; - dataGridViewCellStyle31.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle31; + dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle3; this.dataGridSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dataGridSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridSource.Size = new System.Drawing.Size(394, 343); @@ -614,14 +614,14 @@ namespace Maestro { this.dataGridJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dataGridJobs.BackgroundColor = System.Drawing.Color.White; this.dataGridJobs.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle32.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle32.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle32.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle32.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle32.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle32; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dataGridJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.columnLabel, @@ -634,29 +634,29 @@ namespace Maestro { this.columnOutput, this.columnKillDate}); this.dataGridJobs.DataSource = this.bindingSourceJobs; - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle36.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.Gainsboro; - dataGridViewCellStyle36.SelectionForeColor = System.Drawing.Color.Black; - dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle8.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro; + dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle8; this.dataGridJobs.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridJobs.Location = new System.Drawing.Point(3, 3); this.dataGridJobs.Name = "dataGridJobs"; - dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle37.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dataGridJobs.RowHeadersVisible = false; - dataGridViewCellStyle38.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle38; + dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle10; this.dataGridJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.dataGridJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridJobs.Size = new System.Drawing.Size(988, 92); @@ -677,8 +677,8 @@ namespace Maestro { // this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnID.DataPropertyName = "ID"; - dataGridViewCellStyle33.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnID.DefaultCellStyle = dataGridViewCellStyle33; + dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnID.DefaultCellStyle = dataGridViewCellStyle5; this.columnID.Frozen = true; this.columnID.HeaderText = "ID"; this.columnID.Name = "columnID"; @@ -688,8 +688,8 @@ namespace Maestro { // this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; this.columnStatus.DataPropertyName = "Status"; - dataGridViewCellStyle34.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.columnStatus.DefaultCellStyle = dataGridViewCellStyle34; + dataGridViewCellStyle6.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.columnStatus.DefaultCellStyle = dataGridViewCellStyle6; this.columnStatus.Frozen = true; this.columnStatus.HeaderText = "Status"; this.columnStatus.Name = "columnStatus"; @@ -699,10 +699,10 @@ namespace Maestro { // this.columnProgress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.columnProgress.DataPropertyName = "Progress"; - dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle35.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle35.NullValue = null; - this.columnProgress.DefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle7.NullValue = null; + this.columnProgress.DefaultCellStyle = dataGridViewCellStyle7; this.columnProgress.HeaderText = "Progress"; this.columnProgress.Name = "columnProgress"; this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.True; @@ -770,43 +770,43 @@ namespace Maestro { this.dataGridMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells; this.dataGridMessages.BackgroundColor = System.Drawing.Color.White; this.dataGridMessages.BorderStyle = System.Windows.Forms.BorderStyle.None; - dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle39.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle39.SelectionBackColor = System.Drawing.Color.Transparent; - dataGridViewCellStyle39.SelectionForeColor = System.Drawing.Color.Transparent; - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle39; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + 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.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; this.dataGridMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.timeDataGridViewTextBoxColumn, this.Level, this.messageDataGridViewTextBoxColumn}); this.dataGridMessages.DataSource = this.systemMessageBindingSource; - dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle40.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle40.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle40.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle40.SelectionBackColor = System.Drawing.Color.Transparent; - dataGridViewCellStyle40.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridMessages.DefaultCellStyle = dataGridViewCellStyle40; + dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; + 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.SystemColors.ControlText; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridMessages.DefaultCellStyle = dataGridViewCellStyle12; this.dataGridMessages.Dock = System.Windows.Forms.DockStyle.Fill; this.dataGridMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; this.dataGridMessages.Location = new System.Drawing.Point(3, 3); this.dataGridMessages.Name = "dataGridMessages"; - dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle41.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle41.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - dataGridViewCellStyle41.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle41.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle41.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle41; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + 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.Control; + dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle13; this.dataGridMessages.RowHeadersVisible = false; - dataGridViewCellStyle42.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F); - this.dataGridMessages.RowsDefaultCellStyle = dataGridViewCellStyle42; + 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; diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs index 520500b7..66040d89 100644 --- a/client/Maestro/MaestroForm.Source.cs +++ b/client/Maestro/MaestroForm.Source.cs @@ -14,7 +14,7 @@ using System.Linq; namespace Maestro { delegate void SetTextCallback(); - delegate void TabControlSelectedIndex(); + delegate void TabControlSelectedIndex(int index); public partial class MaestroForm { private ISource source; private SourceInfo selectedSource; diff --git a/client/Maestro/MaestroForm.Target.cs b/client/Maestro/MaestroForm.Target.cs index 39b1348f..365f3049 100644 --- a/client/Maestro/MaestroForm.Target.cs +++ b/client/Maestro/MaestroForm.Target.cs @@ -254,6 +254,7 @@ namespace Maestro { ClearSelectedProcessors(); if (processorWorker == null) CreateJobsQueueWorker(); + ActivateTabOnTabControl2(0); } private void ApplyProcessorButtonsLogicWithoutArchiveMetadataButton() { diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs index e69e5870..c143232b 100644 --- a/client/Maestro/MaestroForm.cs +++ b/client/Maestro/MaestroForm.cs @@ -269,16 +269,20 @@ namespace Maestro { public void ReportError(DateTime time, String level, String message, Color color) { systemMessageBindingSource.Insert(0, new SystemMessage() { Time = time, message = message, Level = level }); newMSGColor = color; + ActivateTabOnTabControl2(1); + } + + private void ActivateTabOnTabControl2(int index) { if (!tabControl2.InvokeRequired) - tabControl2.SelectedIndex = 1; + tabControl2.SelectedIndex = index; else { TabControlSelectedIndex activateErrorPageDelagate = new TabControlSelectedIndex(SetActiveTheErrorPage); - Invoke(activateErrorPageDelagate); + Invoke(activateErrorPageDelagate, new object[] { index }); } } - private void SetActiveTheErrorPage() { - tabControl2.SelectedIndex = 1; + private void SetActiveTheErrorPage(int index) { + tabControl2.SelectedIndex = index; } private void UpdateDataChanged() { @@ -322,8 +326,7 @@ namespace Maestro { return; if (File.Exists(current.KillDatePath)) { File.Delete(current.KillDatePath); - //kell? - current.KillDate = new DateTime(); + current.KillDate = string.Empty; } } diff --git a/client/Maestro/Targets/ITargetProcessor.cs b/client/Maestro/Targets/ITargetProcessor.cs index 8e268b04..7a65be1a 100644 --- a/client/Maestro/Targets/ITargetProcessor.cs +++ b/client/Maestro/Targets/ITargetProcessor.cs @@ -20,7 +20,7 @@ namespace Maestro.Targets { int Progress { get; set; } - DateTime KillDate { get; set; } + string KillDate { get; set; } string Label { get; set; } diff --git a/client/Maestro/Targets/TargetProcessor.cs b/client/Maestro/Targets/TargetProcessor.cs index 42a8a038..7e98f7bd 100644 --- a/client/Maestro/Targets/TargetProcessor.cs +++ b/client/Maestro/Targets/TargetProcessor.cs @@ -16,7 +16,7 @@ namespace Maestro.Targets { private string inputName; private string outputName; private int progress; - private DateTime killDate; + private string killDate; private string label; private string killDatePath; protected Control parent; @@ -158,7 +158,7 @@ namespace Maestro.Targets { } } - public DateTime KillDate { + public string KillDate { get { return killDate; } diff --git a/client/Maestro/Targets/UNCTargetProcessor.cs b/client/Maestro/Targets/UNCTargetProcessor.cs index dbfc6917..332270d9 100644 --- a/client/Maestro/Targets/UNCTargetProcessor.cs +++ b/client/Maestro/Targets/UNCTargetProcessor.cs @@ -117,8 +117,9 @@ namespace Maestro.Targets { string name = GetOutputName(); string description = parameters.ArchiveMetadata?.mediaTitle == null ? parameters.ArchiveMetadata?.itemTitle : parameters.ArchiveMetadata?.mediaTitle; if (parameters.TargetConfig.KillDateDays > 0) { - KillDate = GetKillDate(); - xml = NexioXML.ToXML(name, KillDate, description, parameters.TargetConfig.Agency); + DateTime date = GetKillDate(); + KillDate = date.ToString("yyyy.MM.dd"); + xml = NexioXML.ToXML(name, date, description, parameters.TargetConfig.Agency); } else xml = NexioXML.ToXML(name, null, description, parameters.TargetConfig.Agency); @@ -185,8 +186,8 @@ namespace Maestro.Targets { string fileName = String.Format(KILLDATE_FILE, OutputName, date.ToString("yyyyMMdd")); logger.Debug("Creating KILLDATE status file {0}", fileName); KillDatePath = Path.Combine(statusWorkDir, fileName); - UploadContent(fileName, new byte[] { }); - KillDate = date; + UploadContent(KillDatePath, new byte[] { }); + KillDate = date.ToString("yyyy.MM.dd"); } private void CreateMetadata() { diff --git a/client/PlanAIRClient/TrafficIDSelector.Designer.cs b/client/PlanAIRClient/TrafficIDSelector.Designer.cs index 360c6dff..e0b11d51 100644 --- a/client/PlanAIRClient/TrafficIDSelector.Designer.cs +++ b/client/PlanAIRClient/TrafficIDSelector.Designer.cs @@ -84,7 +84,6 @@ dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; 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); diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 9cdfb8cc..4b3d2ace 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -21,6 +21,14 @@ namespace TrafficClient { panel1.Dock = DockStyle.Fill; } + private void SetColumnsToResizeable() { + foreach (DataGridViewColumn actualColumn in dataGridView1.Columns) { + int width = actualColumn.Width; + actualColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.None; + actualColumn.Width = width; + } + } + private void InitializeTexts() { searchButton.Text = Resources.KERESES; copiaCheckBox.Text = Resources.HIANYZO_KOPIA; @@ -30,13 +38,12 @@ namespace TrafficClient { new DataGridViewColumn[] { new DataGridViewCheckBoxColumn(){ AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells, - DataPropertyName = "Selected" + DataPropertyName = "Selected", }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells, DataPropertyName = "MediaID", HeaderText = Resources.TRAFFIC_ID, - }, new DataGridViewTextBoxColumn() { AutoSizeMode = DataGridViewAutoSizeColumnMode.DisplayedCells, @@ -97,6 +104,7 @@ namespace TrafficClient { if (CanSort(list)) list.Sort((x, y) => DateTime.Compare(x.NextBroadcastDate.Value, y.NextBroadcastDate.Value)); dataGridView1.DataSource = list; + SetColumnsToResizeable(); } private bool CanSort(List list) { @@ -113,9 +121,7 @@ namespace TrafficClient { } private void dataGridView1_CellDoubleClick(object sender, DataGridViewCellEventArgs e) { - DataGridViewCell checkBoxCell = dataGridView1.Rows[e.RowIndex].Cells[0]; - MamResultWrapper res = dataGridView1.Rows[e.RowIndex].DataBoundItem as MamResultWrapper; - SetCheckBoxAndInvokeIDChangeEvent(checkBoxCell, res); + SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]); } private void searchButton_Click(object sender, EventArgs e) { @@ -135,34 +141,21 @@ namespace TrafficClient { if (gridView == null) return; //nincs multiselect - DataGridViewCell checkBoxCell = gridView.SelectedCells[0]; - MamResultWrapper res = dataGridView1.Rows[e.RowIndex].DataBoundItem as MamResultWrapper; - SetCheckBoxAndInvokeIDChangeEvent(checkBoxCell, res); - //bool isChecked = (bool)checkBoxCell.Value; - //checkBoxCell.Value = !isChecked; + SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]); } - private void SetCheckBoxAndInvokeIDChangeEvent(DataGridViewCell checkBoxCell, MamResultWrapper res) { - bool selected = checkBoxCell.Value.Equals(false); - clearCheckBox?.Invoke(); + private void SetCheckBoxAndInvokeIDChangeEvent(DataGridViewRow actualRow) { + MamResultWrapper res = actualRow.DataBoundItem as MamResultWrapper; + DataGridViewCheckBoxCell checkBoxCell = actualRow.Cells[0] as DataGridViewCheckBoxCell; + bool beforeClear = checkBoxCell.Value.Equals(true); ClearSelectionSource(); - //checkBoxCell.Value = checkBoxCell.Value.Equals(true) ? true : false; - //MamResultWrapper res = dataGridView1.Rows[rowIndex].DataBoundItem as MamResultWrapper; - res.Selected = selected; + checkBoxCell.Value = !beforeClear; + bool selected = checkBoxCell.Value.Equals(true); + clearCheckBox?.Invoke(); if (selected) { IDChangedEvent?.Invoke(res.MediaID, res.VariantID); } else IDChangedEvent?.Invoke(string.Empty, 0); - //UpdateDataChange(); - } - - private void UpdateDataChange() { - List list = dataGridView1.DataSource as List; - if (list == null) - return; - List newList = new List(list); - dataGridView1.DataSource = null; - dataGridView1.DataSource = newList; } public void ClearSelectionSource() { @@ -173,14 +166,8 @@ namespace TrafficClient { } private void dataGridView1_KeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode == Keys.Space && dataGridView1.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell)) { - var selectedRows = dataGridView1.SelectedRows[0]; - DataGridViewCell cell = selectedRows.Cells[0] as DataGridViewCell; - if (cell == null) - return; - MamResultWrapper res = selectedRows.DataBoundItem as MamResultWrapper; - SetCheckBoxAndInvokeIDChangeEvent(cell, res); - } + if (e.KeyCode == Keys.Space && dataGridView1.CurrentCell.GetType() != typeof(DataGridViewCheckBoxCell)) + SetCheckBoxAndInvokeIDChangeEvent(dataGridView1.SelectedRows[0]); } }