Skip to content

Commit a78e252

Browse files
committed
Implemented loading of multiple files
- Added directory observing for the Log4NET and NLog receiver. - Increased version to 1.2.1.0 (still not ready for release).
1 parent 425519d commit a78e252

27 files changed

+2379
-36
lines changed

src/GuiLibrary/Dialogs/DialogForm.cs

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ public class DialogForm : Form
7070
private bool mShowHeaderArea = true;
7171
private bool mShowFooterArea = true;
7272
private Color mContentColor = SystemColors.Control;
73-
private Color mHeaderCaptionColor = Color.White;
74-
private Color mHeaderDescriptionColor = Color.White;
75-
private Color mHeaderColor = Color.Gray;
73+
private Color mHeaderCaptionColor = Color.Black;
74+
private Color mHeaderDescriptionColor = Color.DimGray;
75+
private Color mHeaderColor = Color.White;
7676
private string mDialogMainCaption = string.Empty;
7777
private string mDialogMainDescription = string.Empty;
7878
private Image mDialogImage;
@@ -103,7 +103,7 @@ public sealed override Font Font
103103
/// Gets or sets the foreground color of the dialog header caption.
104104
/// </summary>
105105
[Browsable(true)]
106-
[DefaultValue(typeof(Color), "White")]
106+
[DefaultValue(typeof(Color), "Black")]
107107
[EditorBrowsable(EditorBrowsableState.Always)]
108108
[Category("Gui Appearance")]
109109
[Description("Gets or sets the foreground color of the dialog header caption.")]
@@ -127,7 +127,7 @@ public Color HeaderCaptionColor
127127
/// Gets or sets the foreground color of the dialog header text.
128128
/// </summary>
129129
[Browsable(true)]
130-
[DefaultValue(typeof(Color), "White")]
130+
[DefaultValue(typeof(Color), "DimGray")]
131131
[EditorBrowsable(EditorBrowsableState.Always)]
132132
[Category("Gui Appearance")]
133133
[Description("Gets or sets the foreground color of the dialog header description.")]
@@ -175,7 +175,7 @@ public Color ContentColor
175175
/// Gets or sets the backcolor of the header area.
176176
/// </summary>
177177
[Browsable(true)]
178-
[DefaultValue(typeof(Color), "Gray")]
178+
[DefaultValue(typeof(Color), "White")]
179179
[EditorBrowsable(EditorBrowsableState.Always)]
180180
[Category("Gui Appearance")]
181181
[Description("Gets or sets the backcolor of the header area.")]
@@ -401,6 +401,14 @@ protected virtual void DrawDialogBackground(Graphics grfx)
401401
, ClientRectangle.Width
402402
, headerHeight));
403403
}
404+
405+
ControlPaint.DrawVisualStyleBorder(
406+
grfx
407+
, new Rectangle(
408+
-SystemInformation.BorderSize.Width
409+
, -SystemInformation.BorderSize.Height
410+
, ClientRectangle.Width + SystemInformation.BorderSize.Width + SystemInformation.BorderSize.Width
411+
, headerHeight - 1));
404412
}
405413

406414
if (mDialogImage != null)
@@ -520,8 +528,8 @@ protected DialogForm()
520528
Font = SystemFonts.MessageBoxFont;
521529

522530
ContentColor = SystemColors.Control;
523-
HeaderColor = Color.Gray;
524-
HeaderDescriptionColor = SystemColors.Control;
531+
HeaderColor = Color.White;
532+
HeaderDescriptionColor = Color.DimGray;
525533

526534
MinimizeBox = false;
527535
MaximizeBox = false;

src/Logbert/App.config

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -348,6 +348,30 @@
348348
<setting name="FrmLogStatisticShowLegend" serializeAs="String">
349349
<value>True</value>
350350
</setting>
351+
<setting name="PnlLog4NetDirectorySettingsDirectory" serializeAs="String">
352+
<value />
353+
</setting>
354+
<setting name="PnlLog4NetDirectorySettingsPattern" serializeAs="String">
355+
<value>.*\.log[\.]?[\d]?</value>
356+
</setting>
357+
<setting name="PnlLog4NetDirectorySettingsReadAllExisting" serializeAs="String">
358+
<value>True</value>
359+
</setting>
360+
<setting name="DockLayoutLog4NetDirReceiver" serializeAs="String">
361+
<value />
362+
</setting>
363+
<setting name="DockLayoutNLogDirReceiver" serializeAs="String">
364+
<value />
365+
</setting>
366+
<setting name="PnlNLogDirectorySettingsDirectory" serializeAs="String">
367+
<value />
368+
</setting>
369+
<setting name="PnlNLogDirectorySettingsPattern" serializeAs="String">
370+
<value>.*\.log[\.]?[\d]?</value>
371+
</setting>
372+
<setting name="PnlNLogDirectorySettingsReadAllExisting" serializeAs="String">
373+
<value>False</value>
374+
</setting>
351375
</Com.Couchcoding.Logbert.Properties.Settings>
352376
</userSettings>
353377
<applicationSettings>

src/Logbert/Controls/OptionPanels/OptionPanelGeneral.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private void TxtTimestampFormatButtonClick(object sender, System.EventArgs e)
8282
{
8383
mnuTimestamp.Show(
8484
btnTimestamp
85-
, new Point(btnTimestamp.Width, btnTimestamp.Height));
85+
, new Point(btnTimestamp.Width, btnTimestamp.Top));
8686
}
8787
}
8888

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Logbert/Dialogs/Docking/FrmLogFilter.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Logbert/Dialogs/Docking/FrmLogScript.Designer.cs

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Logbert/Dialogs/Docking/FrmLogStatistic.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Logbert/Dialogs/FrmNew.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Logbert/Dialogs/FrmNew.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
using Com.Couchcoding.Logbert.Receiver.SyslogFileReceiver;
4545
using Com.Couchcoding.Logbert.Receiver.SyslogUdpReceiver;
4646
using Com.Couchcoding.Logbert.Receiver.EventlogReceiver;
47+
using Com.Couchcoding.Logbert.Receiver.Log4NetDirReceiver;
48+
using Com.Couchcoding.Logbert.Receiver.NLogDirReceiver;
4749

4850
namespace Com.Couchcoding.Logbert.Dialogs
4951
{
@@ -172,10 +174,12 @@ public FrmNew()
172174

173175
lstLogger.Items.Add(new Log4NetUdpReceiver());
174176
lstLogger.Items.Add(new Log4NetFileReceiver());
177+
lstLogger.Items.Add(new Log4NetDirReceiver());
175178
lstLogger.AddSeperator();
176179
lstLogger.Items.Add(new NlogTcpReceiver());
177180
lstLogger.Items.Add(new NLogUdpReceiver());
178181
lstLogger.Items.Add(new NLogFileReceiver());
182+
lstLogger.Items.Add(new NLogDirReceiver());
179183
lstLogger.AddSeperator();
180184
lstLogger.Items.Add(new SyslogUdpReceiver());
181185
lstLogger.Items.Add(new SyslogFileReceiver());

0 commit comments

Comments
 (0)