Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj =================================================================== diff -u -r0ebf7ee0c2ee3cefb8f3d0eed09e702780e85c4b -r732e6ecce60a2e6122063e81449f5e083543c547 --- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 0ebf7ee0c2ee3cefb8f3d0eed09e702780e85c4b) +++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj (.../Core.Common.Gui.csproj) (revision 732e6ecce60a2e6122063e81449f5e083543c547) @@ -207,15 +207,6 @@ MessageWindow.cs - - MessageWindowData.xsd - Component - - - MessageWindowData.xsd - True - True - Form @@ -302,17 +293,6 @@ Copying.Lesser.licenseheader - - MessageWindowData.xsd - - - MSDataSetGenerator - MessageWindowData.Designer.cs - Designer - - - MessageWindowData.xsd - Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs =================================================================== diff -u -rce9283562cfceedb1933f67ee8a0c3b344331a8f -r732e6ecce60a2e6122063e81449f5e083543c547 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision ce9283562cfceedb1933f67ee8a0c3b344331a8f) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision 732e6ecce60a2e6122063e81449f5e083543c547) @@ -47,17 +47,21 @@ this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.buttonShowDetails = new System.Windows.Forms.ToolStripButton(); this.messagesDataGridView = new System.Windows.Forms.DataGridView(); - this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.imageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewImageColumn(); - this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.messagesBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.messageWindowData = new Core.Common.Gui.Forms.MessageWindow.MessageWindowData(); + this.messageWindowData = new System.Data.DataSet(); + this.Messages = new System.Data.DataTable(); + this.levelColumn = new System.Data.DataColumn(); + this.timeColumn = new System.Data.DataColumn(); + this.messageColumn = new System.Data.DataColumn(); + this.levelColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewImageColumn(); + this.timeColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.messageColumnDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.contextMenu.SuspendLayout(); this.messagesToolStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.messagesDataGridView)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.messagesBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.messageWindowData)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.Messages)).BeginInit(); this.SuspendLayout(); // // contextMenu @@ -162,10 +166,9 @@ this.messagesDataGridView.AutoGenerateColumns = false; this.messagesDataGridView.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; this.messagesDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.imageDataGridViewTextBoxColumn, - this.Id, - this.timeDataGridViewTextBoxColumn, - this.messageDataGridViewTextBoxColumn}); + this.levelColumnDataGridViewTextBoxColumn, + this.timeColumnDataGridViewTextBoxColumn, + this.messageColumnDataGridViewTextBoxColumn}); this.messagesDataGridView.ContextMenuStrip = this.contextMenu; this.messagesDataGridView.DataSource = this.messagesBindingSource; dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; @@ -183,54 +186,72 @@ this.messagesDataGridView.RowTemplate.Resizable = System.Windows.Forms.DataGridViewTriState.False; this.messagesDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; // - // Id + // messagesBindingSource // - this.Id.DataPropertyName = "Id"; - resources.ApplyResources(this.Id, "Id"); - this.Id.Name = "Id"; - this.Id.ReadOnly = true; + this.messagesBindingSource.DataMember = "MessageTable"; + this.messagesBindingSource.DataSource = this.messageWindowData; + this.messagesBindingSource.Sort = "timeColumn DESC"; // - // imageDataGridViewTextBoxColumn + // messageWindowData // - this.imageDataGridViewTextBoxColumn.DataPropertyName = "Image"; - this.imageDataGridViewTextBoxColumn.Frozen = true; - resources.ApplyResources(this.imageDataGridViewTextBoxColumn, "imageDataGridViewTextBoxColumn"); - this.imageDataGridViewTextBoxColumn.Name = "imageDataGridViewTextBoxColumn"; - this.imageDataGridViewTextBoxColumn.ReadOnly = true; - this.imageDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.imageDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.messageWindowData.DataSetName = "NewDataSet"; + this.messageWindowData.Tables.AddRange(new System.Data.DataTable[] { + this.Messages}); // - // timeDataGridViewTextBoxColumn + // Messages // - this.timeDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.AllCells; - this.timeDataGridViewTextBoxColumn.DataPropertyName = "Time"; - dataGridViewCellStyle1.Format = "HH:mm:ss"; - dataGridViewCellStyle1.NullValue = null; - this.timeDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; - resources.ApplyResources(this.timeDataGridViewTextBoxColumn, "timeDataGridViewTextBoxColumn"); - this.timeDataGridViewTextBoxColumn.Name = "timeDataGridViewTextBoxColumn"; - this.timeDataGridViewTextBoxColumn.ReadOnly = true; + this.Messages.Columns.AddRange(new System.Data.DataColumn[] { + this.levelColumn, + this.timeColumn, + this.messageColumn}); + this.Messages.TableName = "MessageTable"; // - // messageDataGridViewTextBoxColumn + // levelColumn // - this.messageDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.messageDataGridViewTextBoxColumn.DataPropertyName = "Message"; - this.messageDataGridViewTextBoxColumn.FillWeight = 70F; - resources.ApplyResources(this.messageDataGridViewTextBoxColumn, "messageDataGridViewTextBoxColumn"); - this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn"; - this.messageDataGridViewTextBoxColumn.ReadOnly = true; + this.levelColumn.Caption = ""; + this.levelColumn.ColumnName = "levelColumn"; // - // messagesBindingSource + // timeColumn // - this.messagesBindingSource.DataMember = "Messages"; - this.messagesBindingSource.DataSource = this.messageWindowData; - this.messagesBindingSource.Sort = "Id"; + this.timeColumn.Caption = ""; + this.timeColumn.ColumnName = "timeColumn"; + this.timeColumn.DataType = typeof(System.DateTime); + this.timeColumn.DateTimeMode = System.Data.DataSetDateTime.Local; // - // messageWindowData + // messageColumn // - this.messageWindowData.DataSetName = "MessageWindowData"; - this.messageWindowData.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + this.messageColumn.ColumnName = "messageColumn"; // + // levelColumnDataGridViewTextBoxColumn + // + this.levelColumnDataGridViewTextBoxColumn.DataPropertyName = "levelColumn"; + resources.ApplyResources(this.levelColumnDataGridViewTextBoxColumn, "levelColumnDataGridViewTextBoxColumn"); + this.levelColumnDataGridViewTextBoxColumn.Name = "levelColumnDataGridViewTextBoxColumn"; + this.levelColumnDataGridViewTextBoxColumn.ReadOnly = true; + this.levelColumnDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False; + // + // timeColumnDataGridViewTextBoxColumn + // + this.timeColumnDataGridViewTextBoxColumn.DataPropertyName = "timeColumn"; + dataGridViewCellStyle1.Format = "T"; + dataGridViewCellStyle1.NullValue = null; + this.timeColumnDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + resources.ApplyResources(this.timeColumnDataGridViewTextBoxColumn, "timeColumnDataGridViewTextBoxColumn"); + this.timeColumnDataGridViewTextBoxColumn.Name = "timeColumnDataGridViewTextBoxColumn"; + this.timeColumnDataGridViewTextBoxColumn.ReadOnly = true; + this.timeColumnDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.timeColumnDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // + // messageColumnDataGridViewTextBoxColumn + // + this.messageColumnDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.messageColumnDataGridViewTextBoxColumn.DataPropertyName = "messageColumn"; + resources.ApplyResources(this.messageColumnDataGridViewTextBoxColumn, "messageColumnDataGridViewTextBoxColumn"); + this.messageColumnDataGridViewTextBoxColumn.Name = "messageColumnDataGridViewTextBoxColumn"; + this.messageColumnDataGridViewTextBoxColumn.ReadOnly = true; + this.messageColumnDataGridViewTextBoxColumn.Resizable = System.Windows.Forms.DataGridViewTriState.False; + this.messageColumnDataGridViewTextBoxColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + // // MessageWindow // resources.ApplyResources(this, "$this"); @@ -244,6 +265,7 @@ ((System.ComponentModel.ISupportInitialize)(this.messagesDataGridView)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.messagesBindingSource)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.messageWindowData)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.Messages)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -259,17 +281,20 @@ private System.Windows.Forms.ToolStripSeparator cToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem buttonClearAll; private System.Windows.Forms.BindingSource messagesBindingSource; - private MessageWindowData messageWindowData; private System.Windows.Forms.ToolStrip messagesToolStrip; private System.Windows.Forms.ToolStripButton buttonShowWarning; private System.Windows.Forms.ToolStripButton buttonShowError; private System.Windows.Forms.ToolStripButton buttonShowInfo; private System.Windows.Forms.DataGridView messagesDataGridView; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; - private DataGridViewImageColumn imageDataGridViewTextBoxColumn; - private DataGridViewTextBoxColumn Id; - private DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn; - private DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn; private ToolStripButton buttonShowDetails; + private System.Data.DataSet messageWindowData; + private System.Data.DataTable Messages; + private System.Data.DataColumn levelColumn; + private System.Data.DataColumn timeColumn; + private System.Data.DataColumn messageColumn; + private DataGridViewImageColumn levelColumnDataGridViewTextBoxColumn; + private DataGridViewTextBoxColumn timeColumnDataGridViewTextBoxColumn; + private DataGridViewTextBoxColumn messageColumnDataGridViewTextBoxColumn; } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r732e6ecce60a2e6122063e81449f5e083543c547 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision 732e6ecce60a2e6122063e81449f5e083543c547) @@ -84,9 +84,6 @@ messagesDataGridView.ClipboardCopyMode = DataGridViewClipboardCopyMode.EnableWithoutHeaderText; messagesDataGridView.MouseUp += MessagesDataGridViewMouseUp; - // Apply sorting so the messages added last will be on Top. - messagesBindingSource.Sort = "Id"; - messagesBindingSource.ApplySort(messagesBindingSource.SortProperty, ListSortDirection.Descending); ApplyFilter(); messagesDataGridView.CellFormatting += MessagesDataGridViewCellFormatting; @@ -101,7 +98,7 @@ { get { - return messageWindowData; + return Messages; } set {} } @@ -121,18 +118,19 @@ return; } - messageWindowData.Messages.BeginLoadData(); + Messages.BeginLoadData(); + try { MessageData msg; while (newMessages.TryDequeue(out msg)) { - messageWindowData.Messages.AddMessagesRow(msg.ImageName, msg.Time, msg.Message); + Messages.Rows.Add(msg.ImageName, msg.Time, msg.Message); } } finally { - messageWindowData.Messages.EndLoadData(); + Messages.EndLoadData(); } if (messagesDataGridView.Rows.Count > 0) @@ -192,7 +190,7 @@ private void MessagesDataGridViewCellFormatting(object sender, DataGridViewCellFormattingEventArgs e) { - if (e.ColumnIndex != 0 || e.Value == null) + if (e.ColumnIndex != levelColumnDataGridViewTextBoxColumn.Index || e.Value == null) { return; } @@ -220,21 +218,22 @@ private string CreateLoggingLevelDataGridViewFilter() { var filterlines = new List(); + var filterFormat = string.Format("{0} = '{{0}}'", levelColumn.ColumnName); if (buttonShowInfo.Checked) { - filterlines.Add(string.Format("Image = '{0}'", Level.Info)); + filterlines.Add(string.Format(filterFormat, Level.Info)); } if (buttonShowWarning.Checked) { - filterlines.Add(string.Format("Image = '{0}'", Level.Warn)); + filterlines.Add(string.Format(filterFormat, Level.Warn)); } if (buttonShowError.Checked) { - filterlines.Add(string.Format("Image = '{0}'", Level.Error)); - filterlines.Add(string.Format("Image = '{0}'", Level.Fatal)); + filterlines.Add(string.Format(filterFormat, Level.Error)); + filterlines.Add(string.Format(filterFormat, Level.Fatal)); } return filterlines.Count == 0 ? - "Image = 'NOTHING SHOWN'" : + string.Format(filterFormat, "NOTHING SHOWN") : string.Join(" OR ", filterlines); } @@ -263,7 +262,7 @@ return; } - var messageWindowDialog = new MessageWindowDialog(dialogParent, (string) messagesDataGridView.CurrentRow.Cells[messageDataGridViewTextBoxColumn.Index].Value); + var messageWindowDialog = new MessageWindowDialog(dialogParent, (string) messagesDataGridView.CurrentRow.Cells[messageColumnDataGridViewTextBoxColumn.Index].Value); messageWindowDialog.ShowDialog(); } @@ -288,7 +287,7 @@ public void Clear() { - messageWindowData.Clear(); + Messages.Clear(); } #endregion Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx =================================================================== diff -u -rce9283562cfceedb1933f67ee8a0c3b344331a8f -r732e6ecce60a2e6122063e81449f5e083543c547 --- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision ce9283562cfceedb1933f67ee8a0c3b344331a8f) +++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision 732e6ecce60a2e6122063e81449f5e083543c547) @@ -152,94 +152,93 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS - FAAAAk1TRnQBSQFMAgEBBAEAAegBAAHoAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEOAVABFwH/ - AQ4BSAEOAf8kAAMZASMCRQFHAX0BSwFVAYgB2wE5AUwBqgHzATgBTAGoAfMBSQFUAYUB2wJFAUcBfQMZ - ASMgAAMZASMBRwJGAX0BhQFqAV4B2wGeAXABXQHzAZsBcAFdAfMBgQFqAV4B2wFHAkYBfQMZASMQAAFP - AVcBWwGiASoBpwHgAf8BKAGkAd8B/wEmAaEB3QH/ASQBngHcAf8BIgGbAdoB/wEgAZgB2QH/AR0BkwHW - Af8BGAGMAdMB/wETAYUBzwH/AQ4BewHMAf8BCgF0AckB/wEGAW4BxgH/AQMBaQHDAf8BAAFlAcEB/wFL - AVIBWQGiIAABFwFZARcB/wEOAVABFwH/AQ4BUAEXAf8gAAMzAVMBSgFYAZwB5gFPAWEB1AH/AYQBkAHn - Af8BlQGgAe4B/wGVAZ8B7QH/AYMBjgHlAf8BSQFaAc4B/wFBAU8BlAHmAzMBUxgAAzMBUwGWAXEBXwHm - AdoBqAF8Af8B/QHfAbsC/wHrAc4C/wHrAc4B/wH6AdwBuAH/AdMBogF3Af8BiwFsAV8B5gMzAVMMAAFJ - AYYBoQHjAb4B4wH1Af8B9AH8Af4B/wHvAfsB/gH/Ae4B+wH+Af8B7gH7Af4B/wHvAfwB/gH/Ae8B/AH+ - Af8B7wH7Af4B/wHuAfsB/gH/Ae0B+wH+Af8B7QH7Af4B/wHsAfsB/gH/AfIB/AH+Af8BqwHOAesB/wE9 - AWEBgwHYFAABHwGBAR8B/wEXAWEBHwH/ARcBYQEXAf8BFwFZARcB/wEXAVkBFwH/IAADMwFTAUMBVwG4 - AfQBcgGEAeMB/wGhAawB9AH/AXwBiwHsAf8BWQFkAeQB/wFYAWMB4wH/AXoBhwHqAf8BnwGoAfEB/wFs - AXkB3QH/ATQBSAGnAfQDMwFTEAADMwFTAa8BdwFZAfQB8wHPAaUC/wHjAccB/wHrAcQBnwH/Ad4BsgGK - Af8B3AGuAYgB/wHmAb4BmgH/AfkB2wG/Af8B7QHLAZ8B/wGbAXABXQH0AzMBUwgAAzABSwFfAb8B6AH/ - AfQB/AH+Af8BtQHvAfoB/wFVAdoB9QH/AVUB2gH1Af8BVAHYAfMB/wFVAdcB8gH/AVUB1gHyAf8BVAHZ - AfQB/wFOAdgB9QH/AUsB1wH0Af8BXwHaAfYB/wHqAfsB/gH/AUEBkwHSAf8DMAFLEAABHwGBAR8B/wEf - AYEBHwH/AWEBpQGBAf8BYQGlAYEB/wEfAYEBHwH/ARcBWQEXAf8BFwFhAR8B/wEXAVkBFwH/AQ4BUAEX - Af8BDgFQARcB/wEOAVABFwH/CAADGAEiAVMBXgGhAeUBdQGIAeYB/wGjAbAB9QH/AVQBZAHnAf8BUwFi - AeYB/wGJAZIB7QH/AYgBkgHsAf8BUAFcAeIB/wFPAVoB4QH/AZ8BqQHyAf8BbAF6Ad0B/wFFAVEBlAHl - AxgBIggAAxgBIgGeAXsBXgHlAfcB0gGpAv8B5AHKAf8B5gG5AY4B/wHiAbQBigH/Ad8BsQGHAf8B2wGs - AYYB/wHZAasBhQH/AdgBqwGEAf8B9QHSAbUB/wHuAc0BoQH/AY0BbgFeAeUDGAEiCAABUQFyAX4BygGd - AdcB8QH/AecB+QH9Af8BiwHlAfgB/wFXAdsB9gH/AVgB2gH0Af8BOgGhAdUB/wE6AaEB1QH/AVEB1gHy - Af8BTwHYAfUB/wFNAdYB9AH/AdgB9gH8Af8BiAG/AeUB/wFMAVoBZQG0EAABHwGEAScB/wEXAYEBFwH/ - AZQBxgGcAf8BYQGtAYQB/wFAAZwBWQH/AWEBrQGEAf8BgQGlAYEB/wEXAWEBFwH/ARcBYQEfAf8BFwFZ - ARcB/wEXAVkBFwH/DAACRgFIAX4BXQFwAeAB/wGkAbMB9wH/AVcBawHrAf8BVgFpAeoB/wFVAWYB6An/ - AVIBXwHlAf8BUQFeAeMB/wFQAVwB4gH/AZ8BqQHyAf8BTQFeAdEB/wFFAUYBRwF+CAABSAFHAUYBfgHn - AbkBhgL/AeoB0AH/Ae0BvgGUAf8B6gG5AZEC/wHzAeAL/wH4Af8B3AGtAYYB/wHbAa0BhgH/AfwB3QHB - Af8B1gGjAXsB/wFHAkYBfggAAxoBJAEyAaYB1wH7AfMB+wH+Af8BwwHyAfsB/wFZAdwB9gH/AVkB2gH0 - Af8BYQHfAfYB/wFUAcsB6wH/AVIB1gHyAf8BUQHZAfUB/wGUAecB+AH/AeMB9AH7Af8BHgGEAb8B+QMa - ASQMAAEnAZQBLwH/AR8BjAEnAf8BgQG1AYQB/wFAAZwBSAH/AYEBtQGMAf8BQAGlAWEB/wFAAZwBWQH/ - AWEBrQGEAf8BJwGBAS8B/wEXAWEBFwH/ARcBYQEfAf8QAAFZAWQBlQHbAY4BnwHwAf8BhAGZAfQB/wFZ - AXAB7gH/AVgBbQHsAf8BVwFrAesB/wGQAZ0B8QH/AaYBrwHzAf8BVAFkAecB/wFTAWIB5gH/AVIBXwHl - Af8BegGJAesB/wGFAZEB5wH/AUwBVgGKAdsIAAGVAXwBXgHbAf8B5AHEAf8B/QHVAbEB/wHvAcABlAH/ - AesBvQGRAf8B6QG7AY8D/wH7Bf8B4wGzAYsB/wHhAbIBiwH/AeABsgGKAf8B7QHFAaAB/wH6AeABuwH/ - AYMBagFeAdsMAAFQAVwBYAGqAYwB0gHwAf8B6gH7Af4B/wGUAeYB+AH/AVkB2gH0Af8BRAGxAd0B/wE6 - AaEB1QH/AVMB1wHyAf8BWQHbAfUB/wHeAfgB/QH/AXoBwAHnAf8BSAFKAUsBhxAAAScBlAEvAf8BWQGt - AWEB/wGBAb0BlAH/ATgBpQFQAf8BQAGcAUgB/wGBAbUBjAH/AUABpQFhAf8BQAGcAVkB/wFhAa0BhAH/ - AWEBpQFhAf8BFwFhAR8B/wEXAWEBHwH/BAABFwFZARcB/wQAAVcBaQHMAfYBoAGzAfcB/wFiAYAB8gH/ - AVwBdQHwAf8BWgFzAe8B/wFZAXAB7gH/AdMB2QH6Bf8BVgFpAeoB/wFVAWYB6AH/AVQBZAHnAf8BWgFp - AecB/wGZAaUB8QH/ATkBTQGzAfYIAAHLAZcBXQH2Af8B7wHXAf8B+AHKAZ4B/wHtAcEBkwH/AewBvwGS - Af8B7AG+AZED/wH8Bf8B5wG4AY4B/wHmAbcBjQH/AeYBtwGMAf8B5gG6AZEC/wHuAdIB/wGoAXIBXAH2 - DAADCQEMAUYBlQG1AewByAHqAfcB/wHmAfoB/QH/AVoB2gH0Af8BOgGhAdUB/wE6AaEB1QH/AVQB1wHy - Af8BxwHzAfwB/wHAAeMB9AH/AUEBfgGfAeQDCQEMEAABJwGcAS8B/wFIAa0BUAH/AWEBvQGMAf8BQAGl - AWEB/wE4AZwBUAH/AUABpQFIAf8BhAG9AZwB/wFIAaUBYQH/AUABnAFZAf8BhAG9AZwB/wEfAYEBHwH/ - ARcBgQEfAf8BFwFhAR8B/wEXAWEBFwH/BAABWwFwAdAB9gGhAbYB+AH/AWQBhAH0Af8BXQF5AfMB/wFc - AXcB8QH/AVwBdQHwCf8BWAFtAewB/wFXAWsB6wH/AVYBaQHqAf8BXAFsAekB/wGbAagB8QH/AUABUQG2 - AfYIAAHQAZwBYgH2Af8B8QHYAf8B+AHLAaIB/wH0AcUBmQH/Ae8BwgGUAf8B7QHAAZMJ/wHrAb4BkQH/ - AekBvAGQAf8B6gG8AZAB/wHrAcABlQL/Ae0B0wH/AasBdQFcAfYQAAM3AVoBbgHIAe0B/wH5Af4C/wFb - AdwB9AH/ATsBogHVAf8BOwGiAdUB/wFZAdkB9AH/Ae0B+wH+Af8BZQG7AeUB/wM3AVoQAAEnAaUBLwH/ - AScBpQEvAf8BJwGcAS8B/wGUAc4BrQH/AVABtQGBAf8BSAGtAYEB/wE4AZwBUAH/AUABpQFIAf8BhAG9 - AZwB/wFIAaUBYQH/AYwBvQGcAf8BHwGBAR8B/wEfAYEBHwH/ARcBgQEfAf8IAAFfAWoBmQHbAZEBpgHz - Af8BiAGhAfgB/wFfAYAB9AH/AV4BewHzAf8BXQF5AfMJ/wFaAXMB7wH/AVkBcAHuAf8BWAFtAewB/wGC - AZMB8QH/AYkBmAHsAf8BUQFaAY8B2wgAAZoBgwFjAdsB/wHkAccC/wHbAbsB/wH3AcgBnQH/AfUBxgGa - Af8B8wHEAZkC/wHnAcsC/wHnAcoB/wHtAcEBkwH/Ae0BwQGTAf8B7AHAAZMB/wH5AdMBrQL/AeIBvwH/ - AYoBagFeAdsUAAFRAX0BjQHUAakB3wH0Af8B7QH5Af0B/wE7AaMB1gH/ATsBowHWAf8B1AH1AfwB/wGi - AdcB8QH/AVABagF1AcMQAAEvAa0BLwH/AScBpQEvAf8BJwGlAS8B/wEvAaUBLwH/AUgBrQFQAf8BjAHO - AaUB/wFQAbUBhAH/AUgBrQGBAf8BOAGlAVAB/wFIAa0BUAH/AZwBzgGtAf8BjAG9AZQB/wEfAYQBHwH/ - ARcBUAEvAf8MAAJGAUgBfgFpAYEB7AH/AakBvQH7Af8BYAGCAfUB/wFfAYEB9QH/AV8BgAH0Cf8BXAF3 - AfEB/wFcAXUB8AH/AVoBcwHvAf8BpQG1AfgB/wFaAW0B3QH/AUUBRgFIAX4IAAFIAUcBRgF+AfUBxAGQ - Av8B8wHcAf8B/AHNAaIB/wH4AcgBnwH/AfcBxgGcCf8B8wHGAZkB/wHzAcUBmQH/AfUByQGfAv8B6AHN - Af8B4QGyAYMB/wFHAkYBfhQAAyEBMAE7AbQB4AH9AfkB/QL/AZQB6QH5Af8BngHrAfoB/wHsAfoB/gH/ - AS0BoQHTAfwDIQEwEAABLwG1ATgB/wEvAa0BLwH/CAABJwGlAS8B/wEvAaUBLwH/AZQBzgGtAf8BWQG9 - AYQB/wFIAa0BgQH/AVABtQGBAf8BLwGUAS8B/wEfAYwBJwH/AUgBpQFZAf8BFwFIATgB/wwAAxgBIgFl - AXMBsAHlAYMBlwHwAf8BqQG9AfsB/wFgAYIB9QH/AWABggH1Cf8BXgF7AfMB/wFdAXkB8wH/AaYBuQH5 - Af8BeAGNAeoB/wFUAWQBpAHlAxgBIggAAxgBIgGwAY8BaAHlAf8B2gG0Av8B8gHbAv8B0QGlAf8B+QHN - AaEC/wHsAdAC/wHrAdAB/wH4AcoBngH/AfkBzAGfAv8B5QHKAf8B+AHUAa0B/wGeAXkBXgHlAxgBIhgA - AVIBYwFpAbQBlAHYAfIB/wHzAfwB/gH/AecB+gH+Af8BjwHTAfAB/wFMAVIBVAGWIAABLwGtAS8B/wEn - Aa0BLwH/AS8BpQEvAf8BOAGtAUAB/wGcAdYBrQH/AaUB1gG9Af8BhAHGAYwB/wEfAYwBHwH/AUABtQFQ - Af8BnAHOAa0B/wEfAYwBJwH/AR8BhAEfAf8BHwGEAScB/wgAAzMBUwFlAXoB0wH0AYQBlwHxAf8BqQG9 - AfsB/wGKAaMB+AH/AWgBiQH2Af8BaAGJAfYB/wGJAaIB+AH/AagBvAH6Af8BfAGSAewB/wFSAWYBxQH0 - AzMBUxAAAzMBUwHTAaIBZwH0Af8B2gG0Av8B9QHgAv8B4gHFAv8B0wGtAv8B0QGqAv8B2wG5Av8B6gHT - Af8B/AHWAa4B/wG9AYkBXQH0AzMBUxwAAw0BEgFFAaMBxAHyAfEB+gH9Af8B1QHvAfoB/wFEAZUBtgHt - Aw0BEiAAAS8BtQE4Af8BLwGtAS8B/wQAAS8BrQEvAf8BJwGlAS8B/wEvAaUBLwH/AScBpQEvAf8BgQHG - AYEB/wGtAecBxgH/AVABjAGBAf8BJwFZAUAB/xQAAzMBUwFkAXMBswHmAWsBgwHuAf8BkgGmAfQB/wGg - AbQB+AH/AaABtAH4Af8BkQGmAfMB/wFlAXoB6QH/AVoBagGsAeYDMwFTGAABNAIzAVMBswGSAWkB5gH4 - AcgBkgL/AecByAL/Ae0B1gL/Ae0B1gL/AeQBxwH/AfABvwGKAf8BqQGFAWAB5gMzAVMkAAFNAVIBVAGV - AYUB1AHxAf8BggHRAfAB/wE9Aj4BaSQAAS8BtQE4Af8BLwG1AS8B/wgAAS8BrQEvAf8BJwGlAS8B/wE4 - AYEBWQH/AS8BhAFIAf8BJwGcAS8B/wEvAYEBUAH/HAADGQEjAkYBSAF9AWEBcAGeAdsBYAF3AdEB8wFf - AXQBzwHzAV8BagGaAdsCRgFIAX0DGQEjIAADGQEjAUgBRwFGAX0BngGFAWYB2wHPAaABagHzAc4BnwFk - AfMBmQGCAWMB2wFIAUcBRgF9AxkBIygAAwIBAwFRAX4BjwHUAVMBbwF3AcMDAgEDJAABLwG9ATgB/wwA - AS8BtQE4Af8BLwGtAS8B/wFAAYwBYQH/AS8BpQEvAf8BJwGlAS8B/+wAAS8BtQE4Af8BLwG1AS8B/wQA - AS8BrQEvAf8BJwGtAS8B/xAAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAf/ - AZ8B8AEPAfABDwIAAf8BHwHgAQcB4AEHAgAB+AE/AcABAwHAAQMCAAHwAQEBgAEBAYABAQGAAQEB4AED - AYABAQGAAQEBgAEBAcABBwGAAQEBgAEBAcABAwHAAQIBgAEBAYABAQHAAQMBwAEAAYABAQGAAQEB4AEH - AYABAQGAAQEBgAEBAfABDwEAAQMBgAEBAYABAQHwAQ8BMAEDAYABAQGAAQEB+AEfAeABAAHAAQMBwAED - AfgBHwHkAQMB4AEHAeABBwH8AT8B5gEHAfABDwHwAQ8B/AE/Ae4BDwb/Af4BTws= + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAM + FAAAAk1TRnQBSQFMAgEBBAEAAQgBAQEIAQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEKAUwBEwH/ + AQoBRAEKAf8kAAMZASMDRQF9AVgBWgFqAdsBQQFMAZMB8wFAAUwBkQHzAVcBWgFqAdsDRQF9AxkBIyAA + AxkBIwNFAX0BagFhAV4B2wGMAWwBXQHzAYgBbAFdAfMBagFhAV4B2wNFAX0DGQEjEAADUQGiASYBpwHg + Af8BJAGkAd8B/wEiAaEB3QH/ASABngHcAf8BHgGbAdoB/wEcAZgB2QH/ARkBkwHWAf8BFAGMAdMB/wEP + AYUBzwH/AQoBdwHMAf8BBgFwAckB/wECAWoBxgH/AQABZQHDAf8BAAFhAcEB/wNRAaIgAAETAVUBEwH/ + AQoBTAETAf8BCgFMARMB/yAAAzMBUwFWAVgBfAHmAUsBXQHUAf8BhAGQAecB/wGVAaAB7gH/AZUBnwHt + Af8BgwGOAeUB/wFFAVYBzgH/AVEBWAF4AeYDMwFTGAADMwFTAXkBaAFhAeYB2gGoAXgB/wH9Ad8BuwL/ + AesBzgL/AesBzgH/AfoB3AG4Af8B0wGiAXMB/wFzAWcBYQHmAzMBUwwAAVYBbQF7AeMBvgHjAfUB/wH0 + AfwB/gH/Ae8B+wH+Af8B7gH7Af4B/wHuAfsB/gH/Ae8B/AH+Af8B7wH8Af4B/wHvAfsB/gH/Ae4B+wH+ + Af8B7QH7Af4B/wHtAfsB/gH/AewB+wH+Af8B8gH8Af4B/wGrAc4B6wH/AVUBXgFnAdgUAAEbAYEBGwH/ + ARMBXQEbAf8BEwFdARMB/wETAVUBEwH/ARMBVQETAf8gAAMzAVMBSAFTAZwB9AFuAYQB4wH/AaEBrAH0 + Af8BeAGLAewB/wFVAWAB5AH/AVQBXwHjAf8BdgGHAeoB/wGfAagB8QH/AWgBdQHdAf8BPgFQAZIB9AMz + AVMQAAMzAVMBlgFtAVUB9AHzAc8BpQL/AeMBxwH/AesBxAGfAf8B3gGyAYoB/wHcAa4BiAH/AeYBvgGa + Af8B+QHbAb8B/wHtAcsBnwH/AYsBZgFdAfQDMwFTCAADMAFLAVsBvwHoAf8B9AH8Af4B/wG1Ae8B+gH/ + AVEB2gH1Af8BUQHaAfUB/wFQAdgB8wH/AVEB1wHyAf8BUQHWAfIB/wFQAdkB9AH/AUoB2AH1Af8BRwHX + AfQB/wFbAdoB9gH/AeoB+wH+Af8BPQGTAdIB/wMwAUsQAAEbAYEBGwH/ARsBgQEbAf8BXQGlAYEB/wFd + AaUBgQH/ARsBgQEbAf8BEwFVARMB/wETAV0BGwH/ARMBVQETAf8BCgFMARMB/wEKAUwBEwH/AQoBTAET + Af8IAAMYASIBWQFeAX8B5QFxAYgB5gH/AaMBsAH1Af8BUAFgAecB/wFPAV4B5gH/AYkBkgHtAf8BiAGS + AewB/wFMAVgB4gH/AUsBVgHhAf8BnwGpAfIB/wFoAXYB3QH/AVQBWAF5AeUDGAEiCAADGAEiAXwBbAFe + AeUB9wHSAakC/wHkAcoB/wHmAbkBjgH/AeIBtAGKAf8B3wGxAYcB/wHbAawBhgH/AdkBqwGFAf8B2AGr + AYQB/wH1AdIBtQH/Ae4BzQGhAf8BdgFlAV4B5QMYASIIAAFaAV8BYQHKAZ0B1wHxAf8B5wH5Af0B/wGL + AeUB+AH/AVMB2wH2Af8BVAHaAfQB/wE2AaEB1QH/ATYBoQHVAf8BTQHWAfIB/wFLAdgB9QH/AUkB1gH0 + Af8B2AH2AfwB/wGIAb8B5QH/AVUCVgG0EAABGwGEASMB/wETAYEBEwH/AZQBxgGcAf8BXQGtAYQB/wE8 + AZwBVQH/AV0BrQGEAf8BgQGlAYEB/wETAV0BEwH/ARMBXQEbAf8BEwFVARMB/wETAVUBEwH/DAADRgF+ + AVkBbAHgAf8BpAGzAfcB/wFTAWcB6wH/AVIBZQHqAf8BUQFiAegJ/wFOAVsB5QH/AU0BWgHjAf8BTAFY + AeIB/wGfAakB8gH/AUkBWgHRAf8BRQJGAX4IAANGAX4B5wG5AYYC/wHqAdAB/wHtAb4BlAH/AeoBuQGR + Av8B8wHgC/8B+AH/AdwBrQGGAf8B2wGtAYYB/wH8Ad0BwQH/AdYBowF3Af8DRgF+CAADGgEkATIBmgHI + AfsB8wH7Af4B/wHDAfIB+wH/AVUB3AH2Af8BVQHaAfQB/wFdAd8B9gH/AVABywHrAf8BTgHWAfIB/wFN + AdkB9QH/AZQB5wH4Af8B4wH0AfsB/wEkAYABsAH5AxoBJAwAASMBlAErAf8BGwGMASMB/wGBAbUBhAH/ + ATwBnAFEAf8BgQG1AYwB/wE8AaUBXQH/ATwBnAFVAf8BXQGtAYQB/wEjAYEBKwH/ARMBXQETAf8BEwFd + ARsB/xAAAVoBXwFwAdsBjgGfAfAB/wGEAZkB9AH/AVUBbAHuAf8BVAFpAewB/wFTAWcB6wH/AZABnQHx + Af8BpgGvAfMB/wFQAWAB5wH/AU8BXgHmAf8BTgFbAeUB/wF2AYkB6wH/AYUBkQHnAf8BWAFaAWsB2wgA + AXABZgFeAdsB/wHkAcQB/wH9AdUBsQH/Ae8BwAGUAf8B6wG9AZEB/wHpAbsBjwP/AfsF/wHjAbMBiwH/ + AeEBsgGLAf8B4AGyAYoB/wHtAcUBoAH/AfoB4AG7Af8BagFhAV4B2wwAA1MBqgGMAdIB8AH/AeoB+wH+ + Af8BlAHmAfgB/wFVAdoB9AH/AUABsQHdAf8BNgGhAdUB/wFPAdcB8gH/AVUB2wH1Af8B3gH4Af0B/wF2 + AcAB5wH/AUgCSQGHEAABIwGUASsB/wFVAa0BXQH/AYEBvQGUAf8BNAGlAUwB/wE8AZwBRAH/AYEBtQGM + Af8BPAGlAV0B/wE8AZwBVQH/AV0BrQGEAf8BXQGlAV0B/wETAV0BGwH/ARMBXQEbAf8EAAETAVUBEwH/ + BAABVwFiAa4B9gGgAbMB9wH/AV4BgAHyAf8BWAFxAfAB/wFWAW8B7wH/AVUBbAHuAf8B0wHZAfoF/wFS + AWUB6gH/AVEBYgHoAf8BUAFgAecB/wFWAWUB5wH/AZkBpQHxAf8BQQFJAZwB9ggAAa4BiQFdAfYB/wHv + AdcB/wH4AcoBngH/Ae0BwQGTAf8B7AG/AZIB/wHsAb4BkQP/AfwF/wHnAbgBjgH/AeYBtwGNAf8B5gG3 + AYwB/wHmAboBkQL/Ae4B0gH/AZMBZwFcAfYMAAMJAQwBUQF9AY8B7AHIAeoB9wH/AeYB+gH9Af8BVgHa + AfQB/wE2AaEB1QH/ATYBoQHVAf8BUAHXAfIB/wHHAfMB/AH/AcAB4wH0Af8BUQFqAXoB5AMJAQwQAAEj + AZwBKwH/AUQBrQFMAf8BXQG9AYwB/wE8AaUBXQH/ATQBnAFMAf8BPAGlAUQB/wGEAb0BnAH/AUQBpQFd + Af8BPAGcAVUB/wGEAb0BnAH/ARsBgQEbAf8BEwGBARsB/wETAV0BGwH/ARMBXQETAf8EAAFbAWQBsgH2 + AaEBtgH4Af8BYAGEAfQB/wFZAXUB8wH/AVgBcwHxAf8BWAFxAfAJ/wFUAWkB7AH/AVMBZwHrAf8BUgFl + AeoB/wFYAWgB6QH/AZsBqAHxAf8BSAFNAaAB9ggAAbIBjQFiAfYB/wHxAdgB/wH4AcsBogH/AfQBxQGZ + Af8B7wHCAZQB/wHtAcABkwn/AesBvgGRAf8B6QG8AZAB/wHqAbwBkAH/AesBwAGVAv8B7QHTAf8BlgFr + AVwB9hAAAzcBWgFqAcgB7QH/AfkB/gL/AVcB3AH0Af8BNwGiAdUB/wE3AaIB1QH/AVUB2QH0Af8B7QH7 + Af4B/wFhAbsB5QH/AzcBWhAAASMBpQErAf8BIwGlASsB/wEjAZwBKwH/AZQBzgGtAf8BTAG1AYEB/wFE + Aa0BgQH/ATQBnAFMAf8BPAGlAUQB/wGEAb0BnAH/AUQBpQFdAf8BjAG9AZwB/wEbAYEBGwH/ARsBgQEb + Af8BEwGBARsB/wgAAV8BYQFxAdsBkQGmAfMB/wGIAaEB+AH/AVsBgAH0Af8BWgF3AfMB/wFZAXUB8wn/ + AVYBbwHvAf8BVQFsAe4B/wFUAWkB7AH/AYIBkwHxAf8BiQGYAewB/wJaAXAB2wgAAXEBagFfAdsB/wHk + AccC/wHbAbsB/wH3AcgBnQH/AfUBxgGaAf8B8wHEAZkC/wHnAcsC/wHnAcoB/wHtAcEBkwH/Ae0BwQGT + Af8B7AHAAZMB/wH5AdMBrQL/AeIBvwH/AWsBYQFeAdsUAAFbAWUBaQHUAakB3wH0Af8B7QH5Af0B/wE3 + AaMB1gH/ATcBowHWAf8B1AH1AfwB/wGiAdcB8QH/AVkBWwFdAcMQAAErAa0BKwH/ASMBpQErAf8BIwGl + ASsB/wErAaUBKwH/AUQBrQFMAf8BjAHOAaUB/wFMAbUBhAH/AUQBrQGBAf8BNAGlAUwB/wFEAa0BTAH/ + AZwBzgGtAf8BjAG9AZQB/wEbAYQBGwH/ARMBTAErAf8MAANGAX4BZQGBAewB/wGpAb0B+wH/AVwBggH1 + Af8BWwGBAfUB/wFbAYAB9An/AVgBcwHxAf8BWAFxAfAB/wFWAW8B7wH/AaUBtQH4Af8BVgFpAd0B/wFF + AkYBfggAA0YBfgH1AcQBkAL/AfMB3AH/AfwBzQGiAf8B+AHIAZ8B/wH3AcYBnAn/AfMBxgGZAf8B8wHF + AZkB/wH1AckBnwL/AegBzQH/AeEBsgGDAf8DRgF+FAADIQEwAT8BsAHUAf0B+QH9Av8BlAHpAfkB/wGe + AesB+gH/AewB+gH+Af8BKwGVAccB/AMhATAQAAErAbUBNAH/ASsBrQErAf8IAAEjAaUBKwH/ASsBpQEr + Af8BlAHOAa0B/wFVAb0BhAH/AUQBrQGBAf8BTAG1AYEB/wErAZQBKwH/ARsBjAEjAf8BRAGlAVUB/wET + AUQBNAH/DAADGAEiAWUBZwGGAeUBgwGXAfAB/wGpAb0B+wH/AVwBggH1Af8BXAGCAfUJ/wFaAXcB8wH/ + AVkBdQHzAf8BpgG5AfkB/wF0AY0B6gH/AVkBZAF/AeUDGAEiCAADGAEiAYYBdgFlAeUB/wHaAbQC/wHy + AdsC/wHRAaUB/wH5Ac0BoQL/AewB0AL/AesB0AH/AfgBygGeAf8B+QHMAZ8C/wHlAcoB/wH4AdQBrQH/ + AXwBbAFeAeUDGAEiGAABVQJWAbQBlAHYAfIB/wHzAfwB/gH/AecB+gH+Af8BjwHTAfAB/wFNAk4BliAA + ASsBrQErAf8BIwGtASsB/wErAaUBKwH/ATQBrQE8Af8BnAHWAa0B/wGlAdYBvQH/AYQBxgGMAf8BGwGM + ARsB/wE8AbUBTAH/AZwBzgGtAf8BGwGMASMB/wEbAYQBGwH/ARsBhAEjAf8IAAMzAVMBZQFyAbAB9AGE + AZcB8QH/AakBvQH7Af8BigGjAfgB/wFkAYkB9gH/AWQBiQH2Af8BiQGiAfgB/wGoAbwB+gH/AXgBkgHs + Af8BUgFlAacB9AMzAVMQAAMzAVMBsAGOAWUB9AH/AdoBtAL/AfUB4AL/AeIBxQL/AdMBrQL/AdEBqgL/ + AdsBuQL/AeoB0wH/AfwB1gGuAf8BogF7AV0B9AMzAVMcAAMNARIBSgGOAaMB8gHxAfoB/QH/AdUB7wH6 + Af8BUAF/AZAB7QMNARIgAAErAbUBNAH/ASsBrQErAf8EAAErAa0BKwH/ASMBpQErAf8BKwGlASsB/wEj + AaUBKwH/AYEBxgGBAf8BrQHnAcYB/wFMAYwBgQH/ASMBVQE8Af8UAAMzAVMBYQFpAYQB5gFnAYMB7gH/ + AZIBpgH0Af8BoAG0AfgB/wGgAbQB+AH/AZEBpgHzAf8BYQF2AekB/wFaAWYBgwHmAzMBUxgAAzMBUwGE + AXgBZAHmAfgByAGSAv8B5wHIAv8B7QHWAv8B7QHWAv8B5AHHAf8B8AG/AYoB/wGDAXIBYQHmAzMBUyQA + AU0CTgGVAYUB1AHxAf8BggHRAfAB/wM9AWkkAAErAbUBNAH/ASsBtQErAf8IAAErAa0BKwH/ASMBpQEr + Af8BNAGBAVUB/wErAYQBRAH/ASMBnAErAf8BKwGBAUwB/xwAAxkBIwNFAX0BXwFjAXQB2wFfAW8BrQHz + AV8BbgGrAfMBXwFhAXEB2wNFAX0DGQEjIAADGQEjA0UBfQF0AWoBXwHbAasBjAFiAfMBqgGMAV8B8wFx + AWoBXwHbA0UBfQMZASMoAAMCAQMBWwFlAWkB1AFZAl0BwwMCAQMkAAErAb0BNAH/DAABKwG1ATQB/wEr + Aa0BKwH/ATwBjAFdAf8BKwGlASsB/wEjAaUBKwH/7AABKwG1ATQB/wErAbUBKwH/BAABKwGtASsB/wEj + Aa0BKwH/EAABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4EAB/8BnwHwAQ8B8AEP + AgAB/wEfAeABBwHgAQcCAAH4AT8BwAEDAcABAwIAAfABAQGAAQEBgAEBAYABAQHgAQMBgAEBAYABAQGA + AQEBwAEHAYABAQGAAQEBwAEDAcABAgGAAQEBgAEBAcABAwHAAQABgAEBAYABAQHgAQcBgAEBAYABAQGA + AQEB8AEPAQABAwGAAQEBgAEBAfABDwEwAQMBgAEBAYABAQH4AR8B4AEAAcABAwHAAQMB+AEfAeQBAwHg + AQcB4AEHAfwBPwHmAQcB8AEPAfABDwH8AT8B7gEPBv8B/gFPCw== @@ -325,38 +324,29 @@ 2 - - - - - 19 - - + True - - "Id" + + - - False + + 20 - - 41 - - + Tijd - - 49 + + 50 - + Bericht 401, 17 - 17, 17 + 40, 17 Fill @@ -454,42 +444,60 @@ System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Id + + messagesBindingSource - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - imageDataGridViewTextBoxColumn + + messageWindowData - - System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Data.DataSet, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - timeDataGridViewTextBoxColumn + + Messages - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Data.DataTable, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - messageDataGridViewTextBoxColumn + + levelColumn - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - messagesBindingSource + + timeColumn - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - messageWindowData + + messageColumn - - Core.Common.Gui.Forms.MessageWindow.MessageWindowData, Core.Common.Gui, Version=0.5.0.3495, Culture=neutral, PublicKeyToken=null + + System.Data.DataColumn, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + levelColumnDataGridViewTextBoxColumn + + + System.Windows.Forms.DataGridViewImageColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + timeColumnDataGridViewTextBoxColumn + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + messageColumnDataGridViewTextBoxColumn + + + System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + MessageWindow Fisheye: Tag 732e6ecce60a2e6122063e81449f5e083543c547 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowData.Designer.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 732e6ecce60a2e6122063e81449f5e083543c547 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowData.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 732e6ecce60a2e6122063e81449f5e083543c547 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowData.xsc'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 732e6ecce60a2e6122063e81449f5e083543c547 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowData.xsd'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 732e6ecce60a2e6122063e81449f5e083543c547 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/Forms/MessageWindow/MessageWindowData.xss'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs =================================================================== diff -u -re50fb8e657dd3b1aef55b0a5e327d2064a1efa3f -r732e6ecce60a2e6122063e81449f5e083543c547 --- Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision e50fb8e657dd3b1aef55b0a5e327d2064a1efa3f) +++ Core/Common/test/Core.Common.Gui.Test/Forms/MessageWindow/MessageWindowTest.cs (.../MessageWindowTest.cs) (revision 732e6ecce60a2e6122063e81449f5e083543c547) @@ -1,4 +1,5 @@ using System; +using System.Data; using System.Windows.Forms; using Core.Common.Gui.Forms.MessageWindow; @@ -48,7 +49,7 @@ Assert.IsInstanceOf(messageWindow); Assert.IsInstanceOf(messageWindow); Assert.AreEqual("Berichten", messageWindow.Text); - Assert.IsInstanceOf(messageWindow.Data); + Assert.IsInstanceOf(messageWindow.Data); Assert.AreSame(messageWindow, MessageWindowLogAppender.Instance.MessageWindow); }