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

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index 272ea5daef62a3782ec03a675b461b811d328a32..bc9da6ad218e1b96940fe7b97ee1387b184f4703 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -252,6 +252,7 @@
     <None Include="Maestro_TemporaryKey.pfx" />\r
     <None Include="nlog.config">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+      <SubType>Designer</SubType>\r
     </None>\r
     <None Include="packages.config" />\r
     <None Include="Properties\DataSources\Maestro.Metadata.MetadataInfo.datasource" />\r

diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs
index 728fbb01033c83a213866a759a42d517cebee127..f120b61fd7603c93cfbe9dbde78df49bb53dc41c 100644 (file)
--- a/client/Maestro/MaestroForm.Designer.cs
+++ b/client/Maestro/MaestroForm.Designer.cs
@@ -26,20 +26,20 @@ namespace Maestro {
         /// </summary>\r
         private void InitializeComponent() {\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
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = 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 dataGridViewCellStyle10 = 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 dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();\r
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = 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 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 dataGridViewCellStyle18 = 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 dataGridViewCellStyle24 = 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 dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();\r
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = 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
             this.groupSource = new System.Windows.Forms.GroupBox();\r
             this.dataGridSource = new System.Windows.Forms.DataGridView();\r
             this.bindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -83,6 +83,7 @@ namespace Maestro {
             this.tabPage2 = new System.Windows.Forms.TabPage();\r
             this.dataGridMessages = new System.Windows.Forms.DataGridView();\r
             this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
+            this.Level = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();\r
             this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
             this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components);\r
@@ -149,31 +150,31 @@ namespace Maestro {
             this.dataGridSource.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridSource.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
             this.dataGridSource.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.Raised;\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.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;\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.dataGridSource.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;\r
             this.dataGridSource.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridSource.DataSource = this.bindingSource;\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.dataGridSource.DefaultCellStyle = dataGridViewCellStyle2;\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.dataGridSource.DefaultCellStyle = dataGridViewCellStyle16;\r
             this.dataGridSource.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridSource.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridSource.Location = new System.Drawing.Point(10, 43);\r
             this.dataGridSource.Name = "dataGridSource";\r
             this.dataGridSource.RowHeadersVisible = false;\r
-            dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle3;\r
+            dataGridViewCellStyle17.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridSource.RowsDefaultCellStyle = dataGridViewCellStyle17;\r
             this.dataGridSource.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridSource.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridSource.Size = new System.Drawing.Size(394, 356);\r
@@ -357,6 +358,7 @@ namespace Maestro {
             this.octopusIDSelector.ClearCheckBox = null;\r
             this.octopusIDSelector.Disposeabel = false;\r
             this.octopusIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.octopusIDSelector.ErrorReporter = null;\r
             this.octopusIDSelector.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.octopusIDSelector.IDChangedEvent = null;\r
             this.octopusIDSelector.Location = new System.Drawing.Point(3, 3);\r
@@ -364,7 +366,6 @@ namespace Maestro {
             this.octopusIDSelector.MinimumSize = new System.Drawing.Size(200, 300);\r
             this.octopusIDSelector.Name = "octopusIDSelector";\r
             this.octopusIDSelector.Padding = new System.Windows.Forms.Padding(6);\r
-            this.octopusIDSelector.ErrorReporter = null;\r
             this.octopusIDSelector.Size = new System.Drawing.Size(250, 342);\r
             this.octopusIDSelector.TabIndex = 1;\r
             // \r
@@ -385,6 +386,7 @@ namespace Maestro {
             this.trafficIDSelector.BackColor = System.Drawing.Color.White;\r
             this.trafficIDSelector.clearCheckBox = null;\r
             this.trafficIDSelector.Dock = System.Windows.Forms.DockStyle.Fill;\r
+            this.trafficIDSelector.ErrorReporter = null;\r
             this.trafficIDSelector.IDChangedEvent = null;\r
             this.trafficIDSelector.Location = new System.Drawing.Point(3, 3);\r
             this.trafficIDSelector.Margin = new System.Windows.Forms.Padding(4);\r
@@ -573,14 +575,14 @@ namespace Maestro {
             this.dataGridJobs.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dataGridJobs.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridJobs.BorderStyle = System.Windows.Forms.BorderStyle.None;\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.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;\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.dataGridJobs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle18;\r
             this.dataGridJobs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridJobs.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.columnID,\r
@@ -591,29 +593,29 @@ namespace Maestro {
             this.columnInput,\r
             this.columnOutput});\r
             this.dataGridJobs.DataSource = this.bindingSourceJobs;\r
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Window;\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.ControlText;\r
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle8;\r
+            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Window;\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.ControlText;\r
+            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
+            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridJobs.DefaultCellStyle = dataGridViewCellStyle22;\r
             this.dataGridJobs.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridJobs.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridJobs.Location = new System.Drawing.Point(3, 3);\r
             this.dataGridJobs.Name = "dataGridJobs";\r
-            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;\r
-            dataGridViewCellStyle9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9;\r
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle23.BackColor = System.Drawing.SystemColors.Control;\r
+            dataGridViewCellStyle23.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle23.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle23.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle23.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridJobs.RowHeadersDefaultCellStyle = dataGridViewCellStyle23;\r
             this.dataGridJobs.RowHeadersVisible = false;\r
-            dataGridViewCellStyle10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle10;\r
+            dataGridViewCellStyle24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            this.dataGridJobs.RowsDefaultCellStyle = dataGridViewCellStyle24;\r
             this.dataGridJobs.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
             this.dataGridJobs.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridJobs.Size = new System.Drawing.Size(988, 92);\r
@@ -624,8 +626,8 @@ namespace Maestro {
             // \r
             this.columnID.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnID.DataPropertyName = "ID";\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
+            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
             this.columnID.Frozen = true;\r
             this.columnID.HeaderText = "ID";\r
             this.columnID.Name = "columnID";\r
@@ -635,8 +637,8 @@ namespace Maestro {
             // \r
             this.columnStatus.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells;\r
             this.columnStatus.DataPropertyName = "Status";\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
+            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
             this.columnStatus.Frozen = true;\r
             this.columnStatus.HeaderText = "Status";\r
             this.columnStatus.Name = "columnStatus";\r
@@ -646,10 +648,10 @@ namespace Maestro {
             // \r
             this.columnProgress.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;\r
             this.columnProgress.DataPropertyName = "Progress";\r
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
-            dataGridViewCellStyle7.NullValue = null;\r
-            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle7;\r
+            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;\r
+            dataGridViewCellStyle21.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));\r
+            dataGridViewCellStyle21.NullValue = null;\r
+            this.columnProgress.DefaultCellStyle = dataGridViewCellStyle21;\r
             this.columnProgress.HeaderText = "Progress";\r
             this.columnProgress.Name = "columnProgress";\r
             this.columnProgress.Resizable = System.Windows.Forms.DataGridViewTriState.True;\r
@@ -709,42 +711,43 @@ namespace Maestro {
             this.dataGridMessages.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;\r
             this.dataGridMessages.BackgroundColor = System.Drawing.Color.White;\r
             this.dataGridMessages.BorderStyle = System.Windows.Forms.BorderStyle.None;\r
-            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
-            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Window;\r
-            dataGridViewCellStyle11.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;\r
-            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
-            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
-            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
-            this.dataGridMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;\r
+            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;\r
+            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Window;\r
+            dataGridViewCellStyle25.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;\r
+            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;\r
+            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;\r
+            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;\r
+            this.dataGridMessages.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;\r
             this.dataGridMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;\r
             this.dataGridMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {\r
             this.timeDataGridViewTextBoxColumn,\r
+            this.Level,\r
             this.messageDataGridViewTextBoxColumn});\r
             this.dataGridMessages.DataSource = this.systemMessageBindingSource;\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);\r
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.ControlText;\r
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.Gainsboro;\r
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.Black;\r
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
-            this.dataGridMessages.DefaultCellStyle = dataGridViewCellStyle12;\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);\r
+            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;\r
+            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.Transparent;\r
+            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.Color.Black;\r
+            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;\r
+            this.dataGridMessages.DefaultCellStyle = dataGridViewCellStyle26;\r
             this.dataGridMessages.Dock = System.Windows.Forms.DockStyle.Fill;\r
             this.dataGridMessages.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;\r
             this.dataGridMessages.Location = new System.Drawing.Point(3, 3);\r
             this.dataGridMessages.Name = "dataGridMessages";\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);\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.dataGridMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle13;\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);\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.dataGridMessages.RowHeadersDefaultCellStyle = dataGridViewCellStyle27;\r
             this.dataGridMessages.RowHeadersVisible = false;\r
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
-            this.dataGridMessages.RowsDefaultCellStyle = dataGridViewCellStyle14;\r
+            dataGridViewCellStyle28.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
+            this.dataGridMessages.RowsDefaultCellStyle = dataGridViewCellStyle28;\r
             this.dataGridMessages.RowTemplate.DefaultCellStyle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);\r
             this.dataGridMessages.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;\r
             this.dataGridMessages.Size = new System.Drawing.Size(988, 92);\r
@@ -754,16 +757,23 @@ namespace Maestro {
             // timeDataGridViewTextBoxColumn\r
             // \r
             this.timeDataGridViewTextBoxColumn.DataPropertyName = "Time";\r
-            this.timeDataGridViewTextBoxColumn.HeaderText = "Time";\r
+            this.timeDataGridViewTextBoxColumn.HeaderText = "Idő";\r
             this.timeDataGridViewTextBoxColumn.Name = "timeDataGridViewTextBoxColumn";\r
-            this.timeDataGridViewTextBoxColumn.Width = 60;\r
+            this.timeDataGridViewTextBoxColumn.Width = 49;\r
+            // \r
+            // Level\r
+            // \r
+            this.Level.DataPropertyName = "Level";\r
+            this.Level.HeaderText = "LogLevel";\r
+            this.Level.Name = "Level";\r
+            this.Level.Width = 82;\r
             // \r
             // messageDataGridViewTextBoxColumn\r
             // \r
             this.messageDataGridViewTextBoxColumn.DataPropertyName = "message";\r
-            this.messageDataGridViewTextBoxColumn.HeaderText = "message";\r
+            this.messageDataGridViewTextBoxColumn.HeaderText = "Üzenet";\r
             this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn";\r
-            this.messageDataGridViewTextBoxColumn.Width = 83;\r
+            this.messageDataGridViewTextBoxColumn.Width = 71;\r
             // \r
             // systemMessageBindingSource\r
             // \r
@@ -875,6 +885,7 @@ namespace Maestro {
         private System.Windows.Forms.DataGridView dataGridMessages;\r
         private System.Windows.Forms.BindingSource systemMessageBindingSource;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn;\r
+        private System.Windows.Forms.DataGridViewTextBoxColumn Level;\r
         private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn;\r
     }\r
 }\r

diff --git a/client/Maestro/MaestroForm.Source.cs b/client/Maestro/MaestroForm.Source.cs
index fd47128f75a9eac3764fcf36a82d3736342aa1c0..7a1af3bc347b865af5a104b084ac38ebc4341341 100644 (file)
--- a/client/Maestro/MaestroForm.Source.cs
+++ b/client/Maestro/MaestroForm.Source.cs
@@ -37,8 +37,7 @@ namespace Maestro {
 \r
             if (Configuration?.Source is UNCSource) {\r
                 logger.Debug("UNC source initialization");\r
-                Action<DateTime, string, Color> errorReporter = ReportError;\r
-                source = new FileSystemSource(this, MessageBus, Configuration.Source.Filter, errorReporter);\r
+                source = new FileSystemSource(this, MessageBus, Configuration.Source.Filter);\r
                 logger.Debug("UNC source created");\r
             }\r
             if (Configuration?.Source is NEXIOSource) {\r

diff --git a/client/Maestro/MaestroForm.cs b/client/Maestro/MaestroForm.cs
index 97a9db7cd12d0b4f9743cbc3c318aa6745502d20..ca1040099d9f5cf66f711da1d0ed947d35306bfa 100644 (file)
--- a/client/Maestro/MaestroForm.cs
+++ b/client/Maestro/MaestroForm.cs
@@ -73,7 +73,7 @@ namespace Maestro {
             InitializeMetadata();\r
             InitializeTarget();\r
             InitializeJobs();\r
-            InitializeMessages();\r
+            //InitializeMessages();\r
             InitializeControlTexts();\r
         }\r
 \r
@@ -259,8 +259,8 @@ namespace Maestro {
         }\r
 \r
 \r
-        public void ReportError(DateTime time, String message, Color color) {\r
-            systemMessageBindingSource.Insert(0, new SystemMessage() { Time = time, message = message });\r
+        public void ReportError(DateTime time, String level, String message, Color color) {\r
+            systemMessageBindingSource.Insert(0, new SystemMessage() { Time = time, message = message, Level = level });\r
             UpdateDataChanged();\r
             newMSGColor = color;\r
         }\r

diff --git a/client/Maestro/MaestroForm.resx b/client/Maestro/MaestroForm.resx
index a7fb3dc3646e8b3ee23266d11827ccc6f0792a1a..fca8800d01d21300c6e74fbfd1c28be5389cb4c6 100644 (file)
--- a/client/Maestro/MaestroForm.resx
+++ b/client/Maestro/MaestroForm.resx
@@ -147,6 +147,9 @@
   <metadata name="bindingSourceJobs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>154, 17</value>\r
   </metadata>\r
+  <metadata name="Level.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">\r
+    <value>True</value>\r
+  </metadata>\r
   <metadata name="systemMessageBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">\r
     <value>630, 17</value>\r
   </metadata>\r

diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs
index c528427619d60431d0b511728bee92694081a122..a1e8314398734ccff4d808d2ca5169ce8d1c791b 100644 (file)
--- a/client/Maestro/Program.cs
+++ b/client/Maestro/Program.cs
@@ -3,6 +3,7 @@ using LinkDotNet.MessageHandling.Contracts;
 using Maestro.Configuration;\r
 using Maestro.Properties;\r
 using NLog;\r
+using NLog.Targets;\r
 using System;\r
 using System.Collections.Concurrent;\r
 using System.Collections.Generic;\r

diff --git a/client/Maestro/Sources/FileSystemSource.cs b/client/Maestro/Sources/FileSystemSource.cs
index 9656966ab0911ae792eb36d9b217b18760953388..1cdb6beccae5e45869fa2a172f9e8940da3b2842 100644 (file)
--- a/client/Maestro/Sources/FileSystemSource.cs
+++ b/client/Maestro/Sources/FileSystemSource.cs
@@ -28,7 +28,6 @@ namespace Maestro.Sources {
         private string path;\r
         private bool initialized;\r
         private ClearAndInitialize clearAndInitialize;\r
-        private Action<DateTime, string, Color> errorReporter;\r
 \r
         public DataGridViewColumn[] Columns {\r
             get {\r
@@ -71,14 +70,14 @@ namespace Maestro.Sources {
 \r
         public bool SupportsFiltering => true;\r
 \r
-        public FileSystemSource(Control parent, IMessageBus messageBus, String fileExtensionFilter, Action<DateTime, string, Color> errorReporter) {\r
+        public FileSystemSource(Control parent, IMessageBus messageBus, String fileExtensionFilter) {\r
             this.parent = parent;\r
             this.messageBus = messageBus;\r
             this.fileExtensionFilter = fileExtensionFilter;\r
             SetAcceptableExtensions();\r
             pathWatcherWorker.DoWork += pathWatcherWorker_watchPath;\r
             pathWatcherWorker.WorkerReportsProgress = true;\r
-            this.errorReporter = errorReporter;\r
+            \r
         }\r
 \r
         private void pathWatcherWorker_watchPath(object sender, DoWorkEventArgs e) {\r

diff --git a/client/Maestro/SystemMessage.cs b/client/Maestro/SystemMessage.cs
index f5b8db34040af38fe738270b1df424aba47ecc22..062c05f7711dff66e8e5b526d4ee973197c17b78 100644 (file)
--- a/client/Maestro/SystemMessage.cs
+++ b/client/Maestro/SystemMessage.cs
@@ -9,5 +9,6 @@ namespace Maestro {
 \r
         public DateTime Time { get; set; }\r
         public String message { get; set; }\r
+        public String Level { get; set; }\r
     }\r
 }\r

diff --git a/client/MediaCubeClient/MediaCubeApi.cs b/client/MediaCubeClient/MediaCubeApi.cs
index 647a99c22686f74a352aca7b5e9d4a0d6676cdb6..beefbfb104b74f718288aa2c2f083fd0a71e3983 100644 (file)
--- a/client/MediaCubeClient/MediaCubeApi.cs
+++ b/client/MediaCubeClient/MediaCubeApi.cs
@@ -12,7 +12,7 @@ using System.Drawing;
 \r
 namespace JobEngineClient {\r
 \r
-    public delegate void MediaCubeErrorReporter(DateTime time, String message, Color color);\r
+    public delegate void MediaCubeErrorReporter(DateTime time, String level, String message, Color color);\r
 \r
     public class MediaCubeApi {\r
         private const string DATEFORMAT = "yyyy'-'MM'-'dd'T'HH':'mm':'ssK";\r
@@ -45,7 +45,7 @@ namespace JobEngineClient {
             request.AddParameter("application/json", body, ParameterType.RequestBody);\r
             var response = client.Execute(request);\r
             if (response.StatusCode != HttpStatusCode.OK || response.ContentLength < 1) {\r
-                ErrorReporter?.Invoke(DateTime.Now, String.Format("[MediaCube] {0}", response.ErrorMessage), Color.Red);\r
+                ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[MediaCube] {0}", response.ErrorMessage), Color.Red);\r
                 return null;\r
             }\r
             //Debug.WriteLine(response.Content);\r

diff --git a/client/MediaCubeClient/NexioAPI.cs b/client/MediaCubeClient/NexioAPI.cs
index 69dadbddca339f873b30cb34e2dd31555ff2acc4..9d579b09a43c14cf03f0c1bb8f190ad8bc3fbdcf 100644 (file)
--- a/client/MediaCubeClient/NexioAPI.cs
+++ b/client/MediaCubeClient/NexioAPI.cs
@@ -55,7 +55,7 @@ namespace NexioClient {
                 ws.Connect();\r
             }\r
             catch (Exception e) {\r
-                ErrorReporter?.Invoke(DateTime.Now, String.Format("[NexioAPI] {0}", e.Message), System.Drawing.Color.Red);\r
+                ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[NexioAPI] {0}", e.Message), System.Drawing.Color.Red);\r
             } \r
         }\r
 \r
@@ -66,7 +66,7 @@ namespace NexioClient {
                 ws.Send(data.ToString());\r
             }\r
             catch (Exception e) {\r
-                ErrorReporter?.Invoke(DateTime.Now, String.Format("[NexioAPI] {0}", e.Message), System.Drawing.Color.Red);\r
+                ErrorReporter?.Invoke(DateTime.Now, "Error", String.Format("[NexioAPI] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
         }\r
 \r

diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs
index 988bf0593cb336fb6ea9924d2d5772cb03161a46..f2911f610bc01f9a10d15eeb34a41bbae77fd3aa 100644 (file)
--- a/client/OctopusClient/OctopusAPI.cs
+++ b/client/OctopusClient/OctopusAPI.cs
@@ -101,7 +101,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
                 return result;\r
             }\r
             return result;\r
@@ -137,7 +137,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -173,7 +173,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -234,7 +234,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -264,7 +264,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -295,7 +295,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -321,7 +321,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -348,7 +348,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -377,7 +377,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -403,7 +403,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -428,7 +428,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -464,7 +464,7 @@ namespace OctopusClient {
                 });\r
             }\r
             catch (Exception e) {\r
-                errorRiporter?.Invoke(DateTime.Now, e.Message, System.Drawing.Color.Red);\r
+                errorRiporter?.Invoke(DateTime.Now, "Error", e.Message, System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r

diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs
index 6d45babf54fcb3f5e159b58706ad78db4c949621..24c7d9df0dfb401f0e54ba3447898a87ccf6a252 100644 (file)
--- a/client/OctopusClient/OctopusIDSelector.cs
+++ b/client/OctopusClient/OctopusIDSelector.cs
@@ -9,7 +9,7 @@ using System.Drawing;
 namespace OctopusClient {\r
     public delegate void OnSelectedIDChanged(string ID);\r
     public delegate void ClearCheckBox();\r
-    public delegate void OctopusErrorReporterDelegate(DateTime time, String message, Color color);\r
+    public delegate void OctopusErrorReporterDelegate(DateTime time, String level, String message, Color color);\r
 \r
     public partial class OctopusIDSelector : UserControl {\r
 \r

diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs
index a5035585a11a167d70a41d433aa8cd3924c1fc6e..54ad7bf25bc1c1e336a6f32b1195558e84c14018 100644 (file)
--- a/client/PlanAIRClient/TrafficIDSelector.cs
+++ b/client/PlanAIRClient/TrafficIDSelector.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 namespace TrafficClient {\r
     public delegate void OnSelectedIDChanged(string ID, int variantID);\r
     public delegate void ClearCheckBox();\r
-    public delegate void TrafficErrorReporterDelegate(DateTime time, String message, Color color);\r
+    public delegate void TrafficErrorReporterDelegate(DateTime time, String level, String message, Color color);\r
     public partial class TrafficIDSelector : UserControl {\r
         public TrafficAPI trafficAPI { get; private set; }\r
         public OnSelectedIDChanged IDChangedEvent { get; set; }\r

diff --git a/client/PlanAIRClient/Workers/AdvertisementWorker.cs b/client/PlanAIRClient/Workers/AdvertisementWorker.cs
index 77db905c57efe9a8bd9a55075c87dc9b5e02b9f9..6a01a2fbf1b2bc8dacc21714aab337b51edc0116 100644 (file)
--- a/client/PlanAIRClient/Workers/AdvertisementWorker.cs
+++ b/client/PlanAIRClient/Workers/AdvertisementWorker.cs
@@ -30,7 +30,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -82,7 +82,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r

diff --git a/client/PlanAIRClient/Workers/BroadcastWorker.cs b/client/PlanAIRClient/Workers/BroadcastWorker.cs
index 87684d2b909f9792b6eb88c2ca2e269ed574fd90..493583d322c68a8ac5f0440582661535322ed42e 100644 (file)
--- a/client/PlanAIRClient/Workers/BroadcastWorker.cs
+++ b/client/PlanAIRClient/Workers/BroadcastWorker.cs
@@ -43,7 +43,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -100,7 +100,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -137,7 +137,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r

diff --git a/client/PlanAIRClient/Workers/PromotionalWorker.cs b/client/PlanAIRClient/Workers/PromotionalWorker.cs
index 4c2aea5894ebb5854ff4ec8cdbb29e2f55e8f373..3ddb8f55c3bf49e75db51e2e86ab920b6f442037 100644 (file)
--- a/client/PlanAIRClient/Workers/PromotionalWorker.cs
+++ b/client/PlanAIRClient/Workers/PromotionalWorker.cs
@@ -30,7 +30,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -68,7 +68,7 @@ namespace TrafficClient.Workers {
                 }\r
             }\r
             catch (Exception e) {\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             return result;\r
         }\r
@@ -90,7 +90,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r

diff --git a/client/PlanAIRClient/Workers/SegmentWorker.cs b/client/PlanAIRClient/Workers/SegmentWorker.cs
index 08167d7c2caa52386ad10b0a4a261c2c9858824c..40326e00c0dd44cf9ba13777f6cc646083ef6dc5 100644 (file)
--- a/client/PlanAIRClient/Workers/SegmentWorker.cs
+++ b/client/PlanAIRClient/Workers/SegmentWorker.cs
@@ -35,7 +35,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -73,7 +73,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -95,7 +95,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r
@@ -124,7 +124,7 @@ namespace TrafficClient.Workers {
             }\r
             catch (Exception e) {\r
                 logger.Error(e.Message);\r
-                errorReporter?.Invoke(DateTime.Now, String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
+                errorReporter?.Invoke(DateTime.Now, "Error", String.Format("[Traffic] {0}", e.Message), System.Drawing.Color.Red);\r
             }\r
             finally {\r
                 connection.Close();\r