Index: src/Common/DelftTools.Shell.Gui/Forms/IMessageWindow.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/Common/DelftTools.Shell.Gui/Forms/IMessageWindow.cs (.../IMessageWindow.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/Common/DelftTools.Shell.Gui/Forms/IMessageWindow.cs (.../IMessageWindow.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -12,10 +12,8 @@ /// /// /// - /// /// - /// - void AddMessage(Level level, DateTime time, string source, string message, string exception); + void AddMessage(Level level, DateTime time, string message); /// /// Clears all messages in the window. Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.Designer.cs =================================================================== diff -u -r433c2b901dad8cbc093580926a2289a7b5930dbc -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision 433c2b901dad8cbc093580926a2289a7b5930dbc) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.Designer.cs (.../MessageWindow.Designer.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -37,9 +37,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MessageWindow)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = 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 dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.buttonCopy = new System.Windows.Forms.ToolStripMenuItem(); this.cToolStripMenuItem = new System.Windows.Forms.ToolStripSeparator(); @@ -60,8 +59,6 @@ this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.sourceDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Exception = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.contextMenu.SuspendLayout(); this.toolStrip2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.messagesDataGridView)).BeginInit(); @@ -187,19 +184,17 @@ this.imageDataGridViewTextBoxColumn, this.Id, this.timeDataGridViewTextBoxColumn, - this.messageDataGridViewTextBoxColumn, - this.sourceDataGridViewTextBoxColumn, - this.Exception}); + this.messageDataGridViewTextBoxColumn}); this.messagesDataGridView.ContextMenuStrip = this.contextMenu; this.messagesDataGridView.DataSource = this.messagesBindingSource; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.messagesDataGridView.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.messagesDataGridView.DefaultCellStyle = dataGridViewCellStyle2; resources.ApplyResources(this.messagesDataGridView, "messagesDataGridView"); this.messagesDataGridView.Name = "messagesDataGridView"; this.messagesDataGridView.ReadOnly = true; @@ -255,24 +250,6 @@ this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn"; this.messageDataGridViewTextBoxColumn.ReadOnly = true; // - // sourceDataGridViewTextBoxColumn - // - this.sourceDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.sourceDataGridViewTextBoxColumn.DataPropertyName = "Source"; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.sourceDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; - this.sourceDataGridViewTextBoxColumn.FillWeight = 30F; - resources.ApplyResources(this.sourceDataGridViewTextBoxColumn, "sourceDataGridViewTextBoxColumn"); - this.sourceDataGridViewTextBoxColumn.Name = "sourceDataGridViewTextBoxColumn"; - this.sourceDataGridViewTextBoxColumn.ReadOnly = true; - // - // Exception - // - this.Exception.DataPropertyName = "Exception"; - resources.ApplyResources(this.Exception, "Exception"); - this.Exception.Name = "Exception"; - this.Exception.ReadOnly = true; - // // MessageWindow // resources.ApplyResources(this, "$this"); @@ -311,11 +288,10 @@ private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripButton buttonClearAllMessages; private ToolStripMenuItem showDetailsToolStripMenuItem; + private DataGridViewTextBoxColumn sourceDataGridViewTextBoxColumn; private DataGridViewImageColumn imageDataGridViewTextBoxColumn; private DataGridViewTextBoxColumn Id; private DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn; private DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn; - private DataGridViewTextBoxColumn sourceDataGridViewTextBoxColumn; - private DataGridViewTextBoxColumn Exception; } } \ No newline at end of file Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.cs (.../MessageWindow.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -23,9 +23,7 @@ { public string ImageName { get; set; } public DateTime Time { get; set; } - public string Source { get; set; } public string Message { get; set; } - public string Exception { get; set; } } private readonly Dictionary levelImageName; @@ -79,22 +77,6 @@ ApplyFilter(); messagesDataGridView.CellFormatting += MessagesDataGridViewCellFormatting; - if (log.IsDebugEnabled) - { - if (messagesDataGridView != null) - { - messagesDataGridView.Columns["Exception"].Visible = true; - messagesDataGridView.Columns["sourceDataGridViewTextBoxColumn"].Visible = true; - } - } - else - { - messagesDataGridView.Columns["Exception"].Visible = false; - messagesDataGridView.Columns["sourceDataGridViewTextBoxColumn"].Visible = false; - buttonShowDebug.Checked = false; - ApplyFilter(); - } - #endif Image = Resources.application_view_list; @@ -164,18 +146,12 @@ /// /// /// - /// - public void AddMessage(Level level, DateTime time, string source, string message, string exception) + public void AddMessage(Level level, DateTime time, string message) { - if (source.StartsWith("NHibernate")) - { - return; - } - #if !MONO newMessages.Add(new MessageData { - ImageName = level.ToString(), Time = time, Source = source, Exception = exception, Message = message + ImageName = level.ToString(), Time = time, Message = message }); #else if (messagesDataGridView != null && messagesDataGridView.Columns.Count != 0) @@ -249,9 +225,7 @@ newMessages.RemoveAt(0); if (newMessage != null) { - messageWindowData.Messages.AddMessagesRow(newMessage.ImageName, newMessage.Time, - newMessage.Source, newMessage.Message, - newMessage.Exception); + messageWindowData.Messages.AddMessagesRow(newMessage.ImageName, newMessage.Time, newMessage.Message); if (newMessage.ImageName == "ERROR" && Error != null) { @@ -510,8 +484,6 @@ private void ButtonShowDebugClick(object sender, EventArgs e) { buttonShowDebug.Checked = !buttonShowDebug.Checked; - messagesDataGridView.Columns["Exception"].Visible = buttonShowDebug.Checked; - messagesDataGridView.Columns["sourceDataGridViewTextBoxColumn"].Visible = buttonShowDebug.Checked; ApplyFilter(); } Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.resx =================================================================== diff -u -r433c2b901dad8cbc093580926a2289a7b5930dbc -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision 433c2b901dad8cbc093580926a2289a7b5930dbc) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindow.resx (.../MessageWindow.resx) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -159,62 +159,62 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAW - DgAAAk1TRnQBSQFMAgEBBAEAAXwBAAF8AQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA - AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEbAV0BJAH/ - ARsBVQEbAf/0AAEkAWYBJAH/ARsBXQEkAf8BGwFdASQB/ywAAbUBtgHOAf8BlAGaAbUB/wGcAZ4BtQH/ - AcYBwwHOAf8wAAG9AaIBlAH/Aa0BggFuAf8BpQGGAW4B/wGtAY4BgQH/AdYBxwG9Af9oAAEsAYEBLAH/ - ASQBbgEsAf8BJAFuASQB/wEkAWYBJAH/ASQBZgEkAf8oAAGUAaIBzgH/ATwBUAGlAf8BEwEzAaUB/wEL - AS8BrQH/AQsBKwGlAf8BEwEnAYQB/wFNAVABhAH/Ab0BvgHOAf8gAAHnAdcB1gH/AaUBhgGBAf8BvQG2 - Aa0B/wHnAu8B/wPnAf8BtQGeAZQB/wGcAYEBXQH/Ab0BngGMAf8B3gHPAcYB/xgAAYEBywHnAf8BCwGB - AZwB/wETAYEBnAH/ARMBgQGcAf8BEwGCAZwB/wETAYIBnAH/ARMBgQGcAf8BEwGBAZwB/wETAYEBnAH/ - ASQBkgGtAf8cAAEsAYEBLAH/ASwBgQEsAf8BbgGlAYEB/wFuAaUBgQH/ASwBgQEsAf8BJAFmASQB/wEk - AW4BLAH/ASQBZgEkAf8BGwFdASQB/wEbAV0BJAH/ARsBXQEkAf8QAAGMAZoBzgH/ARsBPwG1Af8BAwEz - Ac4B/wEDAS8B1gH/AQMBMwHWAf8BAwEzAdYB/wEDAS8BzgH/AQMBJwGtAf8BGwErAW4B/wG9Ab4BzgH/ - GAAB5wHXAc4B/wHGAaoBnBn/AaUBjgGEAf8BvQGeAYwB/xgAARMBsgHeAf8BCwHTAe8B/wEDAccB7wH/ - AQMB0wHvAf8BEwFUAWYB/wFmAWABgQH/AQMBzwHvAf8BAwG+Ae8B/wEDAdMB7wH/ARsBlgG1Af8YAAEs - AYQBNAH/ASQBgQEkAf8BlAHGAZwB/wFuAa0BhAH/AU0BnAFmAf8BbgGtAYQB/wGBAaUBgQH/ASQBbgEk - Af8BJAFuASwB/wEkAWYBJAH/ASQBZgEkAf8QAAG9AccB5wH/ASQBTAG9Af8BAwE3AecB/wETAUQB5wH/ - AQsBPwHeAf8BCwE/AdYB/wELATsBzgH/AQsBNwHGAf8BCwE3AcYB/wEDAScBpQH/AU0BUAGEAf8YAAG9 - AZYBhA3/AaUBNwELAf8BjAELAQMC/wH7AfcF/wHnA/8BlAGBAV0B/wHWAccBvQH/FAABPAHLAecB/wE0 - AfsC/wETAfMC/wEDAfMC/wEDAVwBXQH/ASQBTAFNAf8BAwHrAv8BAwHbAv8BEwHnAe8B/wE0AYYBnAH/ - FAABNAGUATwB/wEsAYwBNAH/AYEBtQGEAf8BTQGcAVUB/wGBAbUBjAH/AU0BpQFuAf8BTQGcAWYB/wFu - Aa0BhAH/ATQBgQE8Af8BJAFuASQB/wEkAW4BLAH/FAABgQGSAdYB/wETAUQB3gH/ARsBTAb/AaUBtgH3 - Af8BCwE/Ad4B/wGlAbYB9wX/AQsBNwHGAf8BAwEvAc4B/wETAScBhAH/AcYBwwHWAf8QAAHeAccBtQH/ - Ad4BywHGDf8BvQFcAUUB/wGcASMBAw3/Ab0BtgG1Af8BtQGSAYEB/xQAAYEB3wHvAf8BNAHTAecB/wFV - A/8BCwP/AQMB3wHvAf8BAwHPAecB/wEDAesC/wETAfMC/wEbAZ4BtQH/AYQBrgG9Af8UAAE0AZQBPAH/ - AWYBrQFuAf8BgQG9AZQB/wFFAaUBXQH/AU0BnAFVAf8BgQG1AYwB/wFNAaUBbgH/AU0BnAFmAf8BbgGt - AYQB/wFuAaUBbgH/ASQBbgEsAf8BJAFuASwB/wQAASQBZgEkAf8IAAFVAYEBzgH/ASwBZAL/ASwBZAL/ - AYQBngb/AZQBqgH3Bf8BgQGaAe8B/wELATsB1gH/AQMBMwHWAf8BCwErAZwB/wGcAZ4BtQH/EAAB1gGu - AZQB/wHvAecB3g3/AcYBcAFVAf8BpQE3ARMN/wHWAdcB3gH/AbUBkgGBAf8YAAE8Ac8B5wH/AYEB+wL/ - ATwD/wEkAY4BlAH/ATQBgQGEAf8BAwP/AQsB8wH3Af8BLAGGAZwB/xgAATQBnAE8Af8BVQGtAV0B/wFu - Ab0BjAH/AU0BpQFuAf8BRQGcAV0B/wFNAaUBVQH/AYQBvQGcAf8BVQGlAW4B/wFNAZwBZgH/AYQBvQGc - Af8BLAGBASwB/wEkAYEBLAH/ASQBbgEsAf8BJAFuASQB/wgAAVUBcAHWAf8BXQGCAv8BTQGBAv8BNAFo - Av8BvQHLBv8BtQHDAv8BCwFEAecB/wELAT8B3gH/AQMBNwHeAf8BCwEvAa0B/wGUAZoBtQH/EAABxgGi - AYwB/wH3AucN/wG9AVgBLAH/AaUBLwEDDf8B3gHfAecB/wG1AZIBgQH/GAABhAHfAe8B/wFFAdMB7wH/ - AYED/wE8AXABgQH/AVUBVAFmAf8BAwP/ARMBsgHGAf8BZgGaAa0B/xQAATQBpQE8Af8BNAGlATwB/wE0 - AZwBPAH/AZQBzgGtAf8BXQG1AYEB/wFVAa0BgQH/AUUBnAFdAf8BTQGlAVUB/wGEAb0BnAH/AVUBpQFu - Af8BjAG9AZwB/wEsAYEBLAH/ASwBgQEsAf8BJAGBASwB/wwAAW4BhgHeAf8BXQGCAfcB/wFuAZIC/wGl - AboG/wGcAbYG/wGEAZ4B9wH/AQsBRAHnAf8BAwEzAecB/wETATMBpQH/AbUBtgHOAf8QAAHOAaYBjAH/ - Ae8C5w3/AfcB6wHnEf8B1gHXAdYB/wGtAZIBgQH/HAABPAHLAecB/wGBAfcC/wFNATcBNAH/AU0CAwH/ - AQsD/wEsAYoBnAH/FAABPAGtATwB/wE0AaUBPAH/ATQBpQE8Af8BPAGlATwB/wFVAa0BXQH/AYwBzgGl - Af8BXQG1AYQB/wFVAa0BgQH/AUUBpQFdAf8BVQGtAV0B/wGcAc4BrQH/AYwBvQGUAf8BLAGEASwB/wEk - AV0BPAH/EAABpQGyAecB/wFVAYEB5wH/AYQBogb/AcYB0wL/AUUBcAL/Aa0Bvgb/ARMBSAHvAf8BAwE3 - Ad4B/wE8AVABpQH/FAAB7wHTAcYB/wHnAc8BvQ3/Ad4BrgGMAf8BxgGBAUUN/wGtAZIBhAH/Ac4BsgGl - Af8cAAGEAeMB9wH/ATwB2wHvAf8BVQGaAZQB/wEkAWwBbgH/ARMB0wHeAf8BTQGSAaUB/xQAATwBtQFF - Af8BPAGtATwB/wgAATQBpQE8Af8BPAGlATwB/wGUAc4BrQH/AWYBvQGEAf8BVQGtAYEB/wFdAbUBgQH/ - ATwBlAE8Af8BLAGMATQB/wFVAaUBZgH/ASQBVQFFAf8UAAFmAYIB3gH/AWYBhgHvAf8BjAGmAv8BhAGm - Av8BbgGSAv8BXQGCAv8BNAFoAv8BJAFYAfcB/wEbAUQBvQH/AZQBogHOAf8YAAHnAboBnAL/AfsB9wn/ - AdYBmgGBAf8BtQFcASQJ/wHWAccBvQH/AaUBgQFmAf8kAAE8AcsB5wH/AU0B9wL/ASwD/wEsAY4BpQH/ - JAABPAGtATwB/wE0Aa0BPAH/ATwBpQE8Af8BRQGtAU0B/wGcAdYBrQH/AaUB1gG9Af8BhAHGAYwB/wEs - AYwBLAH/AU0BtQFdAf8BnAHOAa0B/wEsAYwBNAH/ASwBhAEsAf8BLAGEATQB/xAAAWYBggHeAf8BVQGB - AecB/wFmAYoB9wH/AWYBjgL/AUUBgQL/ATwBaAHvAf8BLAFQAcYB/wGMAZoB1gH/IAAB7wHDAaUC/wHv - AecR/wHWAcMBtQH/AaUBggFuAf8B3gHLAcYB/yQAAZQB4wHvAf8BNAHXAe8B/wEsAesB7wH/AUUBkgGl - Af8kAAE8AbUBRQH/ATwBrQE8Af8EAAE8Aa0BPAH/ATQBpQE8Af8BPAGlATwB/wE0AaUBPAH/AYEBxgGB - Af8BrQHnAcYB/wFdAYwBgQH/ATQBZgFNAf8cAAGlAbIB5wH/AW4BhgHeAf8BVQFwAc4B/wFVAYEBzgH/ + DgAAAk1TRnQBSQFMAgEBBAEAAYQBAAGEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA + AwABIAMAAQEBAAEgBgABIP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wAHAAEaAVwBIwH/ + ARoBVAEaAf/0AAEjAWUBIwH/ARoBXAEjAf8BGgFcASMB/ywAAbUBtgHOAf8BlAGaAbUB/wGcAZ4BtQH/ + AcYBwwHOAf8wAAG9AaIBlAH/Aa0BggFtAf8BpQGGAW0B/wGtAY4BgQH/AdYBxwG9Af9oAAErAYEBKwH/ + ASMBbQErAf8BIwFtASMB/wEjAWUBIwH/ASMBZQEjAf8oAAGUAaIBzgH/ATsBTwGlAf8BEgEyAaUB/wEK + AS4BrQH/AQoBKgGlAf8BEgEmAYQB/wFMAU8BhAH/Ab0BvgHOAf8gAAHnAdcB1gH/AaUBhgGBAf8BvQG2 + Aa0B/wHnAu8B/wPnAf8BtQGeAZQB/wGcAYEBXAH/Ab0BngGMAf8B3gHPAcYB/xgAAYEBywHnAf8BCgGB + AZwB/wESAYEBnAH/ARIBgQGcAf8BEgGCAZwB/wESAYIBnAH/ARIBgQGcAf8BEgGBAZwB/wESAYEBnAH/ + ASMBkgGtAf8cAAErAYEBKwH/ASsBgQErAf8BbQGlAYEB/wFtAaUBgQH/ASsBgQErAf8BIwFlASMB/wEj + AW0BKwH/ASMBZQEjAf8BGgFcASMB/wEaAVwBIwH/ARoBXAEjAf8QAAGMAZoBzgH/ARoBPgG1Af8BAgEy + Ac4B/wECAS4B1gH/AQIBMgHWAf8BAgEyAdYB/wECAS4BzgH/AQIBJgGtAf8BGgEqAW0B/wG9Ab4BzgH/ + GAAB5wHXAc4B/wHGAaoBnBn/AaUBjgGEAf8BvQGeAYwB/xgAARIBsgHeAf8BCgHTAe8B/wECAccB7wH/ + AQIB0wHvAf8BEgFTAWUB/wFlAV8BgQH/AQIBzwHvAf8BAgG+Ae8B/wECAdMB7wH/ARoBlgG1Af8YAAEr + AYQBMwH/ASMBgQEjAf8BlAHGAZwB/wFtAa0BhAH/AUwBnAFlAf8BbQGtAYQB/wGBAaUBgQH/ASMBbQEj + Af8BIwFtASsB/wEjAWUBIwH/ASMBZQEjAf8QAAG9AccB5wH/ASMBSwG9Af8BAgE2AecB/wESAUMB5wH/ + AQoBPgHeAf8BCgE+AdYB/wEKAToBzgH/AQoBNgHGAf8BCgE2AcYB/wECASYBpQH/AUwBTwGEAf8YAAG9 + AZYBhA3/AaUBNgEKAf8BjAEKAQIC/wH7AfcF/wHnA/8BlAGBAVwB/wHWAccBvQH/FAABOwHLAecB/wEz + AfsC/wESAfMC/wECAfMC/wECAVsBXAH/ASMBSwFMAf8BAgHrAv8BAgHbAv8BEgHnAe8B/wEzAYYBnAH/ + FAABMwGUATsB/wErAYwBMwH/AYEBtQGEAf8BTAGcAVQB/wGBAbUBjAH/AUwBpQFtAf8BTAGcAWUB/wFt + Aa0BhAH/ATMBgQE7Af8BIwFtASMB/wEjAW0BKwH/FAABgQGSAdYB/wESAUMB3gH/ARoBSwb/AaUBtgH3 + Af8BCgE+Ad4B/wGlAbYB9wX/AQoBNgHGAf8BAgEuAc4B/wESASYBhAH/AcYBwwHWAf8QAAHeAccBtQH/ + Ad4BywHGDf8BvQFbAUQB/wGcASIBAg3/Ab0BtgG1Af8BtQGSAYEB/xQAAYEB3wHvAf8BMwHTAecB/wFU + A/8BCgP/AQIB3wHvAf8BAgHPAecB/wECAesC/wESAfMC/wEaAZ4BtQH/AYQBrgG9Af8UAAEzAZQBOwH/ + AWUBrQFtAf8BgQG9AZQB/wFEAaUBXAH/AUwBnAFUAf8BgQG1AYwB/wFMAaUBbQH/AUwBnAFlAf8BbQGt + AYQB/wFtAaUBbQH/ASMBbQErAf8BIwFtASsB/wQAASMBZQEjAf8IAAFUAYEBzgH/ASsBYwL/ASsBYwL/ + AYQBngb/AZQBqgH3Bf8BgQGaAe8B/wEKAToB1gH/AQIBMgHWAf8BCgEqAZwB/wGcAZ4BtQH/EAAB1gGu + AZQB/wHvAecB3g3/AcYBbwFUAf8BpQE2ARIN/wHWAdcB3gH/AbUBkgGBAf8YAAE7Ac8B5wH/AYEB+wL/ + ATsD/wEjAY4BlAH/ATMBgQGEAf8BAgP/AQoB8wH3Af8BKwGGAZwB/xgAATMBnAE7Af8BVAGtAVwB/wFt + Ab0BjAH/AUwBpQFtAf8BRAGcAVwB/wFMAaUBVAH/AYQBvQGcAf8BVAGlAW0B/wFMAZwBZQH/AYQBvQGc + Af8BKwGBASsB/wEjAYEBKwH/ASMBbQErAf8BIwFtASMB/wgAAVQBbwHWAf8BXAGCAv8BTAGBAv8BMwFn + Av8BvQHLBv8BtQHDAv8BCgFDAecB/wEKAT4B3gH/AQIBNgHeAf8BCgEuAa0B/wGUAZoBtQH/EAABxgGi + AYwB/wH3AucN/wG9AVcBKwH/AaUBLgECDf8B3gHfAecB/wG1AZIBgQH/GAABhAHfAe8B/wFEAdMB7wH/ + AYED/wE7AW8BgQH/AVQBUwFlAf8BAgP/ARIBsgHGAf8BZQGaAa0B/xQAATMBpQE7Af8BMwGlATsB/wEz + AZwBOwH/AZQBzgGtAf8BXAG1AYEB/wFUAa0BgQH/AUQBnAFcAf8BTAGlAVQB/wGEAb0BnAH/AVQBpQFt + Af8BjAG9AZwB/wErAYEBKwH/ASsBgQErAf8BIwGBASsB/wwAAW0BhgHeAf8BXAGCAfcB/wFtAZIC/wGl + AboG/wGcAbYG/wGEAZ4B9wH/AQoBQwHnAf8BAgEyAecB/wESATIBpQH/AbUBtgHOAf8QAAHOAaYBjAH/ + Ae8C5w3/AfcB6wHnEf8B1gHXAdYB/wGtAZIBgQH/HAABOwHLAecB/wGBAfcC/wFMATYBMwH/AUwCAgH/ + AQoD/wErAYoBnAH/FAABOwGtATsB/wEzAaUBOwH/ATMBpQE7Af8BOwGlATsB/wFUAa0BXAH/AYwBzgGl + Af8BXAG1AYQB/wFUAa0BgQH/AUQBpQFcAf8BVAGtAVwB/wGcAc4BrQH/AYwBvQGUAf8BKwGEASsB/wEj + AVwBOwH/EAABpQGyAecB/wFUAYEB5wH/AYQBogb/AcYB0wL/AUQBbwL/Aa0Bvgb/ARIBRwHvAf8BAgE2 + Ad4B/wE7AU8BpQH/FAAB7wHTAcYB/wHnAc8BvQ3/Ad4BrgGMAf8BxgGBAUQN/wGtAZIBhAH/Ac4BsgGl + Af8cAAGEAeMB9wH/ATsB2wHvAf8BVAGaAZQB/wEjAWsBbQH/ARIB0wHeAf8BTAGSAaUB/xQAATsBtQFE + Af8BOwGtATsB/wgAATMBpQE7Af8BOwGlATsB/wGUAc4BrQH/AWUBvQGEAf8BVAGtAYEB/wFcAbUBgQH/ + ATsBlAE7Af8BKwGMATMB/wFUAaUBZQH/ASMBVAFEAf8UAAFlAYIB3gH/AWUBhgHvAf8BjAGmAv8BhAGm + Av8BbQGSAv8BXAGCAv8BMwFnAv8BIwFXAfcB/wEaAUMBvQH/AZQBogHOAf8YAAHnAboBnAL/AfsB9wn/ + AdYBmgGBAf8BtQFbASMJ/wHWAccBvQH/AaUBgQFlAf8kAAE7AcsB5wH/AUwB9wL/ASsD/wErAY4BpQH/ + JAABOwGtATsB/wEzAa0BOwH/ATsBpQE7Af8BRAGtAUwB/wGcAdYBrQH/AaUB1gG9Af8BhAHGAYwB/wEr + AYwBKwH/AUwBtQFcAf8BnAHOAa0B/wErAYwBMwH/ASsBhAErAf8BKwGEATMB/xAAAWUBggHeAf8BVAGB + AecB/wFlAYoB9wH/AWUBjgL/AUQBgQL/ATsBZwHvAf8BKwFPAcYB/wGMAZoB1gH/IAAB7wHDAaUC/wHv + AecR/wHWAcMBtQH/AaUBggFtAf8B3gHLAcYB/yQAAZQB4wHvAf8BMwHXAe8B/wErAesB7wH/AUQBkgGl + Af8kAAE7AbUBRAH/ATsBrQE7Af8EAAE7Aa0BOwH/ATMBpQE7Af8BOwGlATsB/wEzAaUBOwH/AYEBxgGB + Af8BrQHnAcYB/wFcAYwBgQH/ATMBZQFMAf8cAAGlAbIB5wH/AW0BhgHeAf8BVAFvAc4B/wFUAYEBzgH/ AYQBlgHWAf8BvQHHAecB/ygAAfcBzwG1Af8B7wHDAaUC/wHPAbUB/wH3AcsBtQH/Ad4BvgGtAf8B3gHH - Ab0B/zAAAV0B0wHvAf8BZgHTAecB/ygAATwBtQFFAf8BPAG1ATwB/wgAATwBrQE8Af8BNAGlATwB/wFF - AYEBZgH/ATwBhAFVAf8BNAGcATwB/wE8AYEBXQH/2AABPAG9AUUB/wwAATwBtQFFAf8BPAGtATwB/wFN - AYwBbgH/ATwBpQE8Af8BNAGlATwB/+wAATwBtQFFAf8BPAG1ATwB/wQAATwBrQE8Af8BNAGtATwB/xAA + Ab0B/zAAAVwB0wHvAf8BZQHTAecB/ygAATsBtQFEAf8BOwG1ATsB/wgAATsBrQE7Af8BMwGlATsB/wFE + AYEBZQH/ATsBhAFUAf8BMwGcATsB/wE7AYEBXAH/2AABOwG9AUQB/wwAATsBtQFEAf8BOwGtATsB/wFM + AYwBbQH/ATsBpQE7Af8BMwGlATsB/+wAATsBtQFEAf8BOwG1ATsB/wQAATsBrQE7Af8BMwGtATsB/xAA AUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/+BAAf/AZ8H/wEfAfwBPwH8AR8C/wH4 AT8B8AEPAfABBwHgAQcB8AEBAeABBwHgAQcB4AEHAeABAwHAAQcB4AEDAeABBwHAAQcBwAEDAcABAwHg AQcBwAECAcABAwHAAQMB8AEPAcABAAHAAQMBwAEDAfABDwGAAQEBwAEDAcABAwH4AR8BAAEDAcABBwHA @@ -348,18 +348,6 @@ Bericht - - Bron - - - True - - - Exception - - - 94 - 401, 17 @@ -510,18 +498,6 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - sourceDataGridViewTextBoxColumn - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Exception - - - System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MessageWindow Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.Designer.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.Designer.cs (.../MessageWindowData.Designer.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.Designer.cs (.../MessageWindowData.Designer.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.237 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -283,12 +283,8 @@ private global::System.Data.DataColumn columnTime; - private global::System.Data.DataColumn columnSource; - private global::System.Data.DataColumn columnMessage; - private global::System.Data.DataColumn columnException; - private global::System.Data.DataColumn columnId; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -342,14 +338,6 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn SourceColumn { - get { - return this.columnSource; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn MessageColumn { get { return this.columnMessage; @@ -358,14 +346,6 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public global::System.Data.DataColumn ExceptionColumn { - get { - return this.columnException; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public global::System.Data.DataColumn IdColumn { get { return this.columnId; @@ -409,14 +389,12 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public MessagesRow AddMessagesRow(string Image, System.DateTime Time, string Source, string Message, string Exception) { + public MessagesRow AddMessagesRow(string Image, System.DateTime Time, string Message) { MessagesRow rowMessagesRow = ((MessagesRow)(this.NewRow())); object[] columnValuesArray = new object[] { Image, Time, - Source, Message, - Exception, null}; rowMessagesRow.ItemArray = columnValuesArray; this.Rows.Add(rowMessagesRow); @@ -449,9 +427,7 @@ internal void InitVars() { this.columnImage = base.Columns["Image"]; this.columnTime = base.Columns["Time"]; - this.columnSource = base.Columns["Source"]; this.columnMessage = base.Columns["Message"]; - this.columnException = base.Columns["Exception"]; this.columnId = base.Columns["Id"]; } @@ -462,12 +438,8 @@ base.Columns.Add(this.columnImage); this.columnTime = new global::System.Data.DataColumn("Time", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnTime); - this.columnSource = new global::System.Data.DataColumn("Source", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnSource); this.columnMessage = new global::System.Data.DataColumn("Message", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnMessage); - this.columnException = new global::System.Data.DataColumn("Exception", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnException); this.columnId = new global::System.Data.DataColumn("Id", typeof(long), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnId); this.Constraints.Add(new global::System.Data.UniqueConstraint("MessagesKey1", new global::System.Data.DataColumn[] { @@ -650,22 +622,6 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string Source { - get { - try { - return ((string)(this[this.tableMessages.SourceColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Source\' in table \'Messages\' is DBNull.", e); - } - } - set { - this[this.tableMessages.SourceColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public string Message { get { try { @@ -682,22 +638,6 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public string Exception { - get { - try { - return ((string)(this[this.tableMessages.ExceptionColumn])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Exception\' in table \'Messages\' is DBNull.", e); - } - } - set { - this[this.tableMessages.ExceptionColumn] = value; - } - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public long Id { get { return ((long)(this[this.tableMessages.IdColumn])); @@ -733,18 +673,6 @@ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsSourceNull() { - return this.IsNull(this.tableMessages.SourceColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetSourceNull() { - this[this.tableMessages.SourceColumn] = global::System.Convert.DBNull; - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsMessageNull() { return this.IsNull(this.tableMessages.MessageColumn); } @@ -754,18 +682,6 @@ public void SetMessageNull() { this[this.tableMessages.MessageColumn] = global::System.Convert.DBNull; } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public bool IsExceptionNull() { - return this.IsNull(this.tableMessages.ExceptionColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public void SetExceptionNull() { - this[this.tableMessages.ExceptionColumn] = global::System.Convert.DBNull; - } } /// Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.xsd =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.xsd (.../MessageWindowData.xsd) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowData.xsd (.../MessageWindowData.xsd) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -12,14 +12,12 @@ - + - - Index: src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/DeltaShell/DeltaShell.Gui/Forms/MessageWindow/MessageWindowLogAppender.cs (.../MessageWindowLogAppender.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -102,8 +102,7 @@ message += Resources.MessageWindowLogAppender_AppendToMessageWindow__Check_log_file_for_more_information__Home__Show_Log__; } - MessageWindow.AddMessage(loggingEvent.Level, loggingEvent.TimeStamp, - loggingEvent.LoggerName, message, loggingEvent.GetExceptionString()); + MessageWindow.AddMessage(loggingEvent.Level, loggingEvent.TimeStamp, message); } private static void FlushMessagesToMessageWindow() Index: src/DeltaShell/DeltaShell.Gui/Forms/SplashScreenLogAppender.cs =================================================================== diff -u -r5fc71a385897af92ccb092f2f969b5709afab85a -rf342f8ce94351f4265931eb1998d0f94c3ae4e06 --- src/DeltaShell/DeltaShell.Gui/Forms/SplashScreenLogAppender.cs (.../SplashScreenLogAppender.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) +++ src/DeltaShell/DeltaShell.Gui/Forms/SplashScreenLogAppender.cs (.../SplashScreenLogAppender.cs) (revision f342f8ce94351f4265931eb1998d0f94c3ae4e06) @@ -110,7 +110,7 @@ long timeOffset = (long) (loggingEvent.TimeStamp - startTime).TotalMilliseconds; - DataRow newRow = currentLogData.Messages.AddMessagesRow(null, loggingEvent.TimeStamp, loggingEvent.LoggerName, loggingEvent.RenderedMessage, null); + DataRow newRow = currentLogData.Messages.AddMessagesRow(null, loggingEvent.TimeStamp, loggingEvent.RenderedMessage); newRow["TimeOffset"] = timeOffset; if (historyLogData.Messages.Count != 0)