Skip to content

Commit

Permalink
Syslog improvements and cleanup
Browse files Browse the repository at this point in the history
- The syslog receiver supports now multiple timestamp formats.
- Removed WinFormsUI folder, because we're now using the official
library.
  • Loading branch information
couchcoding committed Sep 3, 2019
1 parent 5ea1e93 commit 9465adc
Show file tree
Hide file tree
Showing 155 changed files with 512 additions and 22,161 deletions.
4 changes: 2 additions & 2 deletions src/Couchcoding.Logbert.Gui/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.5.1")]
[assembly: AssemblyFileVersion("1.5.5.1")]
[assembly: AssemblyVersion("1.5.6.0")]
[assembly: AssemblyFileVersion("1.5.6.0")]
4 changes: 2 additions & 2 deletions src/Couchcoding.Logbert.Theme/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.5.1")]
[assembly: AssemblyFileVersion("1.5.5.1")]
[assembly: AssemblyVersion("1.5.6.0")]
[assembly: AssemblyFileVersion("1.5.6.0")]
3 changes: 2 additions & 1 deletion src/Logbert/Dialogs/Docking/FrmLogDocument.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 41 additions & 43 deletions src/Logbert/Dialogs/FrmEditTimeStampFormat.Designer.cs

Large diffs are not rendered by default.

133 changes: 133 additions & 0 deletions src/Logbert/Dialogs/FrmTimestamps.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 57 additions & 0 deletions src/Logbert/Dialogs/FrmTimestamps.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;

using Couchcoding.Logbert.Gui.Dialogs;

namespace Couchcoding.Logbert.Dialogs
{
public partial class FrmTimestamps : DialogForm
{
#region Private Fields

/// <summary>
/// The default format string to parse a timestamp value.
/// </summary>
public static readonly string DefaultDateTimeFormat = "MMM d HH:mm:ss";

#endregion

#region Public Properties

/// <summary>
/// Gets the specified timestamp format to parse.
/// </summary>
public string Timestamps => txtTimestamps.Text ?? DefaultDateTimeFormat;

#endregion

#region Constructor

/// <summary>
/// Initializes a new instance of the <see cref="FrmTimestamps"/> dialog.
/// </summary>
public FrmTimestamps()
{
InitializeComponent();
}

/// <summary>
/// Initializes a new instance of the <see cref="FrmTimestamps"/> dialog with the specified parameters.
/// </summary>
/// <param name="format">The initial timestamp format to display.</param>
public FrmTimestamps(string format)
{
InitializeComponent();

txtTimestamps.Text = format ?? DefaultDateTimeFormat;
}

#endregion
}
}
120 changes: 120 additions & 0 deletions src/Logbert/Dialogs/FrmTimestamps.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Binary file not shown.
Binary file modified src/Logbert/Libraries/WeifenLuo.WinFormsUI.Docking.dll
Binary file not shown.
9 changes: 9 additions & 0 deletions src/Logbert/Logbert.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@
<Compile Include="Dialogs\FrmOptions.Designer.cs">
<DependentUpon>FrmOptions.cs</DependentUpon>
</Compile>
<Compile Include="Dialogs\FrmTimestamps.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialogs\FrmTimestamps.Designer.cs">
<DependentUpon>FrmTimestamps.cs</DependentUpon>
</Compile>
<Compile Include="Helper\Browser.cs" />
<Compile Include="Helper\EncodingWrapper.cs" />
<Compile Include="Helper\FontCache.cs" />
Expand Down Expand Up @@ -502,6 +508,9 @@
<EmbeddedResource Include="Dialogs\FrmOptions.resx">
<DependentUpon>FrmOptions.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialogs\FrmTimestamps.resx">
<DependentUpon>FrmTimestamps.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MainForm.resx">
<SubType>Designer</SubType>
<DependentUpon>MainForm.cs</DependentUpon>
Expand Down
Loading

0 comments on commit 9465adc

Please sign in to comment.