Skip to content

Commit 578eb04

Browse files
couchcodingcouchcoding
committed
- Enhanced timeshift toolbar
- Fixed encoding setting for NLog UDP receiver - Enabled multiselect of log messages
1 parent addde94 commit 578eb04

25 files changed

+888
-595
lines changed

‎src/Logbert/App.config‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -522,13 +522,13 @@
522522
<setting name="PnlNLogFileSettingsEncoding" serializeAs="String">
523523
<value>1252</value>
524524
</setting>
525-
<setting name="PnlNLogDirSettingsEncoding" serializeAs="String">
525+
<setting name="PnlNLogDirectorySettingsEncoding" serializeAs="String">
526526
<value>1252</value>
527527
</setting>
528528
<setting name="PnlLog4NetFileSettingsEncoding" serializeAs="String">
529529
<value>1252</value>
530530
</setting>
531-
<setting name="PnlLog4NetDirSettingsEncoding" serializeAs="String">
531+
<setting name="PnlLog4NetDirectorySettingsEncoding" serializeAs="String">
532532
<value>1252</value>
533533
</setting>
534534
<setting name="PnlLog4NetUdpSettingsEncoding" serializeAs="String">
@@ -537,7 +537,7 @@
537537
<setting name="PnlCustomFileSettingsEncoding" serializeAs="String">
538538
<value>1252</value>
539539
</setting>
540-
<setting name="PnlCustomDirSettingsEncoding" serializeAs="String">
540+
<setting name="PnlCustomDirectorySettingsEncoding" serializeAs="String">
541541
<value>1252</value>
542542
</setting>
543543
<setting name="PnlCustomUdpSettingsEncoding" serializeAs="String">
@@ -546,6 +546,18 @@
546546
<setting name="PnlCustomTcpSettingsEncoding" serializeAs="String">
547547
<value>1252</value>
548548
</setting>
549+
<setting name="TimeShiftValue" serializeAs="String">
550+
<value>0</value>
551+
</setting>
552+
<setting name="TimeShiftUnitIndex" serializeAs="String">
553+
<value>0</value>
554+
</setting>
555+
<setting name="PnlNLogDirSettingsEncoding" serializeAs="String">
556+
<value>1252</value>
557+
</setting>
558+
<setting name="PnlCustomDirSettingsEncoding" serializeAs="String">
559+
<value>1252</value>
560+
</setting>
549561
</Com.Couchcoding.Logbert.Properties.Settings>
550562
</userSettings>
551563
<applicationSettings>

‎src/Logbert/Controls/EventLogDetailsControl.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,17 @@ public bool SelectLogMessage(LogMessage message)
316316
{
317317
txtDataNumber.Text = logMessage.Index.ToString();
318318
txtDataLevel.Text = logMessage.Level.ToString();
319-
txtDataDateAndTime.Text = logMessage.Timestamp.AddMilliseconds(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
319+
txtDataDateAndTime.Text = logMessage.Timestamp.Add(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
320320
txtDataLogger.Text = logMessage.Logger;
321321
txtDataCategory.Text = logMessage.Category;
322322
txtDataUsername.Text = logMessage.Username;
323323
txtDataInstaceId.Text = logMessage.InstanceId.ToString();
324324

325-
if (logMessage.TimeShiftOffset != 0)
325+
if (logMessage.TimeShiftOffset.Milliseconds != 0)
326326
{
327327
txtDataDateAndTime.Text += string.Format(
328328
Resources.strLoggerDetailsCtrlOffset
329-
, logMessage.TimeShiftOffset);
329+
, logMessage.TimeShiftOffset.Milliseconds);
330330
}
331331

332332
// Replace all known new line character combinations with the .net one.

‎src/Logbert/Controls/Log4NetDetailsControl.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,14 +304,14 @@ public bool SelectLogMessage(LogMessage message)
304304
{
305305
txtDataLogger.Text = logMessage.Logger;
306306
txtDataLevel.Text = logMessage.Level.ToString();
307-
txtDataDateTime.Text = logMessage.Timestamp.AddMilliseconds(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
307+
txtDataDateTime.Text = logMessage.Timestamp.Add(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
308308
txtDataThread.Text = logMessage.Thread;
309309

310-
if (logMessage.TimeShiftOffset != 0)
310+
if (logMessage.TimeShiftOffset.Milliseconds != 0)
311311
{
312312
txtDataDateTime.Text += string.Format(
313313
Resources.strLoggerDetailsCtrlOffset
314-
, logMessage.TimeShiftOffset);
314+
, logMessage.TimeShiftOffset.Milliseconds);
315315
}
316316

317317
// Replace all known new line character combinations with the .net one.

‎src/Logbert/Controls/SyslogDetailsControl.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,16 +304,16 @@ public bool SelectLogMessage(LogMessage message)
304304
{
305305
txtDataNumber.Text = logMessage.Index.ToString();
306306
txtDataSeverity.Text = logMessage.Level.ToString();
307-
txtDataLocalMachineTime.Text = logMessage.LocalTimestamp.AddMilliseconds(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
307+
txtDataLocalMachineTime.Text = logMessage.LocalTimestamp.Add(logMessage.TimeShiftOffset).ToString(Settings.Default.TimestampFormat);
308308
txtDataTime.Text = logMessage.Timestamp.ToString(Settings.Default.TimestampFormat);
309309
txtDataFacility.Text = logMessage.LogFacility.ToString();
310310
txtDataSender.Text = logMessage.Logger;
311311

312-
if (logMessage.TimeShiftOffset != 0)
312+
if (logMessage.TimeShiftOffset.Milliseconds != 0)
313313
{
314314
txtDataLocalMachineTime.Text += string.Format(
315315
Resources.strLoggerDetailsCtrlOffset
316-
, logMessage.TimeShiftOffset);
316+
, logMessage.TimeShiftOffset.Milliseconds);
317317
}
318318

319319
// Replace all known new line character combinations with the .net one.

‎src/Logbert/Controls/WinDebugDetailsControl.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,11 @@ public bool SelectLogMessage(LogMessage message)
283283
txtDataTime.Text = logMessage.Timestamp.ToString(Settings.Default.TimestampFormat);
284284
txtDataProcessId.Text = logMessage.ProcessId.ToString();
285285

286-
if (logMessage.TimeShiftOffset != 0)
286+
if (logMessage.TimeShiftOffset.Milliseconds != 0)
287287
{
288288
txtDataTime.Text += string.Format(
289289
Resources.strLoggerDetailsCtrlOffset
290-
, logMessage.TimeShiftOffset);
290+
, logMessage.TimeShiftOffset.Milliseconds);
291291
}
292292

293293
// Replace all known new line character combinations with the .net one.

‎src/Logbert/Dialogs/Docking/FrmLogBookmarks.cs‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#endregion
3030

31+
using System.Collections.Generic;
3132
using System.Drawing;
3233
using System.Windows.Forms;
3334

@@ -90,7 +91,17 @@ private void TsbRemoveBookmarkClick(object sender, System.EventArgs e)
9091
{
9192
if (mBookmarkProvider != null && dgvBookmarks.SelectedRows.Count > 0)
9293
{
93-
mBookmarkProvider.RemoveBookmark(dgvBookmarks.SelectedRows[0].Tag as LogMessage);
94+
List<LogMessage> selectedMessages = new List<LogMessage>();
95+
96+
foreach (DataGridViewRow selectedRow in dgvBookmarks.SelectedRows)
97+
{
98+
if (dgvBookmarks.SelectedRows[0].Tag is LogMessage message)
99+
{
100+
selectedMessages.Add(message);
101+
}
102+
}
103+
104+
mBookmarkProvider.RemoveBookmarks(selectedMessages);
94105
}
95106
}
96107

0 commit comments

Comments
 (0)