Skip to content

Commit d76ac09

Browse files
committed
Fixed some minor issues
- Fixed settings upgrade if new version is installed - Fixed file order of directory receivers - Fixed timestamp representation of log messages
1 parent 0fd83a6 commit d76ac09

File tree

14 files changed

+31
-28
lines changed

14 files changed

+31
-28
lines changed

src/GuiLibrary/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: AssemblyConfiguration("")]
1010
[assembly: AssemblyCompany("Couchcoding")]
1111
[assembly: AssemblyProduct("Logbert GUI Library")]
12-
[assembly: AssemblyCopyright("Copyright © 2017 Couchcoding")]
12+
[assembly: AssemblyCopyright("Copyright © 2018 Couchcoding")]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515

src/Logbert/Dialogs/FrmAbout.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<data name="txtLicense.Text" xml:space="preserve">
121121
<value>The MIT License (MIT)
122122

123-
Copyright (c) 2017 Couchcoding
123+
Copyright (c) 2018 Couchcoding
124124

125125
Permission is hereby granted, free of charge, to any person obtaining a copy
126126
of this software and associated documentation files (the "Software"), to deal

src/Logbert/Dialogs/FrmEditTimeStampFormat.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
using Com.Couchcoding.GuiLibrary.Dialogs;
3535
using Com.Couchcoding.Logbert.Receiver.CustomReceiver;
36+
using Com.Couchcoding.Logbert.Helper;
3637

3738
namespace Com.Couchcoding.Logbert.Dialogs
3839
{
@@ -100,6 +101,8 @@ public FrmEditTimeStampFormat(string format)
100101
{
101102
InitializeComponent();
102103

104+
ThemeManager.CurrentApplicationTheme.ApplyTo(mnuTimestamp);
105+
103106
txtTimestampFormat.Text = format ?? Columnizer.DefaultDateTimeFormat;
104107
}
105108

src/Logbert/Logging/LogMessageCustom.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,9 @@ public override object GetValueForColumn(int columnIndex)
194194
if (mColumnizer.Columns[columnIndex - 2].ColumnType == LogColumnType.Timestamp)
195195
{
196196
// Special handling for the timestamp column. Maybe the timeshift value has to be added.
197-
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(Settings.Default.TimestampFormat);
197+
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(
198+
Settings.Default.TimestampFormat
199+
, CultureInfo.InvariantCulture);
198200
}
199201

200202
return mParsedValue[columnIndex - 2];

src/Logbert/Logging/LogMessageEventlog.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
using Com.Couchcoding.Logbert.Helper;
3636
using Com.Couchcoding.Logbert.Properties;
3737
using MoonSharp.Interpreter;
38+
using System.Globalization;
3839

3940
namespace Com.Couchcoding.Logbert.Logging
4041
{
@@ -296,7 +297,9 @@ public override object GetValueForColumn(int columnIndex)
296297
case 2:
297298
return Level.ToString();
298299
case 3:
299-
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(Settings.Default.TimestampFormat);
300+
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(
301+
Settings.Default.TimestampFormat
302+
, CultureInfo.InvariantCulture);
300303
case 4:
301304
return mLogger;
302305
case 5:

src/Logbert/Logging/LogMessageLog4Net.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
using Com.Couchcoding.Logbert.Helper;
3838

3939
using MoonSharp.Interpreter;
40+
using System.Globalization;
4041

4142
namespace Com.Couchcoding.Logbert.Logging
4243
{
@@ -365,7 +366,9 @@ public override object GetValueForColumn(int columnIndex)
365366
case 2:
366367
return mLevel.ToString();
367368
case 3:
368-
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(Settings.Default.TimestampFormat);
369+
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(
370+
Settings.Default.TimestampFormat
371+
, CultureInfo.InvariantCulture);
369372
case 4:
370373
return mLogger;
371374
case 5:

src/Logbert/Logging/LogMessageSyslog.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,9 @@ public override object GetValueForColumn(int columnIndex)
297297
case 3:
298298
return mLocalTimestamp.ToString(Settings.Default.TimestampFormat);
299299
case 4:
300-
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(Settings.Default.TimestampFormat);
300+
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(
301+
Settings.Default.TimestampFormat
302+
, CultureInfo.InvariantCulture);
301303
case 5:
302304
return mFacility.ToString();
303305
case 6:

src/Logbert/Logging/LogMessageWinDebug.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
using Com.Couchcoding.Logbert.Properties;
3333
using MoonSharp.Interpreter;
3434
using System;
35+
using System.Globalization;
3536

3637
namespace Com.Couchcoding.Logbert.Logging
3738
{
@@ -147,7 +148,9 @@ public override object GetValueForColumn(int columnIndex)
147148
case 2:
148149
return Level.ToString();
149150
case 3:
150-
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(Settings.Default.TimestampFormat);
151+
return mTimestamp.AddMilliseconds(mTimeShiftOffset).ToString(
152+
Settings.Default.TimestampFormat
153+
, CultureInfo.InvariantCulture);
151154
case 4:
152155
return mProcessId.ToString();
153156
case 5:

src/Logbert/MainForm.cs

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -879,19 +879,6 @@ public MainForm(string logFileToLoad)
879879
// Ensure we're using the systems default dialog font for the main view.
880880
Font = SystemFonts.MessageBoxFont;
881881

882-
try
883-
{
884-
if (Settings.Default.GetPreviousVersion("FrmMainFormSize") != null)
885-
{
886-
// Upgrade previous user settings if necessary.
887-
Settings.Default.Upgrade();
888-
}
889-
}
890-
catch (Exception ex)
891-
{
892-
Logger.Error(ex.Message);
893-
}
894-
895882
// Set the size and location of the main window.
896883
LoadDialogSettings();
897884

src/Logbert/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("Couchcoding")]
1212
[assembly: AssemblyProduct("Logbert")]
13-
[assembly: AssemblyCopyright("Copyright © 2017 Couchcoding")]
13+
[assembly: AssemblyCopyright("Copyright © 2018 Couchcoding")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -29,6 +29,6 @@
2929
// Build Number
3030
// Revision
3131
//
32-
[assembly: AssemblyVersion("1.3.3.0")]
33-
[assembly: AssemblyFileVersion("1.3.3.0")]
32+
[assembly: AssemblyVersion("1.3.3.1")]
33+
[assembly: AssemblyFileVersion("1.3.3.1")]
3434
[assembly: NeutralResourcesLanguageAttribute("")]

0 commit comments

Comments
 (0)