From 2c15a4f5c5d8544b3b9e84e456e0e60fc1582d01 Mon Sep 17 00:00:00 2001 From: JustArchi Date: Wed, 1 Mar 2017 22:38:57 +0100 Subject: [PATCH] Code cleanup --- ArchiSteamFarm/App.config | 6 +-- ArchiSteamFarm/packages.config | 24 ++++++------ ConfigGenerator/App.config | 6 +-- ConfigGenerator/LocalizedCategoryAttribute.cs | 2 +- ConfigGenerator/Properties/Settings.settings | 8 ++-- ConfigGenerator/packages.config | 9 +++-- GUI/App.config | 22 +++++------ GUI/Logging.cs | 38 +++++++++---------- GUI/Properties/Settings.settings | 8 ++-- GUI/packages.config | 27 ++++++------- 10 files changed, 76 insertions(+), 74 deletions(-) diff --git a/ArchiSteamFarm/App.config b/ArchiSteamFarm/App.config index efb4d02fd..2fbdca1e5 100644 --- a/ArchiSteamFarm/App.config +++ b/ArchiSteamFarm/App.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/ArchiSteamFarm/packages.config b/ArchiSteamFarm/packages.config index 82eff7f67..3c6ac3c15 100644 --- a/ArchiSteamFarm/packages.config +++ b/ArchiSteamFarm/packages.config @@ -1,16 +1,16 @@  - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/ConfigGenerator/App.config b/ConfigGenerator/App.config index efb4d02fd..2fbdca1e5 100644 --- a/ConfigGenerator/App.config +++ b/ConfigGenerator/App.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/ConfigGenerator/LocalizedCategoryAttribute.cs b/ConfigGenerator/LocalizedCategoryAttribute.cs index 083fbe2e7..88cfe6902 100644 --- a/ConfigGenerator/LocalizedCategoryAttribute.cs +++ b/ConfigGenerator/LocalizedCategoryAttribute.cs @@ -49,4 +49,4 @@ namespace ConfigGenerator { } } } -} +} \ No newline at end of file diff --git a/ConfigGenerator/Properties/Settings.settings b/ConfigGenerator/Properties/Settings.settings index e04fc6310..2c1e3cfeb 100644 --- a/ConfigGenerator/Properties/Settings.settings +++ b/ConfigGenerator/Properties/Settings.settings @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/ConfigGenerator/packages.config b/ConfigGenerator/packages.config index dc0975c4a..a114ce366 100644 --- a/ConfigGenerator/packages.config +++ b/ConfigGenerator/packages.config @@ -1,7 +1,8 @@  + - - - - + + + + \ No newline at end of file diff --git a/GUI/App.config b/GUI/App.config index d90f417aa..ea32a428c 100644 --- a/GUI/App.config +++ b/GUI/App.config @@ -1,16 +1,16 @@  - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/GUI/Logging.cs b/GUI/Logging.cs index 3f90ed6b4..f9c7123ad 100644 --- a/GUI/Logging.cs +++ b/GUI/Logging.cs @@ -31,6 +31,25 @@ namespace ArchiSteamFarm { internal static class Logging { private const string GeneralLayout = @"${date:format=yyyy-MM-dd HH\:mm\:ss}|${processname}-${processid}|${level:uppercase=true}|${logger}|${message}${onexception:inner= ${exception:format=toString,Data}}"; + internal static void InitFormLogger() { + RichTextBoxTarget formControlTarget = new RichTextBoxTarget { + AutoScroll = true, + ControlName = "LogTextBox", + FormName = "MainForm", + Layout = GeneralLayout, + MaxLines = byte.MaxValue, + Name = "RichTextBox" + }; + + formControlTarget.RowColoringRules.Add(new RichTextBoxRowColoringRule("level >= LogLevel.Error", "Red", "Black")); + formControlTarget.RowColoringRules.Add(new RichTextBoxRowColoringRule("level >= LogLevel.Warn", "Yellow", "Black")); + + LogManager.Configuration.AddTarget(formControlTarget); + LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, formControlTarget)); + + LogManager.ReconfigExistingLoggers(); + } + internal static void InitLoggers() { if (LogManager.Configuration != null) { // User provided custom NLog config, or we have it set already, so don't override it @@ -58,24 +77,5 @@ namespace ArchiSteamFarm { LogManager.Configuration = config; } - - internal static void InitFormLogger() { - RichTextBoxTarget formControlTarget = new RichTextBoxTarget { - AutoScroll = true, - ControlName = "LogTextBox", - FormName = "MainForm", - Layout = GeneralLayout, - MaxLines = byte.MaxValue, - Name = "RichTextBox" - }; - - formControlTarget.RowColoringRules.Add(new RichTextBoxRowColoringRule("level >= LogLevel.Error", "Red", "Black")); - formControlTarget.RowColoringRules.Add(new RichTextBoxRowColoringRule("level >= LogLevel.Warn", "Yellow", "Black")); - - LogManager.Configuration.AddTarget(formControlTarget); - LogManager.Configuration.LoggingRules.Add(new LoggingRule("*", LogLevel.Debug, formControlTarget)); - - LogManager.ReconfigExistingLoggers(); - } } } \ No newline at end of file diff --git a/GUI/Properties/Settings.settings b/GUI/Properties/Settings.settings index e04fc6310..2c1e3cfeb 100644 --- a/GUI/Properties/Settings.settings +++ b/GUI/Properties/Settings.settings @@ -1,8 +1,8 @@  - - - - + + + + \ No newline at end of file diff --git a/GUI/packages.config b/GUI/packages.config index 72f096693..1c5f5a869 100644 --- a/GUI/packages.config +++ b/GUI/packages.config @@ -1,16 +1,17 @@  + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file