Skip to content

Commit 9465adc

Browse files
couchcodingcouchcoding
committed
Syslog improvements and cleanup
- The syslog receiver supports now multiple timestamp formats. - Removed WinFormsUI folder, because we're now using the official library.
1 parent 5ea1e93 commit 9465adc

File tree

155 files changed

+512
-22161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+512
-22161
lines changed

‎src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.5.5.1")]
35-
[assembly: AssemblyFileVersion("1.5.5.1")]
34+
[assembly: AssemblyVersion("1.5.6.0")]
35+
[assembly: AssemblyFileVersion("1.5.6.0")]

‎src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("1.5.5.1")]
35-
[assembly: AssemblyFileVersion("1.5.5.1")]
34+
[assembly: AssemblyVersion("1.5.6.0")]
35+
[assembly: AssemblyFileVersion("1.5.6.0")]

‎src/Logbert/Dialogs/Docking/FrmLogDocument.Designer.cs

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Logbert/Dialogs/FrmEditTimeStampFormat.Designer.cs

+41-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Logbert/Dialogs/FrmTimestamps.Designer.cs

+133
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Logbert/Dialogs/FrmTimestamps.cs

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Windows.Forms;
9+
10+
using Couchcoding.Logbert.Gui.Dialogs;
11+
12+
namespace Couchcoding.Logbert.Dialogs
13+
{
14+
public partial class FrmTimestamps : DialogForm
15+
{
16+
#region Private Fields
17+
18+
/// <summary>
19+
/// The default format string to parse a timestamp value.
20+
/// </summary>
21+
public static readonly string DefaultDateTimeFormat = "MMM d HH:mm:ss";
22+
23+
#endregion
24+
25+
#region Public Properties
26+
27+
/// <summary>
28+
/// Gets the specified timestamp format to parse.
29+
/// </summary>
30+
public string Timestamps => txtTimestamps.Text ?? DefaultDateTimeFormat;
31+
32+
#endregion
33+
34+
#region Constructor
35+
36+
/// <summary>
37+
/// Initializes a new instance of the <see cref="FrmTimestamps"/> dialog.
38+
/// </summary>
39+
public FrmTimestamps()
40+
{
41+
InitializeComponent();
42+
}
43+
44+
/// <summary>
45+
/// Initializes a new instance of the <see cref="FrmTimestamps"/> dialog with the specified parameters.
46+
/// </summary>
47+
/// <param name="format">The initial timestamp format to display.</param>
48+
public FrmTimestamps(string format)
49+
{
50+
InitializeComponent();
51+
52+
txtTimestamps.Text = format ?? DefaultDateTimeFormat;
53+
}
54+
55+
#endregion
56+
}
57+
}

‎src/Logbert/Dialogs/FrmTimestamps.resx

+120
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎src/Logbert/Libraries/WeifenLuo.WinFormsUI.Docking.ThemeVS2015.dll

-12 KB
Binary file not shown.

‎src/Logbert/Libraries/WeifenLuo.WinFormsUI.Docking.dll

-66.5 KB
Binary file not shown.

‎src/Logbert/Logbert.csproj

+9
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,12 @@
258258
<Compile Include="Dialogs\FrmOptions.Designer.cs">
259259
<DependentUpon>FrmOptions.cs</DependentUpon>
260260
</Compile>
261+
<Compile Include="Dialogs\FrmTimestamps.cs">
262+
<SubType>Form</SubType>
263+
</Compile>
264+
<Compile Include="Dialogs\FrmTimestamps.Designer.cs">
265+
<DependentUpon>FrmTimestamps.cs</DependentUpon>
266+
</Compile>
261267
<Compile Include="Helper\Browser.cs" />
262268
<Compile Include="Helper\EncodingWrapper.cs" />
263269
<Compile Include="Helper\FontCache.cs" />
@@ -502,6 +508,9 @@
502508
<EmbeddedResource Include="Dialogs\FrmOptions.resx">
503509
<DependentUpon>FrmOptions.cs</DependentUpon>
504510
</EmbeddedResource>
511+
<EmbeddedResource Include="Dialogs\FrmTimestamps.resx">
512+
<DependentUpon>FrmTimestamps.cs</DependentUpon>
513+
</EmbeddedResource>
505514
<EmbeddedResource Include="MainForm.resx">
506515
<SubType>Designer</SubType>
507516
<DependentUpon>MainForm.cs</DependentUpon>

0 commit comments

Comments
 (0)