diff --git a/src/LogExpert.Tests/JSONSaveTest.cs b/src/LogExpert.Tests/JSONSaveTest.cs
index b6e8f8b2..e78be754 100644
--- a/src/LogExpert.Tests/JSONSaveTest.cs
+++ b/src/LogExpert.Tests/JSONSaveTest.cs
@@ -1,9 +1,6 @@
using LogExpert.Config;
-
using Newtonsoft.Json;
-
using NUnit.Framework;
-
using System.IO;
namespace LogExpert.Tests
@@ -20,14 +17,14 @@ public void SaveOptionsAsJSON()
string settingsFile = configDir + "\\settings.json";
Settings settings = null;
-
+
Assert.DoesNotThrow(CastSettings);
Assert.That(settings, Is.Not.Null);
Assert.That(settings.alwaysOnTop, Is.True);
ConfigManager.Settings.alwaysOnTop = false;
ConfigManager.Save(SettingsFlags.All);
-
+
settings = null;
Assert.DoesNotThrow(CastSettings);
diff --git a/src/LogExpert/Classes/CmdLine.cs b/src/LogExpert/Classes/CmdLine.cs
index e28de18d..f99bffb4 100644
--- a/src/LogExpert/Classes/CmdLine.cs
+++ b/src/LogExpert/Classes/CmdLine.cs
@@ -3,7 +3,7 @@
/*
* Taken from https://cmdline.codeplex.com/
- *
+ *
*/
namespace LogExpert.Classes
@@ -15,11 +15,15 @@ public class CmdLineException : Exception
{
#region cTor
- public CmdLineException(string parameter, string message) : base($"Syntax error of parameter -{parameter}: {message}")
+ public CmdLineException(string parameter, string message)
+ :
+ base(string.Format("Syntax error of parameter -{0}: {1}", parameter, message))
{
}
- public CmdLineException(string message) : base(message)
+ public CmdLineException(string message)
+ :
+ base(message)
{
}
@@ -27,7 +31,7 @@ public CmdLineException(string message) : base(message)
}
///
- /// Represents a command line parameter.
+ /// Represents a command line parameter.
/// Parameters are words in the command line beginning with a hyphen (-).
/// The value of the parameter is the next word in
///
@@ -99,7 +103,7 @@ public virtual void SetValue(string value)
}
///
- /// Represents an integer command line parameter.
+ /// Represents an integer command line parameter.
///
public class CmdLineInt : CmdLineParameter
{
@@ -158,25 +162,22 @@ public CmdLineInt(string name, bool required, string helpMessage, int min, int m
public override void SetValue(string value)
{
base.SetValue(value);
- int i;
-
+ int i = 0;
try
{
i = Convert.ToInt32(value);
}
catch (Exception)
{
- throw new CmdLineException(Name, "Value is not an integer.");
+ throw new CmdLineException(base.Name, "Value is not an integer.");
}
-
if (i < _min)
{
- throw new CmdLineException(Name, $"Value must be greather or equal to {_min}.");
+ throw new CmdLineException(base.Name, string.Format("Value must be greather or equal to {0}.", _min));
}
-
if (i > _max)
{
- throw new CmdLineException(Name, $"Value must be less or equal to {_max}.");
+ throw new CmdLineException(base.Name, string.Format("Value must be less or equal to {0}.", _max));
}
Value = i;
}
@@ -252,11 +253,11 @@ public CmdLineParameter this[string name]
{
get
{
- if (!parameters.TryGetValue(name, out CmdLineParameter value))
+ if (!parameters.ContainsKey(name))
{
throw new CmdLineException(name, "Not a registered parameter.");
}
- return value;
+ return parameters[name];
}
}
@@ -306,8 +307,8 @@ public string[] Parse(string[] args)
if (args[i].Length > 1 && args[i][0] == '-')
{
// The current string is a parameter name
- string key = args[i][1..].ToLower();
- string value = string.Empty;
+ string key = args[i].Substring(1, args[i].Length - 1).ToLower();
+ string value = "";
i++;
if (i < args.Length)
{
@@ -322,17 +323,17 @@ public string[] Parse(string[] args)
i++;
}
}
- if (!parameters.TryGetValue(key, out CmdLineParameter cmdLineParameter))
+ if (!parameters.ContainsKey(key))
{
throw new CmdLineException(key, "Parameter is not allowed.");
}
- if (cmdLineParameter.Exists)
+ if (parameters[key].Exists)
{
throw new CmdLineException(key, "Parameter is specified more than once.");
}
- cmdLineParameter.SetValue(value);
+ parameters[key].SetValue(value);
}
else
{
@@ -342,7 +343,7 @@ public string[] Parse(string[] args)
}
- // Check that required parameters are present in the command line.
+ // Check that required parameters are present in the command line.
foreach (string key in parameters.Keys)
{
if (parameters[key].Required && !parameters[key].Exists)
@@ -393,7 +394,7 @@ public class ConsoleCmdLine : CmdLine
public ConsoleCmdLine()
{
- RegisterParameter(new CmdLineString("help", false, "Prints the help screen."));
+ base.RegisterParameter(new CmdLineString("help", false, "Prints the help screen."));
}
#endregion
@@ -403,7 +404,7 @@ public ConsoleCmdLine()
public new string[] Parse(string[] args)
{
string[] ret = null;
- string error = string.Empty;
+ string error = "";
try
{
ret = base.Parse(args);
@@ -417,15 +418,15 @@ public ConsoleCmdLine()
{
//foreach(string s in base.HelpScreen().Split('\n'))
// Console.WriteLine(s);
- Console.WriteLine(HelpScreen());
- Environment.Exit(0);
+ Console.WriteLine(base.HelpScreen());
+ System.Environment.Exit(0);
}
if (error != "")
{
Console.WriteLine(error);
Console.WriteLine("Use -help for more information.");
- Environment.Exit(1);
+ System.Environment.Exit(1);
}
return ret;
}
diff --git a/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs b/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs
index 50056be9..8e46e056 100644
--- a/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs
+++ b/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs
@@ -48,7 +48,7 @@ public static ILogLineColumnizer CloneColumnizer(ILogLineColumnizer columnizer)
object o = cti.Invoke(new object[] { });
if (o is IColumnizerConfigurator configurator)
{
- configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
+ configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
}
return (ILogLineColumnizer)o;
}
diff --git a/src/LogExpert/Classes/Highlight/HighlightEntry.cs b/src/LogExpert/Classes/Highlight/HilightEntry.cs
similarity index 93%
rename from src/LogExpert/Classes/Highlight/HighlightEntry.cs
rename to src/LogExpert/Classes/Highlight/HilightEntry.cs
index 76fc4c41..18e02db9 100644
--- a/src/LogExpert/Classes/Highlight/HighlightEntry.cs
+++ b/src/LogExpert/Classes/Highlight/HilightEntry.cs
@@ -1,108 +1,108 @@
-using Newtonsoft.Json;
-
-using System;
-using System.Drawing;
-using System.Text.RegularExpressions;
-
-namespace LogExpert.Classes.Highlight
-{
- [Serializable]
- [method: JsonConstructor]
- public class HighlightEntry() : ICloneable
- {
- #region Fields
-
- [NonSerialized] private Regex regex = null;
-
- private string _searchText = string.Empty;
-
- #endregion Fields
-
- #region Properties
-
- public bool IsStopTail { get; set; }
-
- public bool IsSetBookmark { get; set; }
-
- public bool IsRegEx { get; set; }
-
- public bool IsCaseSensitive { get; set; }
-
- public Color ForegroundColor { get; set; }
-
- public Color BackgroundColor { get; set; }
-
- public string SearchText
- {
- get => _searchText;
- set
- {
- _searchText = value;
- regex = null;
- }
- }
-
- public bool IsLedSwitch { get; set; }
-
- public ActionEntry ActionEntry { get; set; }
-
- public bool IsActionEntry { get; set; }
-
- public string BookmarkComment { get; set; }
-
- public Regex Regex
- {
- get
- {
- if (regex == null)
- {
- if (IsRegEx)
- {
- regex = new Regex(SearchText, IsCaseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase);
- }
- else
- {
- regex = new Regex(Regex.Escape(SearchText), IsCaseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase);
- }
- }
- return regex;
- }
- }
-
- public bool IsWordMatch { get; set; }
-
- // highlightes search result
- [field: NonSerialized]
- public bool IsSearchHit { get; set; }
-
- public bool IsBold { get; set; }
-
- public bool NoBackground { get; set; }
-
- public object Clone()
- {
- var highLightEntry = new HighlightEntry
- {
- SearchText = SearchText,
- ForegroundColor = ForegroundColor,
- BackgroundColor = BackgroundColor,
- IsRegEx = IsRegEx,
- IsCaseSensitive = IsCaseSensitive,
- IsLedSwitch = IsLedSwitch,
- IsStopTail = IsStopTail,
- IsSetBookmark = IsSetBookmark,
- IsActionEntry = IsActionEntry,
- ActionEntry = ActionEntry != null ? (ActionEntry)ActionEntry.Clone() : null,
- IsWordMatch = IsWordMatch,
- IsBold = IsBold,
- BookmarkComment = BookmarkComment,
- NoBackground = NoBackground,
- IsSearchHit = IsSearchHit
- };
-
- return highLightEntry;
- }
-
- #endregion Properties
- }
+using Newtonsoft.Json;
+
+using System;
+using System.Drawing;
+using System.Text.RegularExpressions;
+
+namespace LogExpert.Classes.Highlight
+{
+ [Serializable]
+ [method: JsonConstructor]
+ public class HilightEntry() : ICloneable
+ {
+ #region Fields
+
+ [NonSerialized] private Regex regex = null;
+
+ private string _searchText = string.Empty;
+
+ #endregion Fields
+
+ #region Properties
+
+ public bool IsStopTail { get; set; }
+
+ public bool IsSetBookmark { get; set; }
+
+ public bool IsRegEx { get; set; }
+
+ public bool IsCaseSensitive { get; set; }
+
+ public Color ForegroundColor { get; set; }
+
+ public Color BackgroundColor { get; set; }
+
+ public string SearchText
+ {
+ get => _searchText;
+ set
+ {
+ _searchText = value;
+ regex = null;
+ }
+ }
+
+ public bool IsLedSwitch { get; set; }
+
+ public ActionEntry ActionEntry { get; set; }
+
+ public bool IsActionEntry { get; set; }
+
+ public string BookmarkComment { get; set; }
+
+ public Regex Regex
+ {
+ get
+ {
+ if (regex == null)
+ {
+ if (IsRegEx)
+ {
+ regex = new Regex(SearchText, IsCaseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase);
+ }
+ else
+ {
+ regex = new Regex(Regex.Escape(SearchText), IsCaseSensitive ? RegexOptions.None : RegexOptions.IgnoreCase);
+ }
+ }
+ return regex;
+ }
+ }
+
+ public bool IsWordMatch { get; set; }
+
+ // highlightes search result
+ [field: NonSerialized]
+ public bool IsSearchHit { get; set; }
+
+ public bool IsBold { get; set; }
+
+ public bool NoBackground { get; set; }
+
+ public object Clone()
+ {
+ var highLightEntry = new HilightEntry
+ {
+ SearchText = SearchText,
+ ForegroundColor = ForegroundColor,
+ BackgroundColor = BackgroundColor,
+ IsRegEx = IsRegEx,
+ IsCaseSensitive = IsCaseSensitive,
+ IsLedSwitch = IsLedSwitch,
+ IsStopTail = IsStopTail,
+ IsSetBookmark = IsSetBookmark,
+ IsActionEntry = IsActionEntry,
+ ActionEntry = ActionEntry != null ? (ActionEntry)ActionEntry.Clone() : null,
+ IsWordMatch = IsWordMatch,
+ IsBold = IsBold,
+ BookmarkComment = BookmarkComment,
+ NoBackground = NoBackground,
+ IsSearchHit = IsSearchHit
+ };
+
+ return highLightEntry;
+ }
+
+ #endregion Properties
+ }
}
\ No newline at end of file
diff --git a/src/LogExpert/Classes/Highlight/HilightMatchEntry.cs b/src/LogExpert/Classes/Highlight/HilightMatchEntry.cs
index 5f988d69..b1e3fcdd 100644
--- a/src/LogExpert/Classes/Highlight/HilightMatchEntry.cs
+++ b/src/LogExpert/Classes/Highlight/HilightMatchEntry.cs
@@ -7,7 +7,7 @@ public class HilightMatchEntry
{
#region Properties
- public HighlightEntry HilightEntry { get; set; }
+ public HilightEntry HilightEntry { get; set; }
public int StartPos { get; set; }
diff --git a/src/LogExpert/Classes/Log/LogFileInfo.cs b/src/LogExpert/Classes/Log/LogFileInfo.cs
index 31bd9bc8..882dd6dc 100644
--- a/src/LogExpert/Classes/Log/LogFileInfo.cs
+++ b/src/LogExpert/Classes/Log/LogFileInfo.cs
@@ -102,7 +102,7 @@ public bool FileExists
public int PollInterval
{
- get { return ConfigManager.Settings.Preferences.pollingInterval; }
+ get { return ConfigManager.Settings.preferences.pollingInterval; }
}
public long LengthWithoutRetry
diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
index 6a5486dd..e30b5ea9 100644
--- a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
+++ b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs
@@ -1,9 +1,7 @@
-using LogExpert.Config;
-using LogExpert.Entities;
-
-using System;
+using System;
using System.IO;
using System.Text;
+using LogExpert.Entities;
namespace LogExpert.Classes.Log
{
@@ -11,6 +9,8 @@ public abstract class PositionAwareStreamReaderBase : LogStreamReaderBase
{
#region Fields
+ private const int MAX_LINE_LEN = 20000;
+
private static readonly Encoding[] _preambleEncodings = { Encoding.UTF8, Encoding.Unicode, Encoding.BigEndianUnicode, Encoding.UTF32 };
private readonly BufferedStream _stream;
@@ -35,7 +35,7 @@ protected PositionAwareStreamReaderBase(Stream stream, EncodingOptions encodingO
_posIncPrecomputed = GetPosIncPrecomputed(usedEncoding);
_reader = new StreamReader(_stream, usedEncoding, true);
-
+
Position = 0;
}
@@ -54,7 +54,7 @@ public sealed override long Position
/*
* 1: Sometime commented (+Encoding.GetPreamble().Length)
* 2: Date 1.1 3207
- * 3: Error Message from Piet because of Unicode-Bugs.
+ * 3: Error Message from Piet because of Unicode-Bugs.
* No Idea, if this is OK.
* 4: 27.07.09: Preamble-Length is now calculated in CT, because Encoding.GetPreamble().Length
* always delivers a fixed length (does not mater what kind of data)
@@ -72,7 +72,7 @@ public sealed override long Position
public sealed override bool IsBufferComplete => true;
- protected static int MaxLineLen => ConfigManager.Settings.Preferences.MaxLineLength;
+ protected static int MaxLineLen => MAX_LINE_LEN;
#endregion
@@ -149,11 +149,11 @@ protected void MovePosition(int offset)
private int DetectPreambleLengthAndEncoding(out Encoding detectedEncoding)
{
/*
- UTF-8: EF BB BF
- UTF-16-Big-Endian-Byteorder: FE FF
- UTF-16-Little-Endian-Byteorder: FF FE
- UTF-32-Big-Endian-Byteorder: 00 00 FE FF
- UTF-32-Little-Endian-Byteorder: FF FE 00 00
+ UTF-8: EF BB BF
+ UTF-16-Big-Endian-Byteorder: FE FF
+ UTF-16-Little-Endian-Byteorder: FF FE
+ UTF-32-Big-Endian-Byteorder: 00 00 FE FF
+ UTF-32-Little-Endian-Byteorder: FF FE 00 00
*/
byte[] readPreamble = new byte[4];
@@ -205,17 +205,17 @@ private int GetPosIncPrecomputed(Encoding usedEncoding)
switch (usedEncoding)
{
case UTF8Encoding _:
- {
- return 0;
- }
+ {
+ return 0;
+ }
case UnicodeEncoding _:
- {
- return 2;
- }
+ {
+ return 2;
+ }
default:
- {
- return 1;
- }
+ {
+ return 1;
+ }
}
}
diff --git a/src/LogExpert/Classes/PaintHelper.cs b/src/LogExpert/Classes/PaintHelper.cs
index 571e9000..ae921e9e 100644
--- a/src/LogExpert/Classes/PaintHelper.cs
+++ b/src/LogExpert/Classes/PaintHelper.cs
@@ -26,13 +26,14 @@ internal class PaintHelper
#region Properties
- private static Preferences Preferences => ConfigManager.Settings.Preferences;
+ private static Preferences Preferences => ConfigManager.Settings.preferences;
#endregion
#region Public methods
- public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
+ public static void CellPainting(ILogPaintContext logPaintCtx, DataGridView gridView, int rowIndex,
+ DataGridViewCellPaintingEventArgs e)
{
if (rowIndex < 0 || e.ColumnIndex < 0)
{
@@ -40,19 +41,17 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
return;
}
ILogLine line = logPaintCtx.GetLogLine(rowIndex);
-
if (line != null)
{
- HighlightEntry entry = logPaintCtx.FindHighlightEntry(line, true);
+ HilightEntry entry = logPaintCtx.FindHighlightEntry(line, true);
e.Graphics.SetClip(e.CellBounds);
if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected)
{
Color backColor = e.CellStyle.SelectionBackColor;
Brush brush;
-
if (gridView.Focused)
{
- brush = new SolidBrush(backColor);
+ brush = new SolidBrush(e.CellStyle.SelectionBackColor);
}
else
{
@@ -64,8 +63,7 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
}
else
{
- Color bgColor = ColorMode.DockBackgroundColor;
-
+ Color bgColor = LogExpert.Config.ColorMode.DockBackgroundColor;
if (!DebugOptions.disableWordHighlight)
{
if (entry != null)
@@ -80,7 +78,6 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
bgColor = entry.BackgroundColor;
}
}
-
e.CellStyle.BackColor = bgColor;
e.PaintBackground(e.ClipBounds, false);
}
@@ -97,7 +94,6 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
if (e.ColumnIndex == 0)
{
Entities.Bookmark bookmark = logPaintCtx.GetBookmarkForLine(rowIndex);
-
if (bookmark != null)
{
Rectangle r; // = new Rectangle(e.CellBounds.Left + 2, e.CellBounds.Top + 2, 6, 6);
@@ -106,15 +102,11 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
Brush brush = new SolidBrush(logPaintCtx.BookmarkColor);
e.Graphics.FillRectangle(brush, r);
brush.Dispose();
-
if (bookmark.Text.Length > 0)
{
- StringFormat format = new()
- {
- LineAlignment = StringAlignment.Center,
- Alignment = StringAlignment.Center
- };
-
+ StringFormat format = new();
+ format.LineAlignment = StringAlignment.Center;
+ format.Alignment = StringAlignment.Center;
Brush brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0));
Font font = logPaintCtx.MonospacedFont;
e.Graphics.DrawString("i", font, brush2, new RectangleF(r.Left, r.Top, r.Width, r.Height),
@@ -132,49 +124,43 @@ public static void CellPainting(ILogPaintContext logPaintCtx, BufferedDataGridVi
public static DataGridViewTextBoxColumn CreateMarkerColumn()
{
- DataGridViewTextBoxColumn markerColumn = new()
- {
- HeaderText = "",
- AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
- Resizable = DataGridViewTriState.False,
- DividerWidth = 1,
- ReadOnly = true,
- SortMode = DataGridViewColumnSortMode.NotSortable
- };
+ DataGridViewTextBoxColumn markerColumn = new();
+ markerColumn.HeaderText = "";
+ markerColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
+ markerColumn.Resizable = DataGridViewTriState.False;
+ markerColumn.DividerWidth = 1;
+ markerColumn.ReadOnly = true;
+ markerColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
return markerColumn;
}
public static DataGridViewTextBoxColumn CreateLineNumberColumn()
{
- DataGridViewTextBoxColumn lineNumberColumn = new()
- {
- HeaderText = "Line",
- AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
- Resizable = DataGridViewTriState.NotSet,
- DividerWidth = 1,
- ReadOnly = true,
- SortMode = DataGridViewColumnSortMode.NotSortable
- };
+ DataGridViewTextBoxColumn lineNumberColumn = new();
+ lineNumberColumn.HeaderText = "Line";
+ lineNumberColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
+ lineNumberColumn.Resizable = DataGridViewTriState.NotSet;
+ lineNumberColumn.DividerWidth = 1;
+ lineNumberColumn.ReadOnly = true;
+ lineNumberColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
return lineNumberColumn;
}
public static DataGridViewColumn CreateTitleColumn(string colName)
{
- DataGridViewColumn titleColumn = new LogTextColumn
- {
- HeaderText = colName,
- AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet,
- Resizable = DataGridViewTriState.NotSet,
- DividerWidth = 1,
- SortMode = DataGridViewColumnSortMode.NotSortable
- };
+ DataGridViewColumn titleColumn = new LogTextColumn();
+ titleColumn.HeaderText = colName;
+ titleColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.NotSet;
+ titleColumn.Resizable = DataGridViewTriState.NotSet;
+ titleColumn.DividerWidth = 1;
+ titleColumn.SortMode = DataGridViewColumnSortMode.NotSortable;
return titleColumn;
}
- public static void SetColumnizer(ILogLineColumnizer columnizer, BufferedDataGridView gridView)
+ public static void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gridView)
{
int rowCount = gridView.RowCount;
int currLine = gridView.CurrentCellAddress.Y;
@@ -213,7 +199,7 @@ public static void SetColumnizer(ILogLineColumnizer columnizer, BufferedDataGrid
//AutoResizeColumns(gridView);
}
- public static void AutoResizeColumns(BufferedDataGridView gridView)
+ public static void AutoResizeColumns(DataGridView gridView)
{
try
{
@@ -237,7 +223,7 @@ public static void AutoResizeColumns(BufferedDataGridView gridView)
}
}
- public static void ApplyDataGridViewPrefs(BufferedDataGridView dataGridView, Preferences prefs)
+ public static void ApplyDataGridViewPrefs(DataGridView dataGridView, Preferences prefs)
{
if (dataGridView.Columns.Count > 1)
{
@@ -264,43 +250,30 @@ public static void ApplyDataGridViewPrefs(BufferedDataGridView dataGridView, Pre
public static Rectangle BorderWidths(DataGridViewAdvancedBorderStyle advancedBorderStyle)
{
- Rectangle rect = new()
- {
- X = advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.None
- ? 0
- : 1
- };
+ Rectangle rect = new();
+ rect.X = advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
if (advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
advancedBorderStyle.Left == DataGridViewAdvancedCellBorderStyle.InsetDouble)
{
rect.X++;
}
- rect.Y = advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.None
- ? 0
- : 1;
-
+ rect.Y = advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
if (advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
advancedBorderStyle.Top == DataGridViewAdvancedCellBorderStyle.InsetDouble)
{
rect.Y++;
}
- rect.Width = advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.None
- ? 0
- : 1;
-
+ rect.Width = advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
if (advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
advancedBorderStyle.Right == DataGridViewAdvancedCellBorderStyle.InsetDouble)
{
rect.Width++;
}
- rect.Height = advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.None
- ? 0
- : 1;
-
+ rect.Height = advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.None ? 0 : 1;
if (advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.OutsetDouble ||
advancedBorderStyle.Bottom == DataGridViewAdvancedCellBorderStyle.InsetDouble)
{
@@ -317,12 +290,12 @@ public static Rectangle BorderWidths(DataGridViewAdvancedBorderStyle advancedBor
#region Private Methods
- private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HighlightEntry groundEntry)
+ private static void PaintCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
{
PaintHighlightedCell(logPaintCtx, e, gridView, noBackgroundFill, groundEntry);
}
- private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, BufferedDataGridView gridView, bool noBackgroundFill, HighlightEntry groundEntry)
+ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HilightEntry groundEntry)
{
object value = e.Value ?? string.Empty;
@@ -337,13 +310,11 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
{
if (string.IsNullOrEmpty(column.FullValue) == false)
{
- HilightMatchEntry hme = new()
- {
- StartPos = 0,
- Length = column.FullValue.Length
- };
+ HilightMatchEntry hme = new();
+ hme.StartPos = 0;
+ hme.Length = column.FullValue.Length;
- var he = new HighlightEntry
+ var he = new HilightEntry
{
SearchText = column.FullValue,
ForegroundColor = groundEntry?.ForegroundColor ?? ColorMode.ForeColor,
@@ -364,16 +335,12 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
}
int leftPad = e.CellStyle.Padding.Left;
-
RectangleF rect = new(e.CellBounds.Left + leftPad, e.CellBounds.Top, e.CellBounds.Width, e.CellBounds.Height);
-
Rectangle borderWidths = BorderWidths(e.AdvancedBorderStyle);
Rectangle valBounds = e.CellBounds;
-
valBounds.Offset(borderWidths.X, borderWidths.Y);
valBounds.Width -= borderWidths.Right;
valBounds.Height -= borderWidths.Bottom;
-
if (e.CellStyle.Padding != Padding.Empty)
{
valBounds.Offset(e.CellStyle.Padding.Left, e.CellStyle.Padding.Top);
@@ -381,6 +348,7 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
valBounds.Height -= e.CellStyle.Padding.Vertical;
}
+
TextFormatFlags flags =
TextFormatFlags.Left
| TextFormatFlags.SingleLine
@@ -459,7 +427,7 @@ private static void PaintHighlightedCell(ILogPaintContext logPaintCtx, DataGridV
private static IList MergeHighlightMatchEntries(IList matchList, HilightMatchEntry groundEntry)
{
// Fill an area with lenth of whole text with a default hilight entry
- HighlightEntry[] entryArray = new HighlightEntry[groundEntry.Length];
+ HilightEntry[] entryArray = new HilightEntry[groundEntry.Length];
for (int i = 0; i < entryArray.Length; ++i)
{
entryArray[i] = groundEntry.HilightEntry;
@@ -487,30 +455,26 @@ private static IList MergeHighlightMatchEntries(IList mergedList = new List();
if (entryArray.Length > 0)
{
- HighlightEntry currentEntry = entryArray[0];
+ HilightEntry currentEntry = entryArray[0];
int lastStartPos = 0;
int pos = 0;
for (; pos < entryArray.Length; ++pos)
{
if (entryArray[pos] != currentEntry)
{
- HilightMatchEntry me = new()
- {
- StartPos = lastStartPos,
- Length = pos - lastStartPos,
- HilightEntry = currentEntry
- };
+ HilightMatchEntry me = new();
+ me.StartPos = lastStartPos;
+ me.Length = pos - lastStartPos;
+ me.HilightEntry = currentEntry;
mergedList.Add(me);
currentEntry = entryArray[pos];
lastStartPos = pos;
}
}
- HilightMatchEntry me2 = new()
- {
- StartPos = lastStartPos,
- Length = pos - lastStartPos,
- HilightEntry = currentEntry
- };
+ HilightMatchEntry me2 = new();
+ me2.StartPos = lastStartPos;
+ me2.Length = pos - lastStartPos;
+ me2.HilightEntry = currentEntry;
mergedList.Add(me2);
}
return mergedList;
diff --git a/src/LogExpert/Classes/PluginRegistry.cs b/src/LogExpert/Classes/PluginRegistry.cs
index fb00f7aa..ec2a7099 100644
--- a/src/LogExpert/Classes/PluginRegistry.cs
+++ b/src/LogExpert/Classes/PluginRegistry.cs
@@ -118,7 +118,7 @@ internal void LoadPlugins()
if (o is IColumnizerConfigurator configurator)
{
- configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
+ configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir);
}
if (o is ILogExpertPlugin plugin)
diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs
index 3e203602..daff9877 100644
--- a/src/LogExpert/Config/ColorMode.cs
+++ b/src/LogExpert/Config/ColorMode.cs
@@ -39,7 +39,7 @@ public static class ColorMode
public static void LoadColorMode()
{
- var preferences = ConfigManager.Settings.Preferences;
+ var preferences = ConfigManager.Settings.preferences;
if (preferences.darkMode)
{
diff --git a/src/LogExpert/Config/ConfigManager.cs b/src/LogExpert/Config/ConfigManager.cs
index 2e0ac00e..b8b6bafb 100644
--- a/src/LogExpert/Config/ConfigManager.cs
+++ b/src/LogExpert/Config/ConfigManager.cs
@@ -28,9 +28,6 @@ public class ConfigManager
private static ConfigManager _instance;
private readonly object _loadSaveLock = new();
private Settings _settings;
- private const string _settingsFileName = "settings.json";
- private const string _portableModeSettingsFileName = "portableMode.json";
- private const string _highlightFileName = "highlights.json";
#endregion
@@ -73,7 +70,7 @@ public static ConfigManager Instance
///
/// portableMode.json
///
- public static string PortableModeSettingsFileName => _portableModeSettingsFileName;
+ public static string PortableModeSettingsFileName => "portableMode.json";
public static Settings Settings => Instance._settings;
@@ -86,30 +83,9 @@ public static void Save(SettingsFlags flags)
Instance.Save(Settings, flags);
}
- public static void ExportSettings(FileInfo fileInfo)
+ public static void Export(FileInfo fileInfo)
{
- Save(fileInfo, Settings);
- }
-
- public static void ExportHighlightSettings(FileInfo fileInfo)
- {
- SaveHighlightSettings(fileInfo);
- }
-
- public static void ImportHighlightSettings(FileInfo fileInfo)
- {
- try
- {
- var highlightGroupList = JsonConvert.DeserializeObject>(File.ReadAllText(fileInfo.FullName));
- Instance._settings.Preferences.HighlightGroupList = highlightGroupList;
- }
- catch (Exception e)
- {
- _logger.Error($"Error while deserializing config data: {e}");
- //Keep the old settings
- }
-
- Save(SettingsFlags.HighlightSettings);
+ Instance.Save(fileInfo, Settings);
}
public static void Import(FileInfo fileInfo, ExportImportFlags flags)
@@ -139,88 +115,35 @@ private Settings Load()
dir = Application.StartupPath;
}
- if (Directory.Exists(dir) == false)
+ if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
- if (File.Exists(dir + Path.DirectorySeparatorChar + _settingsFileName) == false)
+ if (!File.Exists(dir + Path.DirectorySeparatorChar + "settings.json"))
{
- var settings = LoadOrCreateNew(null);
- var highlightGroups = LoadOrCreateNewHighLlightGroups(null);
-
- settings.Preferences.HighlightGroupList = highlightGroups;
- return settings;
+ return LoadOrCreateNew(null);
}
try
{
- FileInfo fileInfoSettings = new(dir + Path.DirectorySeparatorChar + _settingsFileName);
- var settings = LoadOrCreateNew(fileInfoSettings);
-
- FileInfo fileInfoHighlightGroups = new(dir + Path.DirectorySeparatorChar + _highlightFileName);
- var highlightGroups = LoadOrCreateNewHighLlightGroups(fileInfoHighlightGroups);
-
- settings.Preferences.HighlightGroupList = highlightGroups;
- return settings;
-
+ FileInfo fileInfo = new(dir + Path.DirectorySeparatorChar + "settings.json");
+ return LoadOrCreateNew(fileInfo);
}
catch (Exception e)
{
_logger.Error($"Error loading settings: {e}");
- var settings = LoadOrCreateNew(null);
- var highlightGroups = LoadOrCreateNewHighLlightGroups(null);
-
- settings.Preferences.HighlightGroupList = highlightGroups;
- return settings;
+ return LoadOrCreateNew(null);
}
}
- private List LoadOrCreateNewHighLlightGroups(FileInfo fileInfo)
- {
- lock (_loadSaveLock)
- {
- List highlightGroupList = [];
-
- if (fileInfo == null || fileInfo.Exists == false)
- {
- return [];
- }
- else
- {
- try
- {
- highlightGroupList = JsonConvert.DeserializeObject>(File.ReadAllText(fileInfo.FullName));
- }
- catch (Exception e)
- {
- _logger.Error($"Error while deserializing config data: {e}");
- return [];
- }
- }
-
- if (highlightGroupList == null || highlightGroupList.Count == 0)
- {
- HighlightGroup defaultGroup = new()
- {
- GroupName = "[Default]",
- HighlightEntryList = []
- };
-
- highlightGroupList.Add(defaultGroup);
- }
-
- return highlightGroupList;
- }
- }
-
///
/// Loads Settings of a given file or creates new settings if the file does not exist
///
/// file that has settings saved
/// loaded or created settings
- private Settings LoadOrCreateNew(FileInfo fileInfo)
+ private Settings LoadOrCreateNew(FileSystemInfo fileInfo)
{
lock (_loadSaveLock)
{
@@ -243,11 +166,11 @@ private Settings LoadOrCreateNew(FileInfo fileInfo)
}
}
- settings.Preferences ??= new Preferences();
+ settings.preferences ??= new Preferences();
- settings.Preferences.toolEntries ??= [];
+ settings.preferences.toolEntries ??= [];
- settings.Preferences.columnizerMaskList ??= [];
+ settings.preferences.columnizerMaskList ??= [];
settings.fileHistoryList ??= [];
@@ -255,24 +178,24 @@ private Settings LoadOrCreateNew(FileInfo fileInfo)
settings.fileColors ??= [];
- if (settings.Preferences.showTailColor == Color.Empty)
+ if (settings.preferences.showTailColor == Color.Empty)
{
- settings.Preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);
+ settings.preferences.showTailColor = Color.FromKnownColor(KnownColor.Blue);
}
- if (settings.Preferences.timeSpreadColor == Color.Empty)
+ if (settings.preferences.timeSpreadColor == Color.Empty)
{
- settings.Preferences.timeSpreadColor = Color.Gray;
+ settings.preferences.timeSpreadColor = Color.Gray;
}
- if (settings.Preferences.bufferCount < 10)
+ if (settings.preferences.bufferCount < 10)
{
- settings.Preferences.bufferCount = 100;
+ settings.preferences.bufferCount = 100;
}
- if (settings.Preferences.linesPerBuffer < 1)
+ if (settings.preferences.linesPerBuffer < 1)
{
- settings.Preferences.linesPerBuffer = 500;
+ settings.preferences.linesPerBuffer = 500;
}
settings.filterList ??= [];
@@ -288,29 +211,44 @@ private Settings LoadOrCreateNew(FileInfo fileInfo)
filterParams.Init();
}
- settings.Preferences.HighlightMaskList ??= [];
+ if (settings.hilightGroupList == null)
+ {
+ settings.hilightGroupList = [];
+ // migrate old non-grouped entries
+ HilightGroup defaultGroup = new()
+ {
+ GroupName = "[Default]",
+ HilightEntryList = settings.hilightEntryList
+ };
+
+ settings.hilightGroupList.Add(defaultGroup);
+ }
+
+ settings.preferences.highlightMaskList ??= [];
- if (settings.Preferences.pollingInterval < 20)
+ if (settings.preferences.pollingInterval < 20)
{
- settings.Preferences.pollingInterval = 250;
+ settings.preferences.pollingInterval = 250;
}
- settings.Preferences.multiFileOptions ??= new MultiFileOptions();
+ settings.preferences.multiFileOptions ??= new MultiFileOptions();
- settings.Preferences.defaultEncoding ??= Encoding.Default.HeaderName;
+ settings.preferences.defaultEncoding ??= Encoding.Default.HeaderName;
- if (settings.Preferences.maximumFilterEntriesDisplayed == 0)
+ if (settings.preferences.maximumFilterEntriesDisplayed == 0)
{
- settings.Preferences.maximumFilterEntriesDisplayed = 20;
+ settings.preferences.maximumFilterEntriesDisplayed = 20;
}
- if (settings.Preferences.maximumFilterEntries == 0)
+ if (settings.preferences.maximumFilterEntries == 0)
{
- settings.Preferences.maximumFilterEntries = 30;
+ settings.preferences.maximumFilterEntries = 30;
}
SetBoundsWithinVirtualScreen(settings);
+ ConvertSettings(settings);
+
return settings;
}
}
@@ -327,22 +265,19 @@ private void Save(Settings settings, SettingsFlags flags)
_logger.Info("Saving settings");
lock (this)
{
- string dir = Settings.Preferences.PortableMode ? Application.StartupPath : ConfigDir;
+ string dir = Settings.preferences.PortableMode ? Application.StartupPath : ConfigDir;
if (!Directory.Exists(dir))
{
Directory.CreateDirectory(dir);
}
- FileInfo fileInfo = new(dir + Path.DirectorySeparatorChar + _highlightFileName);
- SaveHighlightSettings(fileInfo);
-
- fileInfo = new(dir + Path.DirectorySeparatorChar + _settingsFileName);
+ FileInfo fileInfo = new(dir + Path.DirectorySeparatorChar + "settings.json");
Save(fileInfo, settings);
}
- }
- OnConfigChanged(flags);
+ OnConfigChanged(flags);
+ }
}
///
@@ -350,33 +285,71 @@ private void Save(Settings settings, SettingsFlags flags)
///
/// FileInfo for creating the file (if exists will be overwritten)
/// Current Settings
- private static void Save(FileInfo fileInfo, Settings settings)
+ private void Save(FileInfo fileInfo, Settings settings)
{
//Currently only fileFormat, maybe add some other formats later (YAML or XML?)
SaveAsJSON(fileInfo, settings);
}
- private static void SaveHighlightSettings(FileInfo fileInfo)
+ private void SaveAsJSON(FileInfo fileInfo, Settings settings)
{
- SaveAsJSON(fileInfo, Settings.Preferences.HighlightGroupList);
- }
+ settings.versionBuild = Assembly.GetExecutingAssembly().GetName().Version.Build;
- private static void SaveAsJSON(FileInfo fileInfo, List hilightGroups)
- {
using StreamWriter sw = new(fileInfo.Create());
JsonSerializer serializer = new();
- serializer.Serialize(sw, hilightGroups);
+ serializer.Serialize(sw, settings);
}
- private static void SaveAsJSON(FileInfo fileInfo, Settings settings)
+ ///
+ /// Convert settings loaded from previous versions.
+ ///
+ ///
+ private void ConvertSettings(Settings settings)
{
- settings.versionBuild = Assembly.GetExecutingAssembly().GetName().Version.Build;
-
- using StreamWriter sw = new(fileInfo.Create());
- JsonSerializer serializer = new();
- serializer.Serialize(sw, settings);
+ //int oldBuildNumber = settings.versionBuild;
+
+ //// All Versions before 3583
+ //if (oldBuildNumber < 3584)
+ //{
+ // // External tools
+ // List newList = [];
+ // foreach (ToolEntry tool in settings.preferences.toolEntries)
+ // {
+ // // set favourite to true only when name is empty, because there are always version released without this conversion fx
+ // // remove empty tool entries (there were always 3 entries before, which can be empty if not used)
+ // if (Util.IsNull(tool.name))
+ // {
+ // if (!Util.IsNull(tool.cmd))
+ // {
+ // tool.name = tool.cmd;
+ // tool.isFavourite = true;
+ // newList.Add(tool);
+ // }
+ // }
+ // else
+ // {
+ // newList.Add(tool);
+ // }
+ // if (Util.IsNull(tool.iconFile))
+ // {
+ // tool.iconFile = tool.cmd;
+ // tool.iconIndex = 0;
+ // }
+ // }
+ // settings.preferences.toolEntries = newList;
+ //}
+
+ //if (oldBuildNumber < 3584)
+ //{
+ // // Set the color for the FilterList entries to default (black)
+ // foreach (FilterParams filterParam in settings.filterList)
+ // {
+ // filterParam.color = Color.FromKnownColor(KnownColor.Black);
+ // }
+ //}
}
+
///
/// Imports all or some of the settings/prefs stored in the input stream.
/// This will overwrite appropriate parts of the current (own) settings with the imported ones.
@@ -394,10 +367,11 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor
if ((flags & ExportImportFlags.Other) == ExportImportFlags.Other)
{
newSettings = ownSettings;
- newSettings.Preferences = ObjectClone.Clone(importSettings.Preferences);
- newSettings.Preferences.columnizerMaskList = ownSettings.Preferences.columnizerMaskList;
- newSettings.Preferences.HighlightMaskList = ownSettings.Preferences.HighlightMaskList;
- newSettings.Preferences.toolEntries = ownSettings.Preferences.toolEntries;
+ newSettings.preferences = ObjectClone.Clone(importSettings.preferences);
+ newSettings.preferences.columnizerMaskList = ownSettings.preferences.columnizerMaskList;
+ newSettings.preferences.highlightMaskList = ownSettings.preferences.highlightMaskList;
+ newSettings.hilightGroupList = ownSettings.hilightGroupList;
+ newSettings.preferences.toolEntries = ownSettings.preferences.toolEntries;
}
else
{
@@ -406,17 +380,19 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor
if ((flags & ExportImportFlags.ColumnizerMasks) == ExportImportFlags.ColumnizerMasks)
{
- newSettings.Preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.columnizerMaskList, importSettings.Preferences.columnizerMaskList);
+ newSettings.preferences.columnizerMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.columnizerMaskList, importSettings.preferences.columnizerMaskList);
}
-
if ((flags & ExportImportFlags.HighlightMasks) == ExportImportFlags.HighlightMasks)
{
- newSettings.Preferences.HighlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.Preferences.HighlightMaskList, importSettings.Preferences.HighlightMaskList);
+ newSettings.preferences.highlightMaskList = ReplaceOrKeepExisting(flags, ownSettings.preferences.highlightMaskList, importSettings.preferences.highlightMaskList);
+ }
+ if ((flags & ExportImportFlags.HighlightSettings) == ExportImportFlags.HighlightSettings)
+ {
+ newSettings.hilightGroupList = ReplaceOrKeepExisting(flags, ownSettings.hilightGroupList, importSettings.hilightGroupList);
}
-
if ((flags & ExportImportFlags.ToolEntries) == ExportImportFlags.ToolEntries)
{
- newSettings.Preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.Preferences.toolEntries, importSettings.Preferences.toolEntries);
+ newSettings.preferences.toolEntries = ReplaceOrKeepExisting(flags, ownSettings.preferences.toolEntries, importSettings.preferences.toolEntries);
}
return newSettings;
@@ -447,7 +423,13 @@ private void SetBoundsWithinVirtualScreen(Settings settings)
protected void OnConfigChanged(SettingsFlags flags)
{
- ConfigChanged?.Invoke(this, new ConfigChangedEventArgs(flags));
+ ConfigChangedEventHandler handler = ConfigChanged;
+
+ if (handler != null)
+ {
+ _logger.Info("Fire config changed event");
+ handler(this, new ConfigChangedEventArgs(flags));
+ }
}
internal delegate void ConfigChangedEventHandler(object sender, ConfigChangedEventArgs e);
diff --git a/src/LogExpert/Config/Preferences.cs b/src/LogExpert/Config/Preferences.cs
index b5c67e21..c0dbc83d 100644
--- a/src/LogExpert/Config/Preferences.cs
+++ b/src/LogExpert/Config/Preferences.cs
@@ -34,7 +34,7 @@ public class Preferences
public float fontSize = 9;
- public List HighlightMaskList { get; set; } = [];
+ public List highlightMaskList = [];
public bool isAutoHideFilterList = false;
@@ -103,10 +103,6 @@ public class Preferences
public bool ShowErrorMessageAllowOnlyOneInstances { get; set; }
- public int MaxLineLength { get; set; } = 20000;
-
- public List HighlightGroupList { get; set; } = [];
-
#endregion
}
}
\ No newline at end of file
diff --git a/src/LogExpert/Config/Settings.cs b/src/LogExpert/Config/Settings.cs
index d8285988..01a10f8e 100644
--- a/src/LogExpert/Config/Settings.cs
+++ b/src/LogExpert/Config/Settings.cs
@@ -1,4 +1,5 @@
using LogExpert.Classes.Filter;
+using LogExpert.Classes.Highlight;
using LogExpert.Entities;
using System;
@@ -34,13 +35,17 @@ public class Settings
public bool hideLineColumn;
+ public List hilightEntryList = []; // legacy. is automatically converted to highlight groups on settings load
+
+ public List hilightGroupList = []; // should be in Preferences but is here for mistake. Maybe I migrate it some day.
+
public bool isMaximized;
public string lastDirectory;
public List lastOpenFilesList = [];
- public Preferences Preferences { get; set; } = new();
+ public Preferences preferences = new();
public RegexHistory regexHistory = new();
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
index 7c203b3b..3a9eb456 100644
--- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
+++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs
@@ -93,7 +93,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum
Load += OnLogTabWindowLoad;
ConfigManager.Instance.ConfigChanged += OnConfigChanged;
- HighlightGroupList = ConfigManager.Settings.Preferences.HighlightGroupList;
+ HilightGroupList = ConfigManager.Settings.hilightGroupList;
Rectangle led = new(0, 0, 8, 2);
@@ -307,9 +307,9 @@ public LogWindow.LogWindow CurrentLogWindow
public SearchParams SearchParams { get; private set; } = new SearchParams();
- public Preferences Preferences => ConfigManager.Settings.Preferences;
+ public Preferences Preferences => ConfigManager.Settings.preferences;
- public List HighlightGroupList { get; private set; } = [];
+ public List HilightGroupList { get; private set; } = [];
//public Settings Settings
//{
@@ -324,11 +324,11 @@ public LogWindow.LogWindow CurrentLogWindow
#region Internals
- internal HighlightGroup FindHighlightGroup(string groupName)
+ internal HilightGroup FindHighlightGroup(string groupName)
{
- lock (HighlightGroupList)
+ lock (HilightGroupList)
{
- foreach (HighlightGroup group in HighlightGroupList)
+ foreach (HilightGroup group in HilightGroupList)
{
if (group.GroupName.Equals(groupName))
{
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
index 89cad9c2..c375a056 100644
--- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
+++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs
@@ -44,7 +44,7 @@ private void OnLogTabWindowLoad(object sender, EventArgs e)
}
}
- if (ConfigManager.Settings.Preferences.openLastFiles && _startupFileNames == null)
+ if (ConfigManager.Settings.preferences.openLastFiles && _startupFileNames == null)
{
List tmpList = ObjectClone.Clone(ConfigManager.Settings.lastOpenFilesList);
@@ -86,7 +86,7 @@ private void OnLogTabWindowClosing(object sender, CancelEventArgs e)
_statusLineThread.Join();
IList deleteLogWindowList = new List();
- ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.Preferences.allowOnlyOneInstance;
+ ConfigManager.Settings.alwaysOnTop = TopMost && ConfigManager.Settings.preferences.allowOnlyOneInstance;
SaveLastOpenFilesList();
foreach (LogWindow.LogWindow logWindow in _logWindowList)
@@ -488,7 +488,7 @@ private void OnLogWindowFilterListChanged(object sender, FilterListChangedEventA
private void OnLogWindowCurrentHighlightGroupChanged(object sender, CurrentHighlightGroupChangedEventArgs e)
{
OnHighlightSettingsChanged();
- ConfigManager.Settings.Preferences.HighlightGroupList = HighlightGroupList;
+ ConfigManager.Settings.hilightGroupList = HilightGroupList;
ConfigManager.Save(SettingsFlags.HighlightSettings);
}
@@ -962,7 +962,7 @@ private void OnLockInstanceToolStripMenuItemClick(object sender, EventArgs e)
private void OnOptionToolStripMenuItemDropDownOpening(object sender, EventArgs e)
{
- lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.Preferences.allowOnlyOneInstance;
+ lockInstanceToolStripMenuItem.Enabled = !ConfigManager.Settings.preferences.allowOnlyOneInstance;
lockInstanceToolStripMenuItem.Checked = StaticData.CurrentLockedMainWindow == this;
}
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs
index da56706e..0f336e3f 100644
--- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs
+++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs
@@ -68,7 +68,7 @@ private void InitBookmarkWindow()
_bookmarkWindow = new BookmarkWindow();
_bookmarkWindow.HideOnClose = true;
_bookmarkWindow.ShowHint = DockState.DockBottom;
- _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, SettingsFlags.All);
+ _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, SettingsFlags.All);
_bookmarkWindow.VisibleChanged += OnBookmarkWindowVisibleChanged;
_firstBookmarkWindowShow = true;
}
@@ -120,15 +120,15 @@ private void SetTooltipText(LogWindow.LogWindow logWindow, string logFileName)
private void FillDefaultEncodingFromSettings(EncodingOptions encodingOptions)
{
- if (ConfigManager.Settings.Preferences.defaultEncoding != null)
+ if (ConfigManager.Settings.preferences.defaultEncoding != null)
{
try
{
- encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.Preferences.defaultEncoding);
+ encodingOptions.DefaultEncoding = Encoding.GetEncoding(ConfigManager.Settings.preferences.defaultEncoding);
}
catch (ArgumentException)
{
- _logger.Warn("Encoding " + ConfigManager.Settings.Preferences.defaultEncoding + " is not a valid encoding");
+ _logger.Warn("Encoding " + ConfigManager.Settings.preferences.defaultEncoding + " is not a valid encoding");
encodingOptions.DefaultEncoding = null;
}
}
@@ -333,7 +333,7 @@ private void ShowHighlightSettingsDialog()
KeywordActionList = PluginRegistry.GetInstance().RegisteredKeywordActions,
Owner = this,
TopMost = TopMost,
- HighlightGroupList = HighlightGroupList,
+ HighlightGroupList = HilightGroupList,
PreSelectedGroupName = groupsComboBoxHighlightGroups.Text
};
@@ -341,9 +341,9 @@ private void ShowHighlightSettingsDialog()
if (res == DialogResult.OK)
{
- HighlightGroupList = dlg.HighlightGroupList;
+ HilightGroupList = dlg.HighlightGroupList;
FillHighlightComboBox();
- ConfigManager.Settings.Preferences.HighlightGroupList = HighlightGroupList;
+ ConfigManager.Settings.hilightGroupList = HilightGroupList;
ConfigManager.Save(SettingsFlags.HighlightSettings);
OnHighlightSettingsChanged();
}
@@ -353,7 +353,7 @@ private void FillHighlightComboBox()
{
string currentGroupName = groupsComboBoxHighlightGroups.Text;
groupsComboBoxHighlightGroups.Items.Clear();
- foreach (HighlightGroup group in HighlightGroupList)
+ foreach (HilightGroup group in HilightGroupList)
{
groupsComboBoxHighlightGroups.Items.Add(group.GroupName);
if (group.GroupName.Equals(currentGroupName))
@@ -426,7 +426,7 @@ private void LoadFiles(string[] names, bool invertLogic)
return;
}
- MultiFileOption option = ConfigManager.Settings.Preferences.multiFileOption;
+ MultiFileOption option = ConfigManager.Settings.preferences.multiFileOption;
if (option == MultiFileOption.Ask)
{
MultiLoadRequestDialog dlg = new();
@@ -622,7 +622,7 @@ private void GuiStateUpdateWorker(GuiStateArgs e)
cellSelectModeToolStripMenuItem.Checked = e.CellSelectMode;
RefreshEncodingMenuBar(e.CurrentEncoding);
- if (e.TimeshiftPossible && ConfigManager.Settings.Preferences.timestampControl)
+ if (e.TimeshiftPossible && ConfigManager.Settings.preferences.timestampControl)
{
dragControlDateTime.MinDateTime = e.MinTimestamp;
dragControlDateTime.MaxDateTime = e.MaxTimestamp;
@@ -952,12 +952,12 @@ private void RefreshEncodingMenuBar(Encoding encoding)
private void OpenSettings(int tabToOpen)
{
- SettingsDialog dlg = new(ConfigManager.Settings.Preferences, this, tabToOpen);
+ SettingsDialog dlg = new(ConfigManager.Settings.preferences, this, tabToOpen);
dlg.TopMost = TopMost;
if (DialogResult.OK == dlg.ShowDialog())
{
- ConfigManager.Settings.Preferences = dlg.Preferences;
+ ConfigManager.Settings.preferences = dlg.Preferences;
ConfigManager.Save(SettingsFlags.Settings);
NotifyWindowsForChangedPrefs(SettingsFlags.Settings);
}
@@ -972,14 +972,13 @@ private void NotifyWindowsForChangedPrefs(SettingsFlags flags)
{
foreach (LogWindow.LogWindow logWindow in _logWindowList)
{
- logWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);
+ logWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);
}
}
- _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags);
-
- HighlightGroupList = ConfigManager.Settings.Preferences.HighlightGroupList;
+ _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.preferences, false, flags);
+ HilightGroupList = ConfigManager.Settings.hilightGroupList;
if ((flags & SettingsFlags.HighlightSettings) == SettingsFlags.HighlightSettings)
{
OnHighlightSettingsChanged();
@@ -991,7 +990,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)
if ((flags & SettingsFlags.WindowPosition) == SettingsFlags.WindowPosition)
{
TopMost = alwaysOnTopToolStripMenuItem.Checked = settings.alwaysOnTop;
- dragControlDateTime.DragOrientation = settings.Preferences.timestampControlDragOrientation;
+ dragControlDateTime.DragOrientation = settings.preferences.timestampControlDragOrientation;
hideLineColumnToolStripMenuItem.Checked = settings.hideLineColumn;
}
@@ -1002,7 +1001,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags)
if ((flags & SettingsFlags.GuiOrColors) == SettingsFlags.GuiOrColors)
{
- SetTabIcons(settings.Preferences);
+ SetTabIcons(settings.preferences);
}
if ((flags & SettingsFlags.ToolSettings) == SettingsFlags.ToolSettings)
diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs
index fd4876f2..90cbc461 100644
--- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs
+++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs
@@ -1,11 +1,4 @@
-using LogExpert.Classes;
-using LogExpert.Classes.Columnizer;
-using LogExpert.Classes.Filter;
-using LogExpert.Config;
-using LogExpert.Dialogs;
-using LogExpert.Entities;
-
-using System;
+using System;
using System.Collections.Generic;
using System.Drawing;
using System.Runtime.InteropServices;
@@ -13,7 +6,12 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Forms;
-
+using LogExpert.Classes;
+using LogExpert.Classes.Columnizer;
+using LogExpert.Classes.Filter;
+using LogExpert.Config;
+using LogExpert.Dialogs;
+using LogExpert.Entities;
using WeifenLuo.WinFormsUI.Docking;
namespace LogExpert.Controls.LogTabWindow
@@ -51,7 +49,7 @@ public LogWindow.LogWindow AddFileTabDeferred(string givenFileName, bool isTempF
{
return AddFileTab(givenFileName, isTempFile, title, forcePersistenceLoading, preProcessColumnizer, true);
}
-
+
public LogWindow.LogWindow AddFileTab(string givenFileName, bool isTempFile, string title, bool forcePersistenceLoading, ILogLineColumnizer preProcessColumnizer, bool doNotAddToDockPanel = false)
{
string logFileName = FindFilenameForSettings(givenFileName);
@@ -90,7 +88,7 @@ public LogWindow.LogWindow AddFileTab(string givenFileName, bool isTempFile, str
AddToFileHistory(givenFileName);
}
- LogWindowData data = logWindow.Tag as LogWindowData;
+ LogWindowData data = logWindow.Tag as LogWindowData;
data.color = _defaultTabColor;
SetTabColor(logWindow, _defaultTabColor);
//data.tabPage.BorderColor = this.defaultTabBorderColor;
@@ -143,7 +141,7 @@ public LogWindow.LogWindow AddMultiFileTab(string[] fileNames)
public void LoadFiles(string[] fileNames)
{
- Invoke(new AddFileTabsDelegate(AddFileTabs), new object[] { fileNames });
+ Invoke(new AddFileTabsDelegate(AddFileTabs), new object[] {fileNames});
}
public void OpenSearchDialog()
@@ -236,7 +234,7 @@ public void ScrollAllTabsToTimestamp(DateTime timestamp, LogWindow.LogWindow sen
public ILogLineColumnizer FindColumnizerByFileMask(string fileName)
{
- foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.Preferences.columnizerMaskList)
+ foreach (ColumnizerMaskEntry entry in ConfigManager.Settings.preferences.columnizerMaskList)
{
if (entry.mask != null)
{
@@ -259,9 +257,9 @@ public ILogLineColumnizer FindColumnizerByFileMask(string fileName)
return null;
}
- public HighlightGroup FindHighlightGroupByFileMask(string fileName)
+ public HilightGroup FindHighlightGroupByFileMask(string fileName)
{
- foreach (HighlightMaskEntry entry in ConfigManager.Settings.Preferences.HighlightMaskList)
+ foreach (HighlightMaskEntry entry in ConfigManager.Settings.preferences.highlightMaskList)
{
if (entry.mask != null)
{
@@ -269,7 +267,7 @@ public HighlightGroup FindHighlightGroupByFileMask(string fileName)
{
if (Regex.IsMatch(fileName, entry.mask))
{
- HighlightGroup group = FindHighlightGroup(entry.highlightGroupName);
+ HilightGroup group = FindHighlightGroup(entry.highlightGroupName);
return group;
}
}
diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs
index 1a922c17..8e726979 100644
--- a/src/LogExpert/Controls/LogWindow/LogWindow.cs
+++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs
@@ -90,7 +90,7 @@ public partial class LogWindow : DockContent, ILogPaintContext, ILogView
private ILogLineColumnizer _currentColumnizer;
//List currentHilightEntryList = new List();
- private HighlightGroup _currentHighlightGroup = new();
+ private HilightGroup _currentHighlightGroup = new();
private SearchParams _currentSearchParams;
@@ -129,7 +129,7 @@ public partial class LogWindow : DockContent, ILogPaintContext, ILogView
private bool _shouldCancel;
private bool _shouldTimestampDisplaySyncingCancel;
private bool _showAdvanced;
- private List _tempHighlightEntryList = [];
+ private List _tempHighlightEntryList = [];
private int _timeShiftSyncLine = 0;
private bool _waitingForClose;
@@ -160,7 +160,7 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
ForcePersistenceLoading = forcePersistenceLoading;
dataGridView.CellValueNeeded += OnDataGridViewCellValueNeeded;
- dataGridView.CellPainting += OnDataGridViewCellPainting;
+ dataGridView.CellPainting += OnDataGridView_CellPainting;
filterGridView.CellValueNeeded += OnFilterGridViewCellValueNeeded;
filterGridView.CellPainting += OnFilterGridViewCellPainting;
@@ -198,7 +198,7 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF
filterComboBox.Items.Add(item);
}
- filterComboBox.DropDownHeight = filterComboBox.ItemHeight * ConfigManager.Settings.Preferences.maximumFilterEntriesDisplayed;
+ filterComboBox.DropDownHeight = filterComboBox.ItemHeight * ConfigManager.Settings.preferences.maximumFilterEntriesDisplayed;
AutoResizeFilterBox();
filterRegexCheckBox.Checked = _filterParams.isRegex;
@@ -499,7 +499,7 @@ public string Title
public string ForcedPersistenceFileName { get; set; } = null;
- public Preferences Preferences => ConfigManager.Settings.Preferences;
+ public Preferences Preferences => ConfigManager.Settings.preferences;
public string GivenFileName { get; set; } = null;
@@ -561,13 +561,10 @@ internal void RefreshAllGrids()
internal void ChangeMultifileMask()
{
- MultiFileMaskDialog dlg = new(this, FileName)
- {
- Owner = this,
- MaxDays = _multiFileOptions.MaxDayTry,
- FileNamePattern = _multiFileOptions.FormatPattern
- };
-
+ MultiFileMaskDialog dlg = new(this, FileName);
+ dlg.Owner = this;
+ dlg.MaxDays = _multiFileOptions.MaxDayTry;
+ dlg.FileNamePattern = _multiFileOptions.FormatPattern;
if (dlg.ShowDialog() == DialogResult.OK)
{
_multiFileOptions.FormatPattern = dlg.FileNamePattern;
@@ -582,7 +579,6 @@ internal void ChangeMultifileMask()
internal void ToggleColumnFinder(bool show, bool setFocus)
{
_guiStateArgs.ColumnFinderVisible = show;
-
if (show)
{
columnComboBox.AutoCompleteMode = AutoCompleteMode.Suggest;
@@ -650,7 +646,7 @@ private void OnButtonSizeChanged(object sender, EventArgs e)
private delegate void PositionAfterReloadFx(ReloadMemento reloadMemento);
- private delegate void AutoResizeColumnsFx(BufferedDataGridView gridView);
+ private delegate void AutoResizeColumnsFx(DataGridView gridView);
private delegate bool BoolReturnDelegate();
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs
index 2d6655fe..4cb1aa51 100644
--- a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs
+++ b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs
@@ -279,7 +279,6 @@ private void OnDataGridViewCellValuePushed(object sender, DataGridViewCellValueE
ColumnizerCallbackObject.LineNum = e.RowIndex;
IColumnizedLogLine cols = CurrentColumnizer.SplitLine(ColumnizerCallbackObject, line);
CurrentColumnizer.SetTimeOffset(offset);
-
if (cols.ColumnValues.Length <= e.ColumnIndex - 2)
{
return;
@@ -293,10 +292,9 @@ private void OnDataGridViewCellValuePushed(object sender, DataGridViewCellValueE
TimeSpan timeSpan = new(CurrentColumnizer.GetTimeOffset() * TimeSpan.TicksPerMillisecond);
string span = timeSpan.ToString();
int index = span.LastIndexOf('.');
-
if (index > 0)
{
- span = span[..(index + 4)];
+ span = span.Substring(0, index + 4);
}
SetTimeshiftValue(span);
@@ -314,7 +312,6 @@ private void OnDataGridViewCurrentCellChanged(object sender, EventArgs e)
{
_statusEventArgs.CurrentLineNum = dataGridView.CurrentRow.Index + 1;
SendStatusLineUpdate();
-
if (syncFilterCheckBox.Checked)
{
SyncFilterGridPos();
@@ -374,7 +371,7 @@ private void OnFilterSearchButtonClick(object sender, EventArgs e)
private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintingEventArgs e)
{
- BufferedDataGridView gridView = (BufferedDataGridView)sender;
+ DataGridView gridView = (DataGridView)sender;
if (e.RowIndex < 0 || e.ColumnIndex < 0 || _filterResultList.Count <= e.RowIndex)
{
@@ -384,20 +381,17 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin
int lineNum = _filterResultList[e.RowIndex];
ILogLine line = _logFileReader.GetLogLineWithWait(lineNum).Result;
-
if (line != null)
{
- HighlightEntry entry = FindFirstNoWordMatchHilightEntry(line);
+ HilightEntry entry = FindFirstNoWordMatchHilightEntry(line);
e.Graphics.SetClip(e.CellBounds);
-
if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected)
{
Color backColor = e.CellStyle.SelectionBackColor;
Brush brush;
-
if (gridView.Focused)
{
- brush = new SolidBrush(backColor);
+ brush = new SolidBrush(e.CellStyle.SelectionBackColor);
}
else
{
@@ -451,14 +445,10 @@ private void OnFilterGridViewCellPainting(object sender, DataGridViewCellPaintin
Rectangle r = new(e.CellBounds.Left + 2, e.CellBounds.Top + 2, 6, 6);
r = e.CellBounds;
r.Inflate(-2, -2);
-
Brush brush = new SolidBrush(BookmarkColor);
-
e.Graphics.FillRectangle(brush, r);
-
brush.Dispose();
Bookmark bookmark = _bookmarkProvider.GetBookmarkForLine(lineNum);
-
if (bookmark.Text.Length > 0)
{
StringFormat format = new();
@@ -504,7 +494,8 @@ private void OnFilterComboBoxKeyDown(object sender, KeyEventArgs e)
}
}
- private void OnFilterGridViewColumnDividerDoubleClick(object sender, DataGridViewColumnDividerDoubleClickEventArgs e)
+ private void OnFilterGridViewColumnDividerDoubleClick(object sender,
+ DataGridViewColumnDividerDoubleClickEventArgs e)
{
e.Handled = true;
AutoResizeColumnsFx fx = AutoResizeColumns;
@@ -575,11 +566,9 @@ private void OnFilterGridViewKeyDown(object sender, KeyEventArgs e)
break;
}
case Keys.Tab when e.Modifiers == Keys.None:
- {
- dataGridView.Focus();
- e.Handled = true;
- break;
- }
+ dataGridView.Focus();
+ e.Handled = true;
+ break;
}
}
@@ -665,12 +654,10 @@ private void OnDataGridViewSelectionChanged(object sender, EventArgs e)
private void OnSelectionChangedTriggerSignal(object sender, EventArgs e)
{
int selCount = 0;
-
try
{
_logger.Debug("Selection changed trigger");
selCount = dataGridView.SelectedRows.Count;
-
if (selCount > 1)
{
StatusLineText(selCount + " selected lines");
@@ -1044,13 +1031,11 @@ private void OnFilterGridViewCellContextMenuStripNeeded(object sender, DataGridV
private void OnColumnContextMenuStripOpening(object sender, CancelEventArgs e)
{
Control ctl = columnContextMenuStrip.SourceControl;
- BufferedDataGridView gridView = ctl as BufferedDataGridView;
-
+ DataGridView gridView = ctl as DataGridView;
bool frozen = false;
-
- if (_freezeStateMap.TryGetValue(ctl, out bool value))
+ if (_freezeStateMap.ContainsKey(ctl))
{
- frozen = value;
+ frozen = _freezeStateMap[ctl];
}
freezeLeftColumnsUntilHereToolStripMenuItem.Checked = frozen;
@@ -1061,7 +1046,7 @@ private void OnColumnContextMenuStripOpening(object sender, CancelEventArgs e)
}
else
{
- if (ctl is BufferedDataGridView)
+ if (ctl is DataGridView)
{
freezeLeftColumnsUntilHereToolStripMenuItem.Text = $"Freeze left columns until here ({gridView.Columns[_selectedCol].HeaderText})";
}
@@ -1120,16 +1105,16 @@ private void OnFreezeLeftColumnsUntilHereToolStripMenuItemClick(object sender, E
Control ctl = columnContextMenuStrip.SourceControl;
bool frozen = false;
- if (_freezeStateMap.TryGetValue(ctl, out bool value))
+ if (_freezeStateMap.ContainsKey(ctl))
{
- frozen = value;
+ frozen = _freezeStateMap[ctl];
}
frozen = !frozen;
_freezeStateMap[ctl] = frozen;
DataGridViewColumn senderCol = sender as DataGridViewColumn;
- if (ctl is BufferedDataGridView gridView)
+ if (ctl is DataGridView gridView)
{
ApplyFrozenState(gridView);
}
@@ -1137,7 +1122,7 @@ private void OnFreezeLeftColumnsUntilHereToolStripMenuItemClick(object sender, E
private void OnMoveToLastColumnToolStripMenuItemClick(object sender, EventArgs e)
{
- BufferedDataGridView gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
+ DataGridView gridView = columnContextMenuStrip.SourceControl as DataGridView;
DataGridViewColumn col = gridView.Columns[_selectedCol];
if (col != null)
{
@@ -1147,7 +1132,7 @@ private void OnMoveToLastColumnToolStripMenuItemClick(object sender, EventArgs e
private void OnMoveLeftToolStripMenuItemClick(object sender, EventArgs e)
{
- BufferedDataGridView gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
+ DataGridView gridView = columnContextMenuStrip.SourceControl as DataGridView;
DataGridViewColumn col = gridView.Columns[_selectedCol];
if (col != null && col.DisplayIndex > 0)
{
@@ -1157,7 +1142,7 @@ private void OnMoveLeftToolStripMenuItemClick(object sender, EventArgs e)
private void OnMoveRightToolStripMenuItemClick(object sender, EventArgs e)
{
- BufferedDataGridView gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
+ DataGridView gridView = columnContextMenuStrip.SourceControl as DataGridView;
DataGridViewColumn col = gridView.Columns[_selectedCol];
if (col != null && col.DisplayIndex < gridView.Columns.Count - 1)
{
@@ -1167,14 +1152,14 @@ private void OnMoveRightToolStripMenuItemClick(object sender, EventArgs e)
private void OnHideColumnToolStripMenuItemClick(object sender, EventArgs e)
{
- BufferedDataGridView gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
+ DataGridView gridView = columnContextMenuStrip.SourceControl as DataGridView;
DataGridViewColumn col = gridView.Columns[_selectedCol];
col.Visible = false;
}
private void OnRestoreColumnsToolStripMenuItemClick(object sender, EventArgs e)
{
- BufferedDataGridView gridView = columnContextMenuStrip.SourceControl as BufferedDataGridView;
+ DataGridView gridView = columnContextMenuStrip.SourceControl as DataGridView;
foreach (DataGridViewColumn col in gridView.Columns)
{
col.Visible = true;
@@ -1195,7 +1180,7 @@ private void OnHighlightSelectionInLogFileToolStripMenuItemClick(object sender,
{
if (dataGridView.EditingControl is DataGridViewTextBoxEditingControl ctl)
{
- var he = new HighlightEntry()
+ var he = new HilightEntry()
{
SearchText = ctl.SelectedText,
ForegroundColor = Color.Red,
@@ -1224,7 +1209,7 @@ private void OnHighlightSelectionInLogFilewordModeToolStripMenuItemClick(object
{
if (dataGridView.EditingControl is DataGridViewTextBoxEditingControl ctl)
{
- HighlightEntry he = new()
+ HilightEntry he = new()
{
SearchText = ctl.SelectedText,
ForegroundColor = Color.Red,
@@ -1272,7 +1257,7 @@ private void OnMakePermanentToolStripMenuItemClick(object sender, EventArgs e)
{
lock (_currentHighlightGroupLock)
{
- _currentHighlightGroup.HighlightEntryList.AddRange(_tempHighlightEntryList);
+ _currentHighlightGroup.HilightEntryList.AddRange(_tempHighlightEntryList);
RemoveTempHighlights();
OnCurrentHighlightListChanged();
}
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
index c90bd998..4bfaaac2 100644
--- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
+++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs
@@ -108,11 +108,9 @@ private bool LoadPersistenceOptions()
}
IsMultiFile = persistenceData.multiFile;
- _multiFileOptions = new MultiFileOptions
- {
- FormatPattern = persistenceData.multiFilePattern,
- MaxDayTry = persistenceData.multiFileMaxDays
- };
+ _multiFileOptions = new MultiFileOptions();
+ _multiFileOptions.FormatPattern = persistenceData.multiFilePattern;
+ _multiFileOptions.MaxDayTry = persistenceData.multiFileMaxDays;
if (string.IsNullOrEmpty(_multiFileOptions.FormatPattern))
{
@@ -804,7 +802,7 @@ private void CheckFilterAndHighlight(LogEventArgs e)
//pipeFx.BeginInvoke(i, null, null);
ProcessFilterPipes(i);
- IList matchingList = FindMatchingHilightEntries(line);
+ IList matchingList = FindMatchingHilightEntries(line);
LaunchHighlightPlugins(matchingList, i);
GetHilightActions(matchingList, out suppressLed, out stopTail, out setBookmark, out bookmarkComment);
if (setBookmark)
@@ -852,7 +850,7 @@ private void CheckFilterAndHighlight(LogEventArgs e)
ILogLine line = _logFileReader.GetLogLine(i);
if (line != null)
{
- IList matchingList = FindMatchingHilightEntries(line);
+ IList matchingList = FindMatchingHilightEntries(line);
LaunchHighlightPlugins(matchingList, i);
GetHilightActions(matchingList, out suppressLed, out stopTail, out setBookmark,
out bookmarkComment);
@@ -887,14 +885,14 @@ private void CheckFilterAndHighlight(LogEventArgs e)
}
}
- private void LaunchHighlightPlugins(IList matchingList, int lineNum)
+ private void LaunchHighlightPlugins(IList matchingList, int lineNum)
{
LogExpertCallback callback = new(this)
{
LineNum = lineNum
};
- foreach (HighlightEntry entry in matchingList)
+ foreach (HilightEntry entry in matchingList)
{
if (entry.IsActionEntry && entry.ActionEntry.PluginName != null)
{
@@ -1087,12 +1085,11 @@ private void SetColumnizerInternal(ILogLineColumnizer columnizer)
OnColumnizerChanged(CurrentColumnizer);
}
- private void AutoResizeColumns(BufferedDataGridView gridView)
+ private void AutoResizeColumns(DataGridView gridView)
{
try
{
gridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
-
if (gridView.Columns.Count > 1 && Preferences.setLastColumnWidth &&
gridView.Columns[gridView.Columns.Count - 1].Width < Preferences.lastColumnWidth
)
@@ -1112,26 +1109,28 @@ private void AutoResizeColumns(BufferedDataGridView gridView)
}
}
- private void PaintCell(DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HighlightEntry groundEntry)
+ private void PaintCell(DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill,
+ HilightEntry groundEntry)
{
PaintHighlightedCell(e, gridView, noBackgroundFill, groundEntry);
}
- private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridView gridView, bool noBackgroundFill, HighlightEntry groundEntry)
+ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridView gridView,
+ bool noBackgroundFill,
+ HilightEntry groundEntry)
{
var column = e.Value as IColumn;
column ??= Column.EmptyColumn;
IList matchList = FindHighlightMatches(column);
-
// too many entries per line seem to cause problems with the GDI
while (matchList.Count > 50)
{
matchList.RemoveAt(50);
}
- var he = new HighlightEntry
+ var he = new HilightEntry
{
SearchText = column.DisplayValue,
ForegroundColor = groundEntry?.ForegroundColor ?? Color.FromKnownColor(KnownColor.Black),
@@ -1154,11 +1153,10 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV
matchList = MergeHighlightMatchEntries(matchList, hme);
int leftPad = e.CellStyle.Padding.Left;
-
- RectangleF rect = new(e.CellBounds.Left + leftPad, e.CellBounds.Top, e.CellBounds.Width, e.CellBounds.Height);
+ RectangleF rect = new(e.CellBounds.Left + leftPad, e.CellBounds.Top, e.CellBounds.Width,
+ e.CellBounds.Height);
Rectangle borderWidths = PaintHelper.BorderWidths(e.AdvancedBorderStyle);
Rectangle valBounds = e.CellBounds;
-
valBounds.Offset(borderWidths.X, borderWidths.Y);
valBounds.Width -= borderWidths.Right;
valBounds.Height -= borderWidths.Bottom;
@@ -1176,7 +1174,12 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV
| TextFormatFlags.PreserveGraphicsClipping
| TextFormatFlags.NoPadding
| TextFormatFlags.VerticalCenter
- | TextFormatFlags.TextBoxControl;
+ | TextFormatFlags.TextBoxControl
+ ;
+
+ // | TextFormatFlags.VerticalCenter
+ // | TextFormatFlags.TextBoxControl
+ // TextFormatFlags.SingleLine
//TextRenderer.DrawText(e.Graphics, e.Value as String, e.CellStyle.Font, valBounds, Color.FromKnownColor(KnownColor.Black), flags);
@@ -1188,21 +1191,16 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV
foreach (HilightMatchEntry matchEntry in matchList)
{
- Font font = matchEntry != null && matchEntry.HilightEntry.IsBold
- ? BoldFont
- : NormalFont;
-
+ Font font = matchEntry != null && matchEntry.HilightEntry.IsBold ? BoldFont : NormalFont;
Brush bgBrush = matchEntry.HilightEntry.BackgroundColor != Color.Empty
? new SolidBrush(matchEntry.HilightEntry.BackgroundColor)
: null;
-
string matchWord = column.DisplayValue.Substring(matchEntry.StartPos, matchEntry.Length);
Size wordSize = TextRenderer.MeasureText(e.Graphics, matchWord, font, proposedSize, flags);
wordSize.Height = e.CellBounds.Height;
Rectangle wordRect = new(wordPos, wordSize);
Color foreColor = matchEntry.HilightEntry.ForegroundColor;
-
if ((e.State & DataGridViewElementStates.Selected) != DataGridViewElementStates.Selected)
{
if (!noBackgroundFill && bgBrush != null && !matchEntry.HilightEntry.NoBackground)
@@ -1216,7 +1214,8 @@ private void PaintHighlightedCell(DataGridViewCellPaintingEventArgs e, DataGridV
foreColor = ColorMode.ForeColor;
}
- TextRenderer.DrawText(e.Graphics, matchWord, font, wordRect, foreColor, flags);
+ TextRenderer.DrawText(e.Graphics, matchWord, font, wordRect,
+ foreColor, flags);
wordPos.Offset(wordSize.Width, 0);
bgBrush?.Dispose();
@@ -1236,7 +1235,7 @@ private IList MergeHighlightMatchEntries(IList MergeHighlightMatchEntries(IList 0)
{
- HighlightEntry currentEntry = entryArray[0];
+ HilightEntry currentEntry = entryArray[0];
int lastStartPos = 0;
int pos = 0;
@@ -1302,17 +1301,17 @@ private IList MergeHighlightMatchEntries(IList
/// Returns the first HilightEntry that matches the given line
///
- private HighlightEntry FindHilightEntry(ITextValue line)
+ private HilightEntry FindHilightEntry(ITextValue line)
{
return FindHighlightEntry(line, false);
}
- private HighlightEntry FindFirstNoWordMatchHilightEntry(ITextValue line)
+ private HilightEntry FindFirstNoWordMatchHilightEntry(ITextValue line)
{
return FindHighlightEntry(line, true);
}
- private bool CheckHighlightEntryMatch(HighlightEntry entry, ITextValue column)
+ private bool CheckHighlightEntryMatch(HilightEntry entry, ITextValue column)
{
if (entry.IsRegEx)
{
@@ -1346,14 +1345,14 @@ private bool CheckHighlightEntryMatch(HighlightEntry entry, ITextValue column)
///
/// Returns all HilightEntry entries which matches the given line
///
- private IList FindMatchingHilightEntries(ITextValue line)
+ private IList FindMatchingHilightEntries(ITextValue line)
{
- IList resultList = [];
+ IList resultList = [];
if (line != null)
{
lock (_currentHighlightGroupLock)
{
- foreach (HighlightEntry entry in _currentHighlightGroup.HighlightEntryList)
+ foreach (HilightEntry entry in _currentHighlightGroup.HilightEntryList)
{
if (CheckHighlightEntryMatch(entry, line))
{
@@ -1366,9 +1365,9 @@ private IList FindMatchingHilightEntries(ITextValue line)
return resultList;
}
- private void GetHighlightEntryMatches(ITextValue line, IList hilightEntryList, IList resultList)
+ private void GetHighlightEntryMatches(ITextValue line, IList hilightEntryList, IList resultList)
{
- foreach (HighlightEntry entry in hilightEntryList)
+ foreach (HilightEntry entry in hilightEntryList)
{
if (entry.IsWordMatch)
{
@@ -1396,13 +1395,13 @@ private void GetHighlightEntryMatches(ITextValue line, IList hil
}
}
- private void GetHilightActions(IList matchingList, out bool noLed, out bool stopTail,
+ private void GetHilightActions(IList matchingList, out bool noLed, out bool stopTail,
out bool setBookmark, out string bookmarkComment)
{
noLed = stopTail = setBookmark = false;
bookmarkComment = string.Empty;
- foreach (HighlightEntry entry in matchingList)
+ foreach (HilightEntry entry in matchingList)
{
if (entry.IsLedSwitch)
{
@@ -1790,7 +1789,7 @@ private void SelectPrevHighlightLine()
ILogLine line = _logFileReader.GetLogLine(lineNum);
if (line != null)
{
- HighlightEntry entry = FindHilightEntry(line);
+ HilightEntry entry = FindHilightEntry(line);
if (entry != null)
{
SelectLine(lineNum, false, true);
@@ -1809,7 +1808,7 @@ private void SelectNextHighlightLine()
ILogLine line = _logFileReader.GetLogLine(lineNum);
if (line != null)
{
- HighlightEntry entry = FindHilightEntry(line);
+ HilightEntry entry = FindHilightEntry(line);
if (entry != null)
{
SelectLine(lineNum, false, true);
@@ -1969,7 +1968,7 @@ private async void FilterSearch(string text)
_filterParams.lowerSearchText = text.ToLower();
ConfigManager.Settings.filterHistoryList.Remove(text);
ConfigManager.Settings.filterHistoryList.Insert(0, text);
- int maxHistory = ConfigManager.Settings.Preferences.maximumFilterEntries;
+ int maxHistory = ConfigManager.Settings.preferences.maximumFilterEntries;
if (ConfigManager.Settings.filterHistoryList.Count > maxHistory)
{
@@ -2044,7 +2043,7 @@ private async void FilterSearch(string text)
Settings settings = ConfigManager.Settings;
//FilterFx fx = settings.preferences.multiThreadFilter ? MultiThreadedFilter : new FilterFx(Filter);
- FilterFxAction = settings.Preferences.multiThreadFilter ? MultiThreadedFilter : Filter;
+ FilterFxAction = settings.preferences.multiThreadFilter ? MultiThreadedFilter : Filter;
//Task.Run(() => fx.Invoke(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));
Task filterFxActionTask = Task.Run(() => Filter(_filterParams, _filterResultList, _lastFilterLinesList, _filterHitList));
@@ -2348,15 +2347,11 @@ private void ResetStatusAfterFilter()
_isSearching = false;
_progressEventArgs.Value = _progressEventArgs.MaxValue;
_progressEventArgs.Visible = false;
-
SendProgressBarUpdate();
-
filterGridView.RowCount = _filterResultList.Count;
-
+ //this.filterGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
AutoResizeColumns(filterGridView);
-
- lblFilterCount.Text = $"{string.Empty}{_filterResultList.Count}";
-
+ lblFilterCount.Text = "" + _filterResultList.Count;
if (filterGridView.RowCount > 0)
{
filterGridView.Focus();
@@ -2538,7 +2533,7 @@ private void AdjustMinimumGridWith()
}
}
- private void InvalidateCurrentRow(BufferedDataGridView gridView)
+ private void InvalidateCurrentRow(DataGridView gridView)
{
if (gridView.CurrentCellAddress.Y > -1)
{
@@ -2917,7 +2912,7 @@ private void SetExplicitEncoding(Encoding encoding)
EncodingOptions.Encoding = encoding;
}
- private void ApplyDataGridViewPrefs(BufferedDataGridView dataGridView, Preferences prefs)
+ private void ApplyDataGridViewPrefs(DataGridView dataGridView, Preferences prefs)
{
if (dataGridView.Columns.GetColumnCount(DataGridViewElementStates.None) > 1)
{
@@ -3595,7 +3590,7 @@ private void SetBookmarksForSelectedFilterLines()
private void SetDefaultHighlightGroup()
{
- HighlightGroup group = _parentLogTabWin.FindHighlightGroupByFileMask(FileName);
+ HilightGroup group = _parentLogTabWin.FindHighlightGroupByFileMask(FileName);
if (group != null)
{
SetCurrentHighlightGroup(group.GroupName);
@@ -3676,7 +3671,7 @@ private void OnSyncModeChanged()
private void AddSearchHitHighlightEntry(SearchParams para)
{
- HighlightEntry he = new()
+ HilightEntry he = new()
{
SearchText = para.searchText,
ForegroundColor = Color.Red,
@@ -3704,8 +3699,8 @@ private void RemoveAllSearchHighlightEntries()
{
lock (_tempHighlightEntryListLock)
{
- List newList = [];
- foreach (HighlightEntry he in _tempHighlightEntryList)
+ List newList = [];
+ foreach (HilightEntry he in _tempHighlightEntryList)
{
if (!he.IsSearchHit)
{
diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs
index 548d7a54..73804a4a 100644
--- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs
+++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs
@@ -6,7 +6,6 @@
using LogExpert.Classes.Log;
using LogExpert.Classes.Persister;
using LogExpert.Config;
-using LogExpert.Dialogs;
using LogExpert.Entities;
using LogExpert.Entities.EventArgs;
@@ -82,10 +81,8 @@ public void LoadFile(string fileName, EncodingOptions encodingOptions)
try
{
- _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions)
- {
- UseNewReader = !Preferences.useLegacyReader
- };
+ _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions);
+ _logFileReader.UseNewReader = !Preferences.useLegacyReader;
}
catch (LogFileException lfe)
{
@@ -157,10 +154,8 @@ public void LoadFilesAsMulti(string[] fileNames, EncodingOptions encodingOptions
EncodingOptions = encodingOptions;
_columnCache = new ColumnCache();
- _logFileReader = new LogfileReader(fileNames, EncodingOptions, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions)
- {
- UseNewReader = !Preferences.useLegacyReader
- };
+ _logFileReader = new LogfileReader(fileNames, EncodingOptions, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions);
+ _logFileReader.UseNewReader = !Preferences.useLegacyReader;
RegisterLogFileReaderEvents();
_logFileReader.StartMonitoring();
FileName = fileNames[^1];
@@ -212,25 +207,23 @@ public string SavePersistenceData(bool force)
public PersistenceData GetPersistenceData()
{
- PersistenceData persistenceData = new()
- {
- bookmarkList = _bookmarkProvider.BookmarkList,
- rowHeightList = _rowHeightList,
- multiFile = IsMultiFile,
- multiFilePattern = _multiFileOptions.FormatPattern,
- multiFileMaxDays = _multiFileOptions.MaxDayTry,
- currentLine = dataGridView.CurrentCellAddress.Y,
- firstDisplayedLine = dataGridView.FirstDisplayedScrollingRowIndex,
- filterVisible = !splitContainerLogWindow.Panel2Collapsed,
- filterAdvanced = !advancedFilterSplitContainer.Panel1Collapsed,
- filterPosition = splitContainerLogWindow.SplitterDistance,
- followTail = _guiStateArgs.FollowTail,
- fileName = FileName,
- tabName = Text,
- sessionFileName = SessionFileName,
- columnizerName = CurrentColumnizer.GetName(),
- lineCount = _logFileReader.LineCount
- };
+ PersistenceData persistenceData = new();
+ persistenceData.bookmarkList = _bookmarkProvider.BookmarkList;
+ persistenceData.rowHeightList = _rowHeightList;
+ persistenceData.multiFile = IsMultiFile;
+ persistenceData.multiFilePattern = _multiFileOptions.FormatPattern;
+ persistenceData.multiFileMaxDays = _multiFileOptions.MaxDayTry;
+ persistenceData.currentLine = dataGridView.CurrentCellAddress.Y;
+ persistenceData.firstDisplayedLine = dataGridView.FirstDisplayedScrollingRowIndex;
+ persistenceData.filterVisible = !splitContainerLogWindow.Panel2Collapsed;
+ persistenceData.filterAdvanced = !advancedFilterSplitContainer.Panel1Collapsed;
+ persistenceData.filterPosition = splitContainerLogWindow.SplitterDistance;
+ persistenceData.followTail = _guiStateArgs.FollowTail;
+ persistenceData.fileName = FileName;
+ persistenceData.tabName = Text;
+ persistenceData.sessionFileName = SessionFileName;
+ persistenceData.columnizerName = CurrentColumnizer.GetName();
+ persistenceData.lineCount = _logFileReader.LineCount;
_filterParams.isFilterTail = filterTailCheckBox.Checked; // this option doesnt need a press on 'search'
if (Preferences.saveFilters)
@@ -240,11 +233,9 @@ public PersistenceData GetPersistenceData()
foreach (FilterPipe filterPipe in _filterPipeList)
{
- FilterTabData data = new()
- {
- persistenceData = filterPipe.OwnLogWindow.GetPersistenceData(),
- filterParams = filterPipe.FilterParams
- };
+ FilterTabData data = new();
+ data.persistenceData = filterPipe.OwnLogWindow.GetPersistenceData();
+ data.filterParams = filterPipe.FilterParams;
persistenceData.filterTabDataList.Add(data);
}
}
@@ -339,7 +330,7 @@ public void ColumnizerConfigChanged()
SetColumnizerInternal(CurrentColumnizer);
}
- public void SetColumnizer(ILogLineColumnizer columnizer, BufferedDataGridView gridView)
+ public void SetColumnizer(ILogLineColumnizer columnizer, DataGridView gridView)
{
PaintHelper.SetColumnizer(columnizer, gridView);
@@ -395,7 +386,7 @@ public IColumn GetCellValue(int rowIndex, int columnIndex)
return Column.EmptyColumn;
}
- public void CellPainting(BufferedDataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
+ public void CellPainting(DataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
{
if (rowIndex < 0 || e.ColumnIndex < 0)
{
@@ -407,7 +398,7 @@ public void CellPainting(BufferedDataGridView gridView, int rowIndex, DataGridVi
if (line != null)
{
- HighlightEntry entry = FindFirstNoWordMatchHilightEntry(line);
+ HilightEntry entry = FindFirstNoWordMatchHilightEntry(line);
e.Graphics.SetClip(e.CellBounds);
if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected)
@@ -476,11 +467,9 @@ public void CellPainting(BufferedDataGridView gridView, int rowIndex, DataGridVi
if (bookmark.Text.Length > 0)
{
- StringFormat format = new()
- {
- LineAlignment = StringAlignment.Center,
- Alignment = StringAlignment.Center
- };
+ StringFormat format = new();
+ format.LineAlignment = StringAlignment.Center;
+ format.Alignment = StringAlignment.Center;
Brush brush2 = new SolidBrush(Color.FromArgb(255, 190, 100, 0));
Font font = new("Courier New", Preferences.fontSize, FontStyle.Bold);
e.Graphics.DrawString("i", font, brush2, new RectangleF(r.Left, r.Top, r.Width, r.Height),
@@ -496,9 +485,9 @@ public void CellPainting(BufferedDataGridView gridView, int rowIndex, DataGridVi
}
}
- public void OnDataGridViewCellPainting(object sender, DataGridViewCellPaintingEventArgs e)
+ public void OnDataGridView_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
{
- BufferedDataGridView gridView = (BufferedDataGridView)sender;
+ DataGridView gridView = (DataGridView)sender;
CellPainting(gridView, e.RowIndex, e);
}
@@ -508,12 +497,12 @@ public void OnDataGridViewCellPainting(object sender, DataGridViewCellPaintingEv
///
///
///
- public HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches)
+ public HilightEntry FindHighlightEntry(ITextValue line, bool noWordMatches)
{
// first check the temp entries
lock (_tempHighlightEntryListLock)
{
- foreach (HighlightEntry entry in _tempHighlightEntryList)
+ foreach (HilightEntry entry in _tempHighlightEntryList)
{
if (noWordMatches && entry.IsWordMatch)
{
@@ -528,7 +517,7 @@ public HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches)
lock (_currentHighlightGroupLock)
{
- foreach (HighlightEntry entry in _currentHighlightGroup.HighlightEntryList)
+ foreach (HilightEntry entry in _currentHighlightGroup.HilightEntryList)
{
if (noWordMatches && entry.IsWordMatch)
{
@@ -550,7 +539,7 @@ public IList FindHighlightMatches(ITextValue column)
{
lock (_currentHighlightGroupLock)
{
- GetHighlightEntryMatches(column, _currentHighlightGroup.HighlightEntryList, resultList);
+ GetHighlightEntryMatches(column, _currentHighlightGroup.HilightEntryList, resultList);
}
lock (_tempHighlightEntryList)
{
@@ -868,13 +857,13 @@ public void AddBookmarkOverlays()
public void ToggleBookmark()
{
- BufferedDataGridView gridView;
+ DataGridView gridView;
int lineNum;
if (filterGridView.Focused)
{
gridView = filterGridView;
- if (gridView.CurrentCellAddress == default || gridView.CurrentCellAddress.Y == -1)
+ if (gridView.CurrentCellAddress == null || gridView.CurrentCellAddress.Y == -1)
{
return;
}
@@ -884,7 +873,7 @@ public void ToggleBookmark()
else
{
gridView = dataGridView;
- if (gridView.CurrentCellAddress == default || gridView.CurrentCellAddress.Y == -1)
+ if (gridView.CurrentCellAddress == null || gridView.CurrentCellAddress.Y == -1)
{
return;
}
@@ -927,7 +916,7 @@ public void SetBookmarkFromTrigger(int lineNum, string comment)
{
return;
}
- ParamParser paramParser = new(comment);
+ ParamParser paramParser = new ParamParser(comment);
try
{
comment = paramParser.ReplaceParams(line, lineNum, FileName);
@@ -1171,8 +1160,7 @@ public void CopyMarkedLinesToTab()
{
if (dataGridView.SelectionMode == DataGridViewSelectionMode.FullRowSelect)
{
- List lineNumList = [];
-
+ List lineNumList = new List();
foreach (DataGridViewRow row in dataGridView.SelectedRows)
{
if (row.Index != -1)
@@ -1180,22 +1168,18 @@ public void CopyMarkedLinesToTab()
lineNumList.Add(row.Index);
}
}
-
lineNumList.Sort();
// create dummy FilterPipe for connecting line numbers to original window
// setting IsStopped to true prevents further filter processing
- FilterPipe pipe = new(new FilterParams(), this)
- {
- IsStopped = true
- };
-
+ FilterPipe pipe = new FilterPipe(new FilterParams(), this);
+ pipe.IsStopped = true;
WritePipeToTab(pipe, lineNumList, Text + "->C", null);
}
else
{
string fileName = Path.GetTempFileName();
- FileStream fStream = new(fileName, FileMode.Append, FileAccess.Write, FileShare.Read);
- StreamWriter writer = new(fStream, Encoding.Unicode);
+ FileStream fStream = new FileStream(fileName, FileMode.Append, FileAccess.Write, FileShare.Read);
+ StreamWriter writer = new StreamWriter(fStream, Encoding.Unicode);
DataObject data = dataGridView.GetClipboardContent();
string text = data.GetText(TextDataFormat.Text);
@@ -1215,7 +1199,6 @@ public void ChangeEncoding(Encoding encoding)
{
_logFileReader.ChangeEncoding(encoding);
EncodingOptions.Encoding = encoding;
-
if (_guiStateArgs.CurrentEncoding.IsSingleByte != encoding.IsSingleByte ||
_guiStateArgs.CurrentEncoding.GetPreamble().Length != encoding.GetPreamble().Length)
{
@@ -1233,11 +1216,9 @@ public void Reload()
{
SavePersistenceData(false);
- _reloadMemento = new ReloadMemento
- {
- currentLine = dataGridView.CurrentCellAddress.Y,
- firstDisplayedLine = dataGridView.FirstDisplayedScrollingRowIndex
- };
+ _reloadMemento = new ReloadMemento();
+ _reloadMemento.currentLine = dataGridView.CurrentCellAddress.Y;
+ _reloadMemento.firstDisplayedLine = dataGridView.FirstDisplayedScrollingRowIndex;
_forcedColumnizerForLoading = CurrentColumnizer;
if (_fileNames == null || !IsMultiFile)
@@ -1606,7 +1587,7 @@ public void PatternStatisticSelectRange(PatternArgs patternArgs)
{
if (dataGridView.SelectionMode == DataGridViewSelectionMode.FullRowSelect)
{
- List lineNumList = new();
+ List lineNumList = new List();
foreach (DataGridViewRow row in dataGridView.SelectedRows)
{
if (row.Index != -1)
@@ -1634,21 +1615,19 @@ public void PatternStatisticSelectRange(PatternArgs patternArgs)
public void PatternStatistic(PatternArgs patternArgs)
{
- PatternStatisticFx fx = new(TestStatistic);
+ PatternStatisticFx fx = new PatternStatisticFx(TestStatistic);
fx.BeginInvoke(patternArgs, null, null);
}
public void ExportBookmarkList()
{
- SaveFileDialog dlg = new()
- {
- Title = "Choose a file to save bookmarks into",
- AddExtension = true,
- DefaultExt = "csv",
- Filter = "CSV file (*.csv)|*.csv|Bookmark file (*.bmk)|*.bmk",
- FilterIndex = 1,
- FileName = Path.GetFileNameWithoutExtension(FileName)
- };
+ SaveFileDialog dlg = new SaveFileDialog();
+ dlg.Title = "Choose a file to save bookmarks into";
+ dlg.AddExtension = true;
+ dlg.DefaultExt = "csv";
+ dlg.Filter = "CSV file (*.csv)|*.csv|Bookmark file (*.bmk)|*.bmk";
+ dlg.FilterIndex = 1;
+ dlg.FileName = Path.GetFileNameWithoutExtension(FileName);
if (dlg.ShowDialog() == DialogResult.OK)
{
try
@@ -1666,12 +1645,10 @@ public void ExportBookmarkList()
public void ImportBookmarkList()
{
- OpenFileDialog dlg = new()
- {
- Title = "Choose a file to load bookmarks from",
- AddExtension = true,
- DefaultExt = "csv"
- };
+ OpenFileDialog dlg = new OpenFileDialog();
+ dlg.Title = "Choose a file to load bookmarks from";
+ dlg.AddExtension = true;
+ dlg.DefaultExt = "csv";
dlg.DefaultExt = "csv";
dlg.Filter = "CSV file (*.csv)|*.csv|Bookmark file (*.bmk)|*.bmk";
dlg.FilterIndex = 1;
@@ -1681,7 +1658,7 @@ public void ImportBookmarkList()
try
{
// add to the existing bookmarks
- SortedList newBookmarks = new();
+ SortedList newBookmarks = new SortedList();
BookmarkExporter.ImportBookmarkList(FileName, dlg.FileName, newBookmarks);
// Add (or replace) to existing bookmark list
@@ -1758,13 +1735,13 @@ public void SetCurrentHighlightGroup(string groupName)
_currentHighlightGroup = _parentLogTabWin.FindHighlightGroup(groupName);
if (_currentHighlightGroup == null)
{
- if (_parentLogTabWin.HighlightGroupList.Count > 0)
+ if (_parentLogTabWin.HilightGroupList.Count > 0)
{
- _currentHighlightGroup = _parentLogTabWin.HighlightGroupList[0];
+ _currentHighlightGroup = _parentLogTabWin.HilightGroupList[0];
}
else
{
- _currentHighlightGroup = new HighlightGroup();
+ _currentHighlightGroup = new HilightGroup();
}
}
_guiStateArgs.HighlightGroupName = _currentHighlightGroup.GroupName;
diff --git a/src/LogExpert/Controls/PatternWindow.Designer.cs b/src/LogExpert/Controls/PatternWindow.Designer.cs
index f725c0bc..7b211e99 100644
--- a/src/LogExpert/Controls/PatternWindow.Designer.cs
+++ b/src/LogExpert/Controls/PatternWindow.Designer.cs
@@ -47,10 +47,10 @@ private void InitializeComponent()
this.label4 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.rangeLabel = new System.Windows.Forms.Label();
- this._weigthKnobControl = new KnobControl();
- this._maxMissesKnobControl = new KnobControl();
- this._maxDiffKnobControl = new KnobControl();
- this._fuzzyKnobControl = new KnobControl();
+ this.weigthKnobControl = new KnobControl();
+ this.maxMissesKnobControl = new KnobControl();
+ this.maxDiffKnobControl = new KnobControl();
+ this.fuzzyKnobControl = new KnobControl();
this.patternHitsDataGridView = new LogExpert.Dialogs.BufferedDataGridView();
this.contentDataGridView = new LogExpert.Dialogs.BufferedDataGridView();
this.splitContainer1.Panel1.SuspendLayout();
@@ -183,13 +183,13 @@ private void InitializeComponent()
this.panel4.Controls.Add(this.setRangeButton);
this.panel4.Controls.Add(this.label7);
this.panel4.Controls.Add(this.recalcButton);
- this.panel4.Controls.Add(this._weigthKnobControl);
+ this.panel4.Controls.Add(this.weigthKnobControl);
this.panel4.Controls.Add(this.label6);
- this.panel4.Controls.Add(this._maxMissesKnobControl);
+ this.panel4.Controls.Add(this.maxMissesKnobControl);
this.panel4.Controls.Add(this.label5);
- this.panel4.Controls.Add(this._maxDiffKnobControl);
+ this.panel4.Controls.Add(this.maxDiffKnobControl);
this.panel4.Controls.Add(this.label4);
- this.panel4.Controls.Add(this._fuzzyKnobControl);
+ this.panel4.Controls.Add(this.fuzzyKnobControl);
this.panel4.Location = new System.Drawing.Point(3, 106);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(345, 57);
@@ -204,7 +204,7 @@ private void InitializeComponent()
this.setRangeButton.TabIndex = 12;
this.setRangeButton.Text = "Set range";
this.setRangeButton.UseVisualStyleBackColor = true;
- this.setRangeButton.Click += new System.EventHandler(this.OnSetRangeButtonClick);
+ this.setRangeButton.Click += new System.EventHandler(this.setRangeButton_Click);
//
// label7
//
@@ -224,7 +224,7 @@ private void InitializeComponent()
this.recalcButton.TabIndex = 6;
this.recalcButton.Text = "Recalc";
this.recalcButton.UseVisualStyleBackColor = true;
- this.recalcButton.Click += new System.EventHandler(this.OnRecalcButtonClick);
+ this.recalcButton.Click += new System.EventHandler(this.recalcButton_Click);
//
// label6
//
@@ -275,43 +275,43 @@ private void InitializeComponent()
//
// weigthKnobControl
//
- this._weigthKnobControl.Location = new System.Drawing.Point(202, 5);
- this._weigthKnobControl.MaxValue = 30;
- this._weigthKnobControl.MinValue = 1;
- this._weigthKnobControl.Name = "weigthKnobControl";
- this._weigthKnobControl.Size = new System.Drawing.Size(21, 35);
- this._weigthKnobControl.TabIndex = 10;
- this._weigthKnobControl.Value = 0;
+ this.weigthKnobControl.Location = new System.Drawing.Point(202, 5);
+ this.weigthKnobControl.MaxValue = 30;
+ this.weigthKnobControl.MinValue = 1;
+ this.weigthKnobControl.Name = "weigthKnobControl";
+ this.weigthKnobControl.Size = new System.Drawing.Size(21, 35);
+ this.weigthKnobControl.TabIndex = 10;
+ this.weigthKnobControl.Value = 0;
//
// maxMissesKnobControl
//
- this._maxMissesKnobControl.Location = new System.Drawing.Point(134, 5);
- this._maxMissesKnobControl.MaxValue = 30;
- this._maxMissesKnobControl.MinValue = 0;
- this._maxMissesKnobControl.Name = "maxMissesKnobControl";
- this._maxMissesKnobControl.Size = new System.Drawing.Size(22, 35);
- this._maxMissesKnobControl.TabIndex = 8;
- this._maxMissesKnobControl.Value = 0;
+ this.maxMissesKnobControl.Location = new System.Drawing.Point(134, 5);
+ this.maxMissesKnobControl.MaxValue = 30;
+ this.maxMissesKnobControl.MinValue = 0;
+ this.maxMissesKnobControl.Name = "maxMissesKnobControl";
+ this.maxMissesKnobControl.Size = new System.Drawing.Size(22, 35);
+ this.maxMissesKnobControl.TabIndex = 8;
+ this.maxMissesKnobControl.Value = 0;
//
// maxDiffKnobControl
//
- this._maxDiffKnobControl.Location = new System.Drawing.Point(69, 5);
- this._maxDiffKnobControl.MaxValue = 30;
- this._maxDiffKnobControl.MinValue = 0;
- this._maxDiffKnobControl.Name = "maxDiffKnobControl";
- this._maxDiffKnobControl.Size = new System.Drawing.Size(21, 35);
- this._maxDiffKnobControl.TabIndex = 6;
- this._maxDiffKnobControl.Value = 0;
+ this.maxDiffKnobControl.Location = new System.Drawing.Point(69, 5);
+ this.maxDiffKnobControl.MaxValue = 30;
+ this.maxDiffKnobControl.MinValue = 0;
+ this.maxDiffKnobControl.Name = "maxDiffKnobControl";
+ this.maxDiffKnobControl.Size = new System.Drawing.Size(21, 35);
+ this.maxDiffKnobControl.TabIndex = 6;
+ this.maxDiffKnobControl.Value = 0;
//
// fuzzyKnobControl
//
- this._fuzzyKnobControl.Location = new System.Drawing.Point(9, 5);
- this._fuzzyKnobControl.MaxValue = 20;
- this._fuzzyKnobControl.MinValue = 0;
- this._fuzzyKnobControl.Name = "fuzzyKnobControl";
- this._fuzzyKnobControl.Size = new System.Drawing.Size(22, 35);
- this._fuzzyKnobControl.TabIndex = 4;
- this._fuzzyKnobControl.Value = 0;
+ this.fuzzyKnobControl.Location = new System.Drawing.Point(9, 5);
+ this.fuzzyKnobControl.MaxValue = 20;
+ this.fuzzyKnobControl.MinValue = 0;
+ this.fuzzyKnobControl.Name = "fuzzyKnobControl";
+ this.fuzzyKnobControl.Size = new System.Drawing.Size(22, 35);
+ this.fuzzyKnobControl.TabIndex = 4;
+ this.fuzzyKnobControl.Value = 0;
//
// patternHitsDataGridView
//
@@ -337,11 +337,11 @@ private void InitializeComponent()
this.patternHitsDataGridView.Size = new System.Drawing.Size(289, 83);
this.patternHitsDataGridView.TabIndex = 1;
this.patternHitsDataGridView.VirtualMode = true;
- this.patternHitsDataGridView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.OnPatternHitsDataGridViewMouseDoubleClick);
- this.patternHitsDataGridView.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.OnPatternHitsDataGridViewCellValueNeeded);
- this.patternHitsDataGridView.ColumnDividerDoubleClick += new System.Windows.Forms.DataGridViewColumnDividerDoubleClickEventHandler(this.OnPatternHitsDataGridViewColumnDividerDoubleClick);
- this.patternHitsDataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnPatternHitsDataGridViewCellPainting);
- this.patternHitsDataGridView.CurrentCellChanged += new System.EventHandler(this.OnPatternHitsDataGridViewCurrentCellChanged);
+ this.patternHitsDataGridView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.patternHitsDataGridView_MouseDoubleClick);
+ this.patternHitsDataGridView.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.patternHitsDataGridView_CellValueNeeded);
+ this.patternHitsDataGridView.ColumnDividerDoubleClick += new System.Windows.Forms.DataGridViewColumnDividerDoubleClickEventHandler(this.patternHitsDataGridView_ColumnDividerDoubleClick);
+ this.patternHitsDataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.patternHitsDataGridView_CellPainting);
+ this.patternHitsDataGridView.CurrentCellChanged += new System.EventHandler(this.patternHitsDataGridView_CurrentCellChanged);
//
// contentDataGridView
//
@@ -365,10 +365,10 @@ private void InitializeComponent()
this.contentDataGridView.Size = new System.Drawing.Size(491, 83);
this.contentDataGridView.TabIndex = 0;
this.contentDataGridView.VirtualMode = true;
- this.contentDataGridView.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.OnContentDataGridViewCellValueNeeded);
- this.contentDataGridView.ColumnDividerDoubleClick += new System.Windows.Forms.DataGridViewColumnDividerDoubleClickEventHandler(this.OnContentDataGridViewColumnDividerDoubleClick);
- this.contentDataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.OnContentDataGridViewCellPainting);
- this.contentDataGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.OnContentDataGridViewCellMouseDoubleClick);
+ this.contentDataGridView.CellValueNeeded += new System.Windows.Forms.DataGridViewCellValueEventHandler(this.contentDataGridView_CellValueNeeded);
+ this.contentDataGridView.ColumnDividerDoubleClick += new System.Windows.Forms.DataGridViewColumnDividerDoubleClickEventHandler(this.contentDataGridView_ColumnDividerDoubleClick);
+ this.contentDataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.contentDataGridView_CellPainting);
+ this.contentDataGridView.CellMouseDoubleClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.contentDataGridView_CellMouseDoubleClick);
//
// PatternWindow
//
@@ -413,15 +413,15 @@ private void InitializeComponent()
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label blockCountLabel;
private System.Windows.Forms.Panel panel3;
- private KnobControl _fuzzyKnobControl;
+ private KnobControl fuzzyKnobControl;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label5;
- private KnobControl _maxDiffKnobControl;
+ private KnobControl maxDiffKnobControl;
private System.Windows.Forms.Label label6;
- private KnobControl _maxMissesKnobControl;
+ private KnobControl maxMissesKnobControl;
private System.Windows.Forms.Label label7;
- private KnobControl _weigthKnobControl;
+ private KnobControl weigthKnobControl;
private System.Windows.Forms.Button recalcButton;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button setRangeButton;
diff --git a/src/LogExpert/Controls/PatternWindow.cs b/src/LogExpert/Controls/PatternWindow.cs
index e6da5794..52151bcd 100644
--- a/src/LogExpert/Controls/PatternWindow.cs
+++ b/src/LogExpert/Controls/PatternWindow.cs
@@ -1,11 +1,9 @@
-using LogExpert.Classes;
-using LogExpert.Dialogs;
-using LogExpert.Entities.EventArgs;
-
-using System;
+using System;
using System.Collections.Generic;
using System.Drawing;
using System.Windows.Forms;
+using LogExpert.Classes;
+using LogExpert.Entities.EventArgs;
namespace LogExpert.Controls
{
@@ -13,12 +11,12 @@ public partial class PatternWindow : Form
{
#region Fields
- private readonly List> _blockList = [];
- private PatternBlock _currentBlock;
+ private readonly List> blockList = [];
+ private PatternBlock currentBlock;
private List currentList;
- private readonly LogWindow.LogWindow _logWindow;
- private PatternArgs _patternArgs = new();
+ private readonly LogWindow.LogWindow logWindow;
+ private PatternArgs patternArgs = new();
#endregion
@@ -31,9 +29,9 @@ public PatternWindow()
public PatternWindow(LogWindow.LogWindow logWindow)
{
- _logWindow = logWindow;
+ this.logWindow = logWindow;
InitializeComponent();
- recalcButton.Enabled = false;
+ this.recalcButton.Enabled = false;
}
#endregion
@@ -42,26 +40,26 @@ public PatternWindow(LogWindow.LogWindow logWindow)
public int Fuzzy
{
- set { _fuzzyKnobControl.Value = value; }
- get { return _fuzzyKnobControl.Value; }
+ set { this.fuzzyKnobControl.Value = value; }
+ get { return this.fuzzyKnobControl.Value; }
}
public int MaxDiff
{
- set { _maxDiffKnobControl.Value = value; }
- get { return _maxDiffKnobControl.Value; }
+ set { this.maxDiffKnobControl.Value = value; }
+ get { return this.maxDiffKnobControl.Value; }
}
public int MaxMisses
{
- set { _maxMissesKnobControl.Value = value; }
- get { return _maxMissesKnobControl.Value; }
+ set { this.maxMissesKnobControl.Value = value; }
+ get { return this.maxMissesKnobControl.Value; }
}
public int Weight
{
- set { _weigthKnobControl.Value = value; }
- get { return _weigthKnobControl.Value; }
+ set { this.weigthKnobControl.Value = value; }
+ get { return this.weigthKnobControl.Value; }
}
#endregion
@@ -70,8 +68,8 @@ public int Weight
public void SetBlockList(List flatBlockList, PatternArgs patternArgs)
{
- _patternArgs = patternArgs;
- _blockList.Clear();
+ this.patternArgs = patternArgs;
+ blockList.Clear();
List singeList = [];
//int blockId = -1;
for (int i = 0; i < flatBlockList.Count; ++i)
@@ -95,17 +93,17 @@ public void SetBlockList(List flatBlockList, PatternArgs patternAr
// singeList.Add(block);
//}
}
- _blockList.Add(singeList);
- Invoke(new MethodInvoker(SetBlockListGuiStuff));
+ this.blockList.Add(singeList);
+ this.Invoke(new MethodInvoker(SetBlockListGuiStuff));
}
public void SetColumnizer(ILogLineColumnizer columnizer)
{
- _logWindow.SetColumnizer(columnizer, patternHitsDataGridView);
- _logWindow.SetColumnizer(columnizer, contentDataGridView);
- patternHitsDataGridView.Columns[0].Width = 20;
- contentDataGridView.Columns[0].Width = 20;
+ this.logWindow.SetColumnizer(columnizer, this.patternHitsDataGridView);
+ this.logWindow.SetColumnizer(columnizer, this.contentDataGridView);
+ this.patternHitsDataGridView.Columns[0].Width = 20;
+ this.contentDataGridView.Columns[0].Width = 20;
DataGridViewTextBoxColumn blockInfoColumn = new();
blockInfoColumn.HeaderText = "Weight";
@@ -123,8 +121,8 @@ public void SetColumnizer(ILogLineColumnizer columnizer)
contentInfoColumn.ReadOnly = true;
contentInfoColumn.Width = 50;
- patternHitsDataGridView.Columns.Insert(1, blockInfoColumn);
- contentDataGridView.Columns.Insert(1, contentInfoColumn);
+ this.patternHitsDataGridView.Columns.Insert(1, blockInfoColumn);
+ this.contentDataGridView.Columns.Insert(1, contentInfoColumn);
}
public void SetFont(string fontName, float fontSize)
@@ -133,11 +131,11 @@ public void SetFont(string fontName, float fontSize)
int lineSpacing = font.FontFamily.GetLineSpacing(FontStyle.Regular);
float lineSpacingPixel = font.Size * lineSpacing / font.FontFamily.GetEmHeight(FontStyle.Regular);
- patternHitsDataGridView.DefaultCellStyle.Font = font;
- contentDataGridView.DefaultCellStyle.Font = font;
+ this.patternHitsDataGridView.DefaultCellStyle.Font = font;
+ this.contentDataGridView.DefaultCellStyle.Font = font;
//this.lineHeight = font.Height + 4;
- patternHitsDataGridView.RowTemplate.Height = font.Height + 4;
- contentDataGridView.RowTemplate.Height = font.Height + 4;
+ this.patternHitsDataGridView.RowTemplate.Height = font.Height + 4;
+ this.contentDataGridView.RowTemplate.Height = font.Height + 4;
}
#endregion
@@ -146,25 +144,25 @@ public void SetFont(string fontName, float fontSize)
private void SetBlockListGuiStuff()
{
- patternHitsDataGridView.RowCount = 0;
- blockCountLabel.Text = "0";
- contentDataGridView.RowCount = 0;
- blockLinesLabel.Text = "0";
- recalcButton.Enabled = true;
- setRangeButton.Enabled = true;
- if (_blockList.Count > 0)
+ this.patternHitsDataGridView.RowCount = 0;
+ this.blockCountLabel.Text = "0";
+ this.contentDataGridView.RowCount = 0;
+ this.blockLinesLabel.Text = "0";
+ this.recalcButton.Enabled = true;
+ this.setRangeButton.Enabled = true;
+ if (this.blockList.Count > 0)
{
- SetCurrentList(_blockList[0]);
+ SetCurrentList(this.blockList[0]);
}
}
private void SetCurrentList(List patternList)
{
- patternHitsDataGridView.RowCount = 0;
- currentList = patternList;
- patternHitsDataGridView.RowCount = currentList.Count;
- patternHitsDataGridView.Refresh();
- blockCountLabel.Text = "" + currentList.Count;
+ this.patternHitsDataGridView.RowCount = 0;
+ this.currentList = patternList;
+ this.patternHitsDataGridView.RowCount = this.currentList.Count;
+ this.patternHitsDataGridView.Refresh();
+ this.blockCountLabel.Text = "" + this.currentList.Count;
}
private int GetLineForHitGrid(int rowIndex)
@@ -177,7 +175,7 @@ private int GetLineForHitGrid(int rowIndex)
private int GetLineForContentGrid(int rowIndex)
{
int line;
- line = _currentBlock.targetStart + rowIndex;
+ line = currentBlock.targetStart + rowIndex;
return line;
}
@@ -185,9 +183,9 @@ private int GetLineForContentGrid(int rowIndex)
#region Events handler
- private void OnPatternHitsDataGridViewCellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
+ private void patternHitsDataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
{
- if (currentList == null || e.RowIndex < 0)
+ if (this.currentList == null || e.RowIndex < 0)
{
return;
}
@@ -203,28 +201,26 @@ private void OnPatternHitsDataGridViewCellValueNeeded(object sender, DataGridVie
{
colIndex--; // correct the additional inserted col
}
- e.Value = _logWindow.GetCellValue(rowIndex, colIndex);
+ e.Value = this.logWindow.GetCellValue(rowIndex, colIndex);
}
}
- private void OnPatternHitsDataGridViewCellPainting(object sender, DataGridViewCellPaintingEventArgs e)
+ private void patternHitsDataGridView_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
{
- if (currentList == null || e.RowIndex < 0)
+ if (this.currentList == null || e.RowIndex < 0)
{
return;
}
-
if (e.ColumnIndex == 1)
{
e.PaintBackground(e.CellBounds, false);
- int selCount = _patternArgs.endLine - _patternArgs.startLine;
- int maxWeight = _patternArgs.maxDiffInBlock * selCount + selCount;
-
+ int selCount = this.patternArgs.endLine - this.patternArgs.startLine;
+ int maxWeight = this.patternArgs.maxDiffInBlock * selCount + selCount;
if (maxWeight > 0)
{
- int width = (int)((int)e.Value / (double)maxWeight * e.CellBounds.Width);
+ int width = (int) ((double) (int) e.Value / (double) maxWeight * (double) e.CellBounds.Width);
Rectangle rect = new(e.CellBounds.X, e.CellBounds.Y, width, e.CellBounds.Height);
- int alpha = 90 + (int)((int)e.Value / (double)maxWeight * 165);
+ int alpha = 90 + (int) ((double) (int) e.Value / (double) maxWeight * (double) 165);
Color color = Color.FromArgb(alpha, 170, 180, 150);
Brush brush = new SolidBrush(color);
rect.Inflate(-2, -1);
@@ -236,13 +232,13 @@ private void OnPatternHitsDataGridViewCellPainting(object sender, DataGridViewCe
}
else
{
- BufferedDataGridView gridView = (BufferedDataGridView)sender;
+ DataGridView gridView = (DataGridView) sender;
int rowIndex = GetLineForHitGrid(e.RowIndex);
- _logWindow.CellPainting(gridView, rowIndex, e);
+ this.logWindow.CellPainting(gridView, rowIndex, e);
}
}
- private void OnPatternHitsDataGridViewMouseDoubleClick(object sender, MouseEventArgs e)
+ private void patternHitsDataGridView_MouseDoubleClick(object sender, MouseEventArgs e)
{
//if (this.currentList == null || patternHitsDataGridView.CurrentRow == null)
// return;
@@ -251,38 +247,36 @@ private void OnPatternHitsDataGridViewMouseDoubleClick(object sender, MouseEvent
//this.logWindow.SelectLogLine(rowIndex);
}
- private void OnPatternHitsDataGridViewCurrentCellChanged(object sender, EventArgs e)
+ private void patternHitsDataGridView_CurrentCellChanged(object sender, EventArgs e)
{
- if (currentList == null || patternHitsDataGridView.CurrentRow == null)
+ if (this.currentList == null || patternHitsDataGridView.CurrentRow == null)
{
return;
}
- if (patternHitsDataGridView.CurrentRow.Index > currentList.Count - 1)
+ if (patternHitsDataGridView.CurrentRow.Index > this.currentList.Count - 1)
{
return;
}
- contentDataGridView.RowCount = 0;
- _currentBlock = currentList[patternHitsDataGridView.CurrentRow.Index];
- contentDataGridView.RowCount = _currentBlock.targetEnd - _currentBlock.targetStart + 1;
- contentDataGridView.Refresh();
- contentDataGridView.CurrentCell = contentDataGridView.Rows[0].Cells[0];
- blockLinesLabel.Text = "" + contentDataGridView.RowCount;
+ this.contentDataGridView.RowCount = 0;
+ this.currentBlock = this.currentList[patternHitsDataGridView.CurrentRow.Index];
+ this.contentDataGridView.RowCount = this.currentBlock.targetEnd - this.currentBlock.targetStart + 1;
+ this.contentDataGridView.Refresh();
+ this.contentDataGridView.CurrentCell = this.contentDataGridView.Rows[0].Cells[0];
+ this.blockLinesLabel.Text = "" + this.contentDataGridView.RowCount;
}
- private void OnContentDataGridViewCellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
+ private void contentDataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e)
{
- if (_currentBlock == null || e.RowIndex < 0)
+ if (this.currentBlock == null || e.RowIndex < 0)
{
return;
}
-
int rowIndex = GetLineForContentGrid(e.RowIndex);
int colIndex = e.ColumnIndex;
-
if (colIndex == 1)
{
QualityInfo qi;
- if (_currentBlock.qualityInfoList.TryGetValue(rowIndex, out qi))
+ if (this.currentBlock.qualityInfoList.TryGetValue(rowIndex, out qi))
{
e.Value = qi.quality;
}
@@ -297,67 +291,67 @@ private void OnContentDataGridViewCellValueNeeded(object sender, DataGridViewCel
{
colIndex--; // adjust the inserted column
}
- e.Value = _logWindow.GetCellValue(rowIndex, colIndex);
+ e.Value = this.logWindow.GetCellValue(rowIndex, colIndex);
}
}
- private void OnContentDataGridViewCellPainting(object sender, DataGridViewCellPaintingEventArgs e)
+ private void contentDataGridView_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
{
- if (_currentBlock == null || e.RowIndex < 0)
+ if (this.currentBlock == null || e.RowIndex < 0)
{
return;
}
- BufferedDataGridView gridView = (BufferedDataGridView)sender;
+ DataGridView gridView = (DataGridView) sender;
int rowIndex = GetLineForContentGrid(e.RowIndex);
- _logWindow.CellPainting(gridView, rowIndex, e);
+ this.logWindow.CellPainting(gridView, rowIndex, e);
}
- private void OnContentDataGridViewCellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e)
+ private void contentDataGridView_CellMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e)
{
- if (_currentBlock == null || contentDataGridView.CurrentRow == null)
+ if (this.currentBlock == null || contentDataGridView.CurrentRow == null)
{
return;
}
int rowIndex = GetLineForContentGrid(contentDataGridView.CurrentRow.Index);
- _logWindow.SelectLogLine(rowIndex);
+ this.logWindow.SelectLogLine(rowIndex);
}
- private void OnRecalcButtonClick(object sender, EventArgs e)
+ private void recalcButton_Click(object sender, EventArgs e)
{
- _patternArgs.fuzzy = _fuzzyKnobControl.Value;
- _patternArgs.maxDiffInBlock = _maxDiffKnobControl.Value;
- _patternArgs.maxMisses = _maxMissesKnobControl.Value;
- _patternArgs.minWeight = _weigthKnobControl.Value;
- _logWindow.PatternStatistic(_patternArgs);
- recalcButton.Enabled = false;
- setRangeButton.Enabled = false;
+ patternArgs.fuzzy = this.fuzzyKnobControl.Value;
+ patternArgs.maxDiffInBlock = this.maxDiffKnobControl.Value;
+ patternArgs.maxMisses = this.maxMissesKnobControl.Value;
+ patternArgs.minWeight = this.weigthKnobControl.Value;
+ this.logWindow.PatternStatistic(patternArgs);
+ this.recalcButton.Enabled = false;
+ this.setRangeButton.Enabled = false;
}
- private void OnCloseButtonClick(object sender, EventArgs e)
+ private void closeButton_Click(object sender, EventArgs e)
{
Close();
}
- private void OnContentDataGridViewColumnDividerDoubleClick(object sender,
+ private void contentDataGridView_ColumnDividerDoubleClick(object sender,
DataGridViewColumnDividerDoubleClickEventArgs e)
{
e.Handled = true;
- contentDataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
+ this.contentDataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
}
- private void OnPatternHitsDataGridViewColumnDividerDoubleClick(object sender,
+ private void patternHitsDataGridView_ColumnDividerDoubleClick(object sender,
DataGridViewColumnDividerDoubleClickEventArgs e)
{
e.Handled = true;
- patternHitsDataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
+ this.patternHitsDataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.DisplayedCells);
}
- private void OnSetRangeButtonClick(object sender, EventArgs e)
+ private void setRangeButton_Click(object sender, EventArgs e)
{
- _logWindow.PatternStatisticSelectRange(_patternArgs);
- recalcButton.Enabled = true;
- rangeLabel.Text = "Start: " + _patternArgs.startLine + "\r\nEnd: " + _patternArgs.endLine;
+ this.logWindow.PatternStatisticSelectRange(patternArgs);
+ this.recalcButton.Enabled = true;
+ this.rangeLabel.Text = "Start: " + patternArgs.startLine + "\r\nEnd: " + patternArgs.endLine;
}
#endregion
diff --git a/src/LogExpert/Dialogs/BookmarkWindow.Designer.cs b/src/LogExpert/Dialogs/BookmarkWindow.Designer.cs
index 6ab2e34c..e0931cdd 100644
--- a/src/LogExpert/Dialogs/BookmarkWindow.Designer.cs
+++ b/src/LogExpert/Dialogs/BookmarkWindow.Designer.cs
@@ -53,14 +53,14 @@ private void InitializeComponent() {
this.deleteBookmarkssToolStripMenuItem.Name = "deleteBookmarkssToolStripMenuItem";
this.deleteBookmarkssToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
this.deleteBookmarkssToolStripMenuItem.Text = "Delete bookmarks(s)";
- this.deleteBookmarkssToolStripMenuItem.Click += new System.EventHandler(this.OnDeleteBookmarksToolStripMenuItemClick);
+ this.deleteBookmarkssToolStripMenuItem.Click += new System.EventHandler(this.deleteBookmarksToolStripMenuItem_Click);
//
// removeCommentsToolStripMenuItem
//
this.removeCommentsToolStripMenuItem.Name = "removeCommentsToolStripMenuItem";
this.removeCommentsToolStripMenuItem.Size = new System.Drawing.Size(185, 22);
this.removeCommentsToolStripMenuItem.Text = "Remove comment(s)";
- this.removeCommentsToolStripMenuItem.Click += new System.EventHandler(this.OnRemoveCommentsToolStripMenuItemClick);
+ this.removeCommentsToolStripMenuItem.Click += new System.EventHandler(this.removeCommentsToolStripMenuItem_Click);
//
// bookmarkTextBox
//
@@ -73,7 +73,7 @@ private void InitializeComponent() {
this.bookmarkTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.bookmarkTextBox.Size = new System.Drawing.Size(194, 114);
this.bookmarkTextBox.TabIndex = 0;
- this.bookmarkTextBox.TextChanged += new System.EventHandler(this.OnBookmarkTextBoxTextChanged);
+ this.bookmarkTextBox.TextChanged += new System.EventHandler(this.bookmarkTextBox_TextChanged);
//
// splitContainer1
//
@@ -119,17 +119,17 @@ private void InitializeComponent() {
this.bookmarkDataGridView.Size = new System.Drawing.Size(517, 158);
this.bookmarkDataGridView.TabIndex = 0;
this.bookmarkDataGridView.VirtualMode = true;
- this.bookmarkDataGridView.Enter += new System.EventHandler(this.OnBookmarkGridViewEnter);
- this.bookmarkDataGridView.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.OnBookmarkDataGridViewCellDoubleClick);
+ this.bookmarkDataGridView.Enter += new System.EventHandler(this.bookmarkGridView_Enter);
+ this.bookmarkDataGridView.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.bookmarkDataGridView_CellDoubleClick);
this.bookmarkDataGridView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.boomarkDataGridView_MouseDoubleClick);
- this.bookmarkDataGridView.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.OnBookmarkDataGridViewPreviewKeyDown);
- this.bookmarkDataGridView.Leave += new System.EventHandler(this.OnBookmarkGridViewLeave);
+ this.bookmarkDataGridView.PreviewKeyDown += new System.Windows.Forms.PreviewKeyDownEventHandler(this.bookmarkDataGridView_PreviewKeyDown);
+ this.bookmarkDataGridView.Leave += new System.EventHandler(this.bookmarkGridView_Leave);
this.bookmarkDataGridView.ColumnDividerDoubleClick += new System.Windows.Forms.DataGridViewColumnDividerDoubleClickEventHandler(this.boomarkDataGridView_ColumnDividerDoubleClick);
- this.bookmarkDataGridView.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.OnBookmarkDataGridViewRowsAdded);
- this.bookmarkDataGridView.SelectionChanged += new System.EventHandler(OnBookmarkDataGridViewSelectionChanged);
- this.bookmarkDataGridView.CellToolTipTextNeeded += new System.Windows.Forms.DataGridViewCellToolTipTextNeededEventHandler(this.OnBookmarkDataGridViewCellToolTipTextNeeded);
+ this.bookmarkDataGridView.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.bookmarkDataGridView_RowsAdded);
+ this.bookmarkDataGridView.SelectionChanged += new System.EventHandler(bookmarkDataGridView_SelectionChanged);
+ this.bookmarkDataGridView.CellToolTipTextNeeded += new System.Windows.Forms.DataGridViewCellToolTipTextNeededEventHandler(this.bookmarkDataGridView_CellToolTipTextNeeded);
this.bookmarkDataGridView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.bookmarkGridView_KeyDown);
- this.bookmarkDataGridView.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.OnBookmarkDataGridViewRowsRemoved);
+ this.bookmarkDataGridView.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.bookmarkDataGridView_RowsRemoved);
//
// commentColumnCheckBox
//
@@ -141,7 +141,7 @@ private void InitializeComponent() {
this.commentColumnCheckBox.TabIndex = 8;
this.commentColumnCheckBox.Text = "Show comment column";
this.commentColumnCheckBox.UseVisualStyleBackColor = true;
- this.commentColumnCheckBox.CheckedChanged += new System.EventHandler(this.OnCommentColumnCheckBoxCheckedChanged);
+ this.commentColumnCheckBox.CheckedChanged += new System.EventHandler(this.commentColumnCheckBox_CheckedChanged);
//
// label1
//
@@ -171,8 +171,8 @@ private void InitializeComponent() {
this.ShowIcon = false;
this.ShowInTaskbar = false;
this.Text = "Bookmarks";
- this.ClientSizeChanged += new System.EventHandler(this.OnBookmarkWindowClientSizeChanged);
- this.SizeChanged += new System.EventHandler(this.OnBookmarkWindowSizeChanged);
+ this.ClientSizeChanged += new System.EventHandler(this.BookmarkWindow_ClientSizeChanged);
+ this.SizeChanged += new System.EventHandler(this.BookmarkWindow_SizeChanged);
this.contextMenuStrip1.ResumeLayout(false);
this.splitContainer1.Panel1.ResumeLayout(false);
this.splitContainer1.Panel2.ResumeLayout(false);
diff --git a/src/LogExpert/Dialogs/BookmarkWindow.cs b/src/LogExpert/Dialogs/BookmarkWindow.cs
index 1a1e652e..7f92cee5 100644
--- a/src/LogExpert/Dialogs/BookmarkWindow.cs
+++ b/src/LogExpert/Dialogs/BookmarkWindow.cs
@@ -1,16 +1,13 @@
-using LogExpert.Classes;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+using LogExpert.Classes;
using LogExpert.Config;
using LogExpert.Entities;
using LogExpert.Extensions.Forms;
using LogExpert.Interface;
-
using NLog;
-
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-
using WeifenLuo.WinFormsUI.Docking;
namespace LogExpert.Dialogs
@@ -64,7 +61,7 @@ public void ChangeTheme(Control.ControlCollection container)
}
}
- #endregion
+ #endregion
#region DataGridView
@@ -74,7 +71,7 @@ public void ChangeTheme(Control.ControlCollection container)
bookmarkDataGridView.BackgroundColor = LogExpert.Config.ColorMode.DockBackgroundColor;
bookmarkDataGridView.ColumnHeadersDefaultCellStyle.BackColor = LogExpert.Config.ColorMode.BackgroundColor;
bookmarkDataGridView.ColumnHeadersDefaultCellStyle.ForeColor = LogExpert.Config.ColorMode.ForeColor;
- bookmarkDataGridView.EnableHeadersVisualStyles = false;
+ bookmarkDataGridView.EnableHeadersVisualStyles = false;
// Colors for menu
contextMenuStrip1.Renderer = new ExtendedMenuStripRenderer();
@@ -84,7 +81,7 @@ public void ChangeTheme(Control.ControlCollection container)
var item = contextMenuStrip1.Items[y];
item.ForeColor = LogExpert.Config.ColorMode.ForeColor;
item.BackColor = LogExpert.Config.ColorMode.MenuBackgroundColor;
- }
+ }
#endregion DataGridView
}
@@ -277,12 +274,12 @@ private void SetFont(string fontName, float fontSize)
}
- private void CommentPainting(BufferedDataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
+ private void CommentPainting(DataGridView gridView, int rowIndex, DataGridViewCellPaintingEventArgs e)
{
Color backColor = LogExpert.Config.ColorMode.DockBackgroundColor;
if ((e.State & DataGridViewElementStates.Selected) == DataGridViewElementStates.Selected)
- {
+ {
Brush brush;
if (gridView.Focused)
{
@@ -322,7 +319,7 @@ private void DeleteSelectedBookmarks()
logView?.DeleteBookmarks(lineNumList);
}
- private static void InvalidateCurrentRow(BufferedDataGridView gridView)
+ private static void InvalidateCurrentRow(DataGridView gridView)
{
if (gridView.CurrentCellAddress.Y > -1)
{
@@ -337,7 +334,7 @@ private void CurrentRowChanged(int rowIndex)
// multiple selection or no selection at all
bookmarkTextBox.Enabled = false;
- // disable the control first so that changes made to it won't propagate to the bookmark item
+// disable the control first so that changes made to it won't propagate to the bookmark item
bookmarkTextBox.Text = string.Empty;
}
else
@@ -387,7 +384,7 @@ private void boomarkDataGridView_CellPainting(object sender, DataGridViewCellPai
// CommentPainting(this.bookmarkDataGridView, lineNum, e);
// }
{
- // else
+// else
PaintHelper.CellPainting(logPaintContext, bookmarkDataGridView, lineNum, e);
}
}
@@ -470,22 +467,22 @@ private void bookmarkGridView_KeyDown(object sender, KeyEventArgs e)
}
}
- private void OnBookmarkGridViewEnter(object sender, EventArgs e)
+ private void bookmarkGridView_Enter(object sender, EventArgs e)
{
InvalidateCurrentRow(bookmarkDataGridView);
}
- private void OnBookmarkGridViewLeave(object sender, EventArgs e)
+ private void bookmarkGridView_Leave(object sender, EventArgs e)
{
InvalidateCurrentRow(bookmarkDataGridView);
}
- private void OnDeleteBookmarksToolStripMenuItemClick(object sender, EventArgs e)
+ private void deleteBookmarksToolStripMenuItem_Click(object sender, EventArgs e)
{
DeleteSelectedBookmarks();
}
- private void OnBookmarkTextBoxTextChanged(object sender, EventArgs e)
+ private void bookmarkTextBox_TextChanged(object sender, EventArgs e)
{
if (!bookmarkTextBox.Enabled)
{
@@ -508,7 +505,7 @@ private void OnBookmarkTextBoxTextChanged(object sender, EventArgs e)
logView?.RefreshLogView();
}
- private void OnBookmarkDataGridViewSelectionChanged(object sender, EventArgs e)
+ private void bookmarkDataGridView_SelectionChanged(object sender, EventArgs e)
{
if (bookmarkDataGridView.SelectedRows.Count != 1
|| bookmarkDataGridView.SelectedRows[0].Index >= bookmarkData.Bookmarks.Count)
@@ -521,7 +518,7 @@ private void OnBookmarkDataGridViewSelectionChanged(object sender, EventArgs e)
}
}
- private void OnBookmarkDataGridViewPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+ private void bookmarkDataGridView_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if (e.KeyCode == Keys.Tab)
{
@@ -529,7 +526,7 @@ private void OnBookmarkDataGridViewPreviewKeyDown(object sender, PreviewKeyDownE
}
}
- private void OnBookmarkDataGridViewCellToolTipTextNeeded(object sender,
+ private void bookmarkDataGridView_CellToolTipTextNeeded(object sender,
DataGridViewCellToolTipTextNeededEventArgs e)
{
if (e.ColumnIndex != 0 || e.RowIndex <= -1 || e.RowIndex >= bookmarkData.Bookmarks.Count)
@@ -545,7 +542,7 @@ private void OnBookmarkDataGridViewCellToolTipTextNeeded(object sender,
}
}
- private void OnBookmarkDataGridViewCellDoubleClick(object sender, DataGridViewCellEventArgs e)
+ private void bookmarkDataGridView_CellDoubleClick(object sender, DataGridViewCellEventArgs e)
{
// Toggle bookmark when double-clicking on the first column
if (e.ColumnIndex == 0 && e.RowIndex >= 0 && bookmarkDataGridView.CurrentRow != null)
@@ -554,7 +551,7 @@ private void OnBookmarkDataGridViewCellDoubleClick(object sender, DataGridViewCe
int lineNum = bookmarkData.Bookmarks[bookmarkDataGridView.CurrentRow.Index].LineNum;
bookmarkData.ToggleBookmark(lineNum);
- // we don't ask for confirmation if the bookmark has an associated comment...
+// we don't ask for confirmation if the bookmark has an associated comment...
int boomarkCount = bookmarkData.Bookmarks.Count;
bookmarkDataGridView.RowCount = boomarkCount;
@@ -597,9 +594,12 @@ private void OnBookmarkDataGridViewCellDoubleClick(object sender, DataGridViewCe
}
}
- private void OnRemoveCommentsToolStripMenuItemClick(object sender, EventArgs e)
+ private void removeCommentsToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (MessageBox.Show("Really remove bookmark comments for selected lines?", "LogExpert", MessageBoxButtons.YesNo) == DialogResult.Yes)
+ if (
+ MessageBox.Show("Really remove bookmark comments for selected lines?", "LogExpert",
+ MessageBoxButtons.YesNo) ==
+ DialogResult.Yes)
{
List lineNumList = [];
foreach (DataGridViewRow row in bookmarkDataGridView.SelectedRows)
@@ -616,12 +616,12 @@ private void OnRemoveCommentsToolStripMenuItemClick(object sender, EventArgs e)
}
}
- private void OnCommentColumnCheckBoxCheckedChanged(object sender, EventArgs e)
+ private void commentColumnCheckBox_CheckedChanged(object sender, EventArgs e)
{
ShowCommentColumn(commentColumnCheckBox.Checked);
}
- private void OnBookmarkWindowClientSizeChanged(object sender, EventArgs e)
+ private void BookmarkWindow_ClientSizeChanged(object sender, EventArgs e)
{
if (Width > 0 && Height > 0)
{
@@ -650,23 +650,23 @@ private void OnBookmarkWindowClientSizeChanged(object sender, EventArgs e)
}
}
- private void OnBookmarkDataGridViewRowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
+ private void bookmarkDataGridView_RowsAdded(object sender, DataGridViewRowsAddedEventArgs e)
{
HideIfNeeded();
}
- private void OnBookmarkDataGridViewRowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e)
+ private void bookmarkDataGridView_RowsRemoved(object sender, DataGridViewRowsRemovedEventArgs e)
{
HideIfNeeded();
}
- private void OnBookmarkWindowSizeChanged(object sender, EventArgs e)
+ private void BookmarkWindow_SizeChanged(object sender, EventArgs e)
{
// if (!this.splitContainer1.Visible)
// {
// // redraw the "no bookmarks" display
// Invalidate();
- // }
+ // }
}
#endregion
diff --git a/src/LogExpert/Dialogs/BufferedDataGridView.cs b/src/LogExpert/Dialogs/BufferedDataGridView.cs
index afcccafa..749c2c75 100644
--- a/src/LogExpert/Dialogs/BufferedDataGridView.cs
+++ b/src/LogExpert/Dialogs/BufferedDataGridView.cs
@@ -1,12 +1,13 @@
-using LogExpert.Entities;
-
-using NLog;
-
-using System;
+using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Drawing;
-using System.Drawing.Drawing2D;
+using System.Data;
+using System.Text;
using System.Windows.Forms;
+using System.Drawing.Drawing2D;
+using LogExpert.Entities;
+using NLog;
namespace LogExpert.Dialogs
{
@@ -23,7 +24,7 @@ public partial class BufferedDataGridView : DataGridView
private readonly SortedList _overlayList = [];
private readonly Pen _pen;
- private readonly Brush _bookmarktextBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90));
+ private readonly Brush _textBrush = new SolidBrush(Color.FromArgb(200, 0, 0, 90));
private BookmarkOverlay _draggedOverlay;
private Point _dragStartPoint;
@@ -36,7 +37,7 @@ public partial class BufferedDataGridView : DataGridView
public BufferedDataGridView()
{
- _pen = new Pen(_bubbleColor, (float)3.0);
+ _pen = new Pen(_bubbleColor, (float) 3.0);
_brush = new SolidBrush(_bubbleColor);
InitializeComponent();
@@ -60,7 +61,7 @@ public BufferedDataGridView()
#region Properties
- /*
+ /*
public Graphics Buffer
{
get { return this.myBuffer.Graphics; }
@@ -111,9 +112,9 @@ protected override void OnEditingControlShowing(DataGridViewEditingControlShowin
base.OnEditingControlShowing(e);
e.Control.KeyDown -= OnControlKeyDown;
e.Control.KeyDown += OnControlKeyDown;
- DataGridViewTextBoxEditingControl editControl = (DataGridViewTextBoxEditingControl)e.Control;
- e.Control.PreviewKeyDown -= OnControlPreviewKeyDown;
- e.Control.PreviewKeyDown += OnControlPreviewKeyDown;
+ DataGridViewTextBoxEditingControl editControl = (DataGridViewTextBoxEditingControl) e.Control;
+ e.Control.PreviewKeyDown -= Control_PreviewKeyDown;
+ e.Control.PreviewKeyDown += Control_PreviewKeyDown;
editControl.ContextMenuStrip = EditModeMenuStrip;
}
@@ -121,7 +122,6 @@ protected override void OnEditingControlShowing(DataGridViewEditingControlShowin
protected override void OnMouseDown(MouseEventArgs e)
{
BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
-
if (overlay != null)
{
if (e.Button == MouseButtons.Right)
@@ -181,7 +181,6 @@ protected override void OnMouseMove(MouseEventArgs e)
protected override void OnMouseDoubleClick(MouseEventArgs e)
{
BookmarkOverlay overlay = GetOverlayForPosition(e.Location);
-
if (overlay != null)
{
if (e.Button == MouseButtons.Left)
@@ -215,106 +214,71 @@ private BookmarkOverlay GetOverlayForPosition(Point pos)
return null;
}
- /////
- ///// Overwrite the ProcessCmdKey to handle the Copy command (Ctrl+C) to copy the selected rows to the clipboard.
- /////
- /////
- /////
- /////
- //protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
- //{
- // if ((keyData == (Keys.Control | Keys.C)))
- // {
- // StringBuilder stringBuilder = new();
- // var tabulator = "\t";
-
- // foreach (DataGridViewRow row in SelectedRows)
- // {
- // foreach (DataGridViewCell cell in row.Cells)
- // {
- // stringBuilder.Append(cell.Value?.ToString() ?? string.Empty);
- // stringBuilder.Append(tabulator);
- // }
-
- // stringBuilder.AppendLine();
- // }
-
- // Clipboard.SetText(stringBuilder.ToString());
- // }
-
- // return base.ProcessCmdKey(ref msg, keyData);
- //}
-
private void PaintOverlays(PaintEventArgs e)
{
BufferedGraphicsContext currentContext = BufferedGraphicsManager.Current;
- using BufferedGraphics myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle);
- lock (_overlayList)
+ using (BufferedGraphics myBuffer = currentContext.Allocate(CreateGraphics(), ClientRectangle))
{
- _overlayList.Clear();
- }
+ lock (_overlayList)
+ {
+ _overlayList.Clear();
+ }
- myBuffer.Graphics.SetClip(ClientRectangle, CombineMode.Union);
- e.Graphics.SetClip(ClientRectangle, CombineMode.Union);
+ myBuffer.Graphics.SetClip(ClientRectangle, CombineMode.Union);
+ e.Graphics.SetClip(ClientRectangle, CombineMode.Union);
- PaintEventArgs args = new(myBuffer.Graphics, e.ClipRectangle);
+ PaintEventArgs args = new(myBuffer.Graphics, e.ClipRectangle);
- base.OnPaint(args);
+ base.OnPaint(args);
- StringFormat format = new()
- {
- LineAlignment = StringAlignment.Center,
- Alignment = StringAlignment.Near
- };
+ StringFormat format = new();
+ format.LineAlignment = StringAlignment.Center;
+ format.Alignment = StringAlignment.Near;
- myBuffer.Graphics.SetClip(DisplayRectangle, CombineMode.Intersect);
+ myBuffer.Graphics.SetClip(DisplayRectangle, CombineMode.Intersect);
- // Remove Columnheader from Clippingarea
- Rectangle rectTableHeader = new(DisplayRectangle.X, DisplayRectangle.Y, DisplayRectangle.Width, ColumnHeadersHeight);
- myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
+ // Remove Columnheader from Clippingarea
+ Rectangle rectTableHeader = new(DisplayRectangle.X, DisplayRectangle.Y, DisplayRectangle.Width, ColumnHeadersHeight);
+ myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
- //e.Graphics.SetClip(rect, CombineMode.Union);
+ //e.Graphics.SetClip(rect, CombineMode.Union);
- lock (_overlayList)
- {
- foreach (BookmarkOverlay overlay in _overlayList.Values)
+ lock (_overlayList)
{
- SizeF textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
-
- Rectangle rectBubble = new(overlay.Position, new Size((int)textSize.Width, (int)textSize.Height));
- rectBubble.Offset(60, -(rectBubble.Height + 40));
- rectBubble.Inflate(3, 3);
- rectBubble.Location += overlay.Bookmark.OverlayOffset;
-
- overlay.BubbleRect = rectBubble;
-
- myBuffer.Graphics.SetClip(rectBubble, CombineMode.Union); // Bubble to clip
- myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
-
- e.Graphics.SetClip(rectBubble, CombineMode.Union);
-
- RectangleF textRect = new(rectBubble.X, rectBubble.Y, rectBubble.Width, rectBubble.Height);
-
- myBuffer.Graphics.FillRectangle(_brush, rectBubble);
- //myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rect.X, rect.Y + rect.Height / 2));
- myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rectBubble.X, rectBubble.Y + rectBubble.Height));
- myBuffer.Graphics.DrawString(overlay.Bookmark.Text, _font, _bookmarktextBrush, textRect, format);
-
- if (_logger.IsDebugEnabled)
+ foreach (BookmarkOverlay overlay in _overlayList.Values)
{
- _logger.Debug("ClipRgn: {0},{1},{2},{3}", myBuffer.Graphics.ClipBounds.Left, myBuffer.Graphics.ClipBounds.Top, myBuffer.Graphics.ClipBounds.Width, myBuffer.Graphics.ClipBounds.Height);
+ SizeF textSize = myBuffer.Graphics.MeasureString(overlay.Bookmark.Text, _font, 300);
+ Rectangle rectBubble = new(overlay.Position,
+ new Size((int) textSize.Width, (int) textSize.Height));
+ rectBubble.Offset(60, -(rectBubble.Height + 40));
+ rectBubble.Inflate(3, 3);
+ rectBubble.Location += overlay.Bookmark.OverlayOffset;
+ overlay.BubbleRect = rectBubble;
+ myBuffer.Graphics.SetClip(rectBubble, CombineMode.Union); // Bubble to clip
+ myBuffer.Graphics.SetClip(rectTableHeader, CombineMode.Exclude);
+ e.Graphics.SetClip(rectBubble, CombineMode.Union);
+ RectangleF textRect = new(rectBubble.X, rectBubble.Y, rectBubble.Width, rectBubble.Height);
+ myBuffer.Graphics.FillRectangle(_brush, rectBubble);
+ //myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rect.X, rect.Y + rect.Height / 2));
+ myBuffer.Graphics.DrawLine(_pen, overlay.Position, new Point(rectBubble.X, rectBubble.Y + rectBubble.Height));
+ myBuffer.Graphics.DrawString(overlay.Bookmark.Text, _font, _textBrush, textRect, format);
+
+ if (_logger.IsDebugEnabled)
+ {
+ _logger.Debug("ClipRgn: {0},{1},{2},{3}", myBuffer.Graphics.ClipBounds.Left, myBuffer.Graphics.ClipBounds.Top, myBuffer.Graphics.ClipBounds.Width, myBuffer.Graphics.ClipBounds.Height);
+ }
}
}
- }
- myBuffer.Render(e.Graphics);
+ myBuffer.Render(e.Graphics);
+ }
}
#endregion
#region Events handler
- private void OnControlPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
+ private void Control_PreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
{
if ((e.KeyCode == Keys.C || e.KeyCode == Keys.Insert) && e.Control)
{
diff --git a/src/LogExpert/Dialogs/FilterSelectorForm.cs b/src/LogExpert/Dialogs/FilterSelectorForm.cs
index 9410c479..05297708 100644
--- a/src/LogExpert/Dialogs/FilterSelectorForm.cs
+++ b/src/LogExpert/Dialogs/FilterSelectorForm.cs
@@ -84,7 +84,7 @@ private void OnConfigButtonClick(object sender, EventArgs e)
{
string configDir = ConfigManager.ConfigDir;
- if (ConfigManager.Settings.Preferences.PortableMode)
+ if (ConfigManager.Settings.preferences.PortableMode)
{
configDir = ConfigManager.PortableModeDir;
}
diff --git a/src/LogExpert/Dialogs/HighlightDialog.cs b/src/LogExpert/Dialogs/HighlightDialog.cs
index 3b512743..e25d12b0 100644
--- a/src/LogExpert/Dialogs/HighlightDialog.cs
+++ b/src/LogExpert/Dialogs/HighlightDialog.cs
@@ -23,8 +23,8 @@ public partial class HighlightDialog : Form
private readonly Image _applyButtonImage;
private string _bookmarkComment;
private ActionEntry _currentActionEntry = new();
- private HighlightGroup _currentGroup;
- private List _highlightGroupList;
+ private HilightGroup _currentGroup;
+ private List _highlightGroupList;
#endregion
@@ -46,7 +46,7 @@ public HighlightDialog()
#region Properties / Indexers
- public List HighlightGroupList
+ public List HighlightGroupList
{
get => _highlightGroupList;
set
@@ -55,7 +55,7 @@ public List HighlightGroupList
foreach (var group in value)
{
- _highlightGroupList.Add((HighlightGroup)group.Clone());
+ _highlightGroupList.Add((HilightGroup)group.Clone());
}
}
}
@@ -96,7 +96,7 @@ private void OnBtnCopyGroupClick(object sender, EventArgs e)
{
if (comboBoxGroups.SelectedIndex >= 0 && comboBoxGroups.SelectedIndex < HighlightGroupList.Count)
{
- HighlightGroup newGroup = (HighlightGroup)HighlightGroupList[comboBoxGroups.SelectedIndex].Clone();
+ HilightGroup newGroup = (HilightGroup)HighlightGroupList[comboBoxGroups.SelectedIndex].Clone();
newGroup.GroupName = "Copy of " + newGroup.GroupName;
HighlightGroupList.Add(newGroup);
@@ -143,21 +143,19 @@ private void OnBtnDelGroupClick(object sender, EventArgs e)
private void OnBtnExportGroupClick(object sender, EventArgs e)
{
- SaveFileDialog dlg = new()
- {
- Title = @"Export Settings to file",
- DefaultExt = "json",
- AddExtension = true,
- Filter = @"Settings (*.json)|*.json|All files (*.*)|*.*"
- };
+ //SaveFileDialog dlg = new SaveFileDialog();
+ //dlg.Title = @"Export Settings to file";
+ //dlg.DefaultExt = "json";
+ //dlg.AddExtension = true;
+ //dlg.Filter = @"Settings (*.json)|*.json|All files (*.*)|*.*";
- DialogResult result = dlg.ShowDialog();
+ //DialogResult result = dlg.ShowDialog();
- if (result == DialogResult.OK)
- {
- FileInfo fileInfo = new(dlg.FileName);
- ConfigManager.ExportHighlightSettings(fileInfo);
- }
+ //if (result == DialogResult.OK)
+ //{
+ // FileInfo fileInfo = new FileInfo(dlg.FileName);
+ // ConfigManager.Export(fileInfo);
+ //}
}
private void OnBtnGroupDownClick(object sender, EventArgs e)
@@ -186,13 +184,18 @@ private void OnBtnGroupUpClick(object sender, EventArgs e)
private void OnBtnImportGroupClick(object sender, EventArgs e)
{
- OpenFileDialog dlg = new()
+ ImportSettingsDialog dlg = new();
+
+ foreach (Control ctl in dlg.groupBoxImportOptions.Controls)
{
- Title = @"Export Highlight Settings to file",
- DefaultExt = "json",
- AddExtension = true,
- Filter = @"Settings (*.json)|*.json|All files (*.*)|*.*",
- };
+ if (ctl.Tag != null)
+ {
+ ((CheckBox)ctl).Checked = false;
+ }
+ }
+
+ dlg.checkBoxHighlightSettings.Checked = true;
+ dlg.checkBoxKeepExistingSettings.Checked = true;
if (dlg.ShowDialog() != DialogResult.OK)
{
@@ -219,13 +222,12 @@ private void OnBtnImportGroupClick(object sender, EventArgs e)
return;
}
- ConfigManager.ImportHighlightSettings(fileInfo);
+ ConfigManager.Import(fileInfo, dlg.ImportFlags);
Cursor.Current = Cursors.Default;
- _highlightGroupList = ConfigManager.Settings.Preferences.HighlightGroupList;
+ _highlightGroupList = ConfigManager.Settings.hilightGroupList;
FillGroupComboBox();
- SelectGroup(0);
MessageBox.Show(this, @"Settings imported", @"LogExpert");
}
@@ -240,21 +242,20 @@ private void OnBtnMoveDownClick(object sender, EventArgs e)
listBoxHighlight.Items.RemoveAt(index);
listBoxHighlight.Items.Insert(index + 1, item);
listBoxHighlight.SelectedIndex = index + 1;
- _currentGroup.HighlightEntryList.Reverse(index, 2);
+ _currentGroup.HilightEntryList.Reverse(index, 2);
}
}
private void OnBtnMoveUpClick(object sender, EventArgs e)
{
int index = listBoxHighlight.SelectedIndex;
-
if (index > 0)
{
object item = listBoxHighlight.SelectedItem;
listBoxHighlight.Items.RemoveAt(index); // will also clear the selection
listBoxHighlight.Items.Insert(index - 1, item);
listBoxHighlight.SelectedIndex = index - 1; // restore the selection
- _currentGroup.HighlightEntryList.Reverse(index - 1, 2);
+ _currentGroup.HilightEntryList.Reverse(index - 1, 2);
}
}
@@ -265,10 +266,9 @@ private void OnBtnNewGroupClick(object sender, EventArgs e)
string name = baseName;
bool uniqueName = false;
int i = 1;
-
while (!uniqueName)
{
- uniqueName = HighlightGroupList.FindIndex(delegate (HighlightGroup g) { return g.GroupName == name; }) < 0;
+ uniqueName = HighlightGroupList.FindIndex(delegate (HilightGroup g) { return g.GroupName == name; }) < 0;
if (!uniqueName)
{
@@ -276,7 +276,7 @@ private void OnBtnNewGroupClick(object sender, EventArgs e)
}
}
- HighlightGroup newGroup = new() { GroupName = name };
+ HilightGroup newGroup = new() { GroupName = name };
HighlightGroupList.Add(newGroup);
FillGroupComboBox();
SelectGroup(HighlightGroupList.Count - 1);
@@ -314,14 +314,12 @@ private void OnChkBoxRegexMouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
{
- RegexHelperDialog dlg = new()
- {
- Owner = this,
- CaseSensitive = checkBoxCaseSensitive.Checked,
- Pattern = textBoxSearchString.Text
- };
-
- if (dlg.ShowDialog() == DialogResult.OK)
+ RegexHelperDialog dlg = new();
+ dlg.Owner = this;
+ dlg.CaseSensitive = checkBoxCaseSensitive.Checked;
+ dlg.Pattern = textBoxSearchString.Text;
+ DialogResult res = dlg.ShowDialog();
+ if (res == DialogResult.OK)
{
checkBoxCaseSensitive.Checked = dlg.CaseSensitive;
textBoxSearchString.Text = dlg.Pattern;
@@ -338,10 +336,9 @@ private void OnChkBoxWordMatchCheckedChanged(object sender, EventArgs e)
private void OnCmbBoxGroupDrawItem(object sender, DrawItemEventArgs e)
{
e.DrawBackground();
-
if (e.Index >= 0)
{
- HighlightGroup group = HighlightGroupList[e.Index];
+ HilightGroup group = HighlightGroupList[e.Index];
Rectangle rectangle = new(0, e.Bounds.Top, e.Bounds.Width, e.Bounds.Height);
Brush brush = new SolidBrush(SystemColors.ControlText);
@@ -366,12 +363,11 @@ private void OnDeleteButtonClick(object sender, EventArgs e)
if (listBoxHighlight.SelectedIndex >= 0)
{
int removeIndex = listBoxHighlight.SelectedIndex;
- _currentGroup.HighlightEntryList.RemoveAt(removeIndex);
+ _currentGroup.HilightEntryList.RemoveAt(removeIndex);
listBoxHighlight.Items.RemoveAt(removeIndex);
// Select previous (or first if none before)
int nextSelectIndex = removeIndex;
-
if (nextSelectIndex >= listBoxHighlight.Items.Count)
{
nextSelectIndex--; // if last item was removed, go one up
@@ -406,10 +402,9 @@ private void OnHighlightDialogShown(object sender, EventArgs e)
private void OnHighlightListBoxDrawItem(object sender, DrawItemEventArgs e)
{
e.DrawBackground();
-
if (e.Index >= 0)
{
- HighlightEntry entry = (HighlightEntry)listBoxHighlight.Items[e.Index];
+ HilightEntry entry = (HilightEntry)listBoxHighlight.Items[e.Index];
Rectangle rectangle = new(0, e.Bounds.Top, e.Bounds.Width, e.Bounds.Height);
if ((e.State & DrawItemState.Selected) != DrawItemState.Selected)
@@ -417,7 +412,8 @@ private void OnHighlightListBoxDrawItem(object sender, DrawItemEventArgs e)
e.Graphics.FillRectangle(new SolidBrush(entry.BackgroundColor), rectangle);
}
- e.Graphics.DrawString(entry.SearchText, e.Font, new SolidBrush(entry.ForegroundColor), new PointF(rectangle.Left, rectangle.Top));
+ e.Graphics.DrawString(entry.SearchText, e.Font, new SolidBrush(entry.ForegroundColor),
+ new PointF(rectangle.Left, rectangle.Top));
e.DrawFocusRectangle();
}
@@ -450,7 +446,7 @@ private void AddNewEntry()
{
CheckRegex();
- HighlightEntry entry = new()
+ HilightEntry entry = new()
{
SearchText = textBoxSearchString.Text,
ForegroundColor = colorBoxForeground.SelectedColor,
@@ -470,7 +466,7 @@ private void AddNewEntry()
listBoxHighlight.Items.Add(entry);
// Select the newly created item
- _currentGroup.HighlightEntryList.Add(entry);
+ _currentGroup.HilightEntryList.Add(entry);
listBoxHighlight.SelectedItem = entry;
}
catch (Exception ex)
@@ -502,13 +498,10 @@ private void CheckRegex()
private void ChooseColor(ColorComboBox comboBox)
{
- ColorDialog colorDialog = new()
- {
- AllowFullOpen = true,
- ShowHelp = false,
- Color = comboBox.CustomColor
- };
-
+ ColorDialog colorDialog = new();
+ colorDialog.AllowFullOpen = true;
+ colorDialog.ShowHelp = false;
+ colorDialog.Color = comboBox.CustomColor;
if (colorDialog.ShowDialog() == DialogResult.OK)
{
comboBox.CustomColor = colorDialog.Color;
@@ -519,7 +512,6 @@ private void ChooseColor(ColorComboBox comboBox)
private void Dirty()
{
int index = listBoxHighlight.SelectedIndex;
-
if (index > -1)
{
btnApply.Enabled = true;
@@ -535,7 +527,7 @@ private void FillGroupComboBox()
comboBoxGroups.Items.Clear();
- foreach (HighlightGroup group in HighlightGroupList)
+ foreach (HilightGroup group in HighlightGroupList)
{
comboBoxGroups.Items.Add(group);
}
@@ -548,7 +540,7 @@ private void FillHighlightListBox()
listBoxHighlight.Items.Clear();
if (_currentGroup != null)
{
- foreach (HighlightEntry entry in _currentGroup.HighlightEntryList)
+ foreach (HilightEntry entry in _currentGroup.HilightEntryList)
{
listBoxHighlight.Items.Add(entry);
}
@@ -562,10 +554,10 @@ private void InitData()
if (HighlightGroupList.Count == 0)
{
- HighlightGroup highlightGroup = new()
+ HilightGroup highlightGroup = new()
{
GroupName = def,
- HighlightEntryList = []
+ HilightEntryList = []
};
HighlightGroupList.Add(highlightGroup);
@@ -575,13 +567,12 @@ private void InitData()
_currentGroup = null;
string groupToSelect = PreSelectedGroupName;
-
if (string.IsNullOrEmpty(groupToSelect))
{
groupToSelect = def;
}
- foreach (HighlightGroup group in HighlightGroupList)
+ foreach (HilightGroup group in HighlightGroupList)
{
if (group.GroupName.Equals(groupToSelect))
{
@@ -630,7 +621,7 @@ private void SaveEntry()
{
CheckRegex();
- HighlightEntry entry = (HighlightEntry)listBoxHighlight.SelectedItem;
+ HilightEntry entry = (HilightEntry)listBoxHighlight.SelectedItem;
entry.ForegroundColor = (Color)colorBoxForeground.SelectedItem;
entry.BackgroundColor = (Color)colorBoxBackground.SelectedItem;
@@ -680,7 +671,7 @@ private void SelectGroup(int index)
private void StartEditEntry()
{
- HighlightEntry entry = (HighlightEntry)listBoxHighlight.SelectedItem;
+ HilightEntry entry = (HilightEntry)listBoxHighlight.SelectedItem;
if (entry != null)
{
diff --git a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs
index f53dce6c..dfb8ed33 100644
--- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs
+++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs
@@ -20,1703 +20,1757 @@ protected override void Dispose(bool disposing)
base.Dispose(disposing);
}
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- components = new System.ComponentModel.Container();
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsDialog));
- tabControlSettings = new System.Windows.Forms.TabControl();
- tabPageViewSettings = new System.Windows.Forms.TabPage();
- labelWarningMaximumLineLenght = new System.Windows.Forms.Label();
- upDownMaximumLineLength = new System.Windows.Forms.NumericUpDown();
- labelMaximumLineLength = new System.Windows.Forms.Label();
- upDownMaximumFilterEntriesDisplayed = new System.Windows.Forms.NumericUpDown();
- labelMaximumFilterEntriesDisplayed = new System.Windows.Forms.Label();
- upDownMaximumFilterEntries = new System.Windows.Forms.NumericUpDown();
- labelMaximumFilterEntries = new System.Windows.Forms.Label();
- labelDefaultEncoding = new System.Windows.Forms.Label();
- comboBoxEncoding = new System.Windows.Forms.ComboBox();
- groupBoxMisc = new System.Windows.Forms.GroupBox();
- checkBoxShowErrorMessageOnlyOneInstance = new System.Windows.Forms.CheckBox();
- cpDownColumnWidth = new System.Windows.Forms.NumericUpDown();
- checkBoxColumnSize = new System.Windows.Forms.CheckBox();
- buttonTailColor = new System.Windows.Forms.Button();
- checkBoxTailState = new System.Windows.Forms.CheckBox();
- checkBoxOpenLastFiles = new System.Windows.Forms.CheckBox();
- checkBoxSingleInstance = new System.Windows.Forms.CheckBox();
- checkBoxAskCloseTabs = new System.Windows.Forms.CheckBox();
- groupBoxDefaults = new System.Windows.Forms.GroupBox();
- checkBoxDarkMode = new System.Windows.Forms.CheckBox();
- checkBoxFollowTail = new System.Windows.Forms.CheckBox();
- checkBoxColumnFinder = new System.Windows.Forms.CheckBox();
- checkBoxSyncFilter = new System.Windows.Forms.CheckBox();
- checkBoxFilterTail = new System.Windows.Forms.CheckBox();
- groupBoxFont = new System.Windows.Forms.GroupBox();
- buttonChangeFont = new System.Windows.Forms.Button();
- labelFont = new System.Windows.Forms.Label();
- tabPageTimeStampFeatures = new System.Windows.Forms.TabPage();
- groupBoxTimeSpreadDisplay = new System.Windows.Forms.GroupBox();
- groupBoxDisplayMode = new System.Windows.Forms.GroupBox();
- radioButtonLineView = new System.Windows.Forms.RadioButton();
- radioButtonTimeView = new System.Windows.Forms.RadioButton();
- checkBoxReverseAlpha = new System.Windows.Forms.CheckBox();
- buttonTimespreadColor = new System.Windows.Forms.Button();
- checkBoxTimeSpread = new System.Windows.Forms.CheckBox();
- groupBoxTimeStampNavigationControl = new System.Windows.Forms.GroupBox();
- checkBoxTimestamp = new System.Windows.Forms.CheckBox();
- groupBoxMouseDragDefaults = new System.Windows.Forms.GroupBox();
- radioButtonVerticalMouseDragInverted = new System.Windows.Forms.RadioButton();
- radioButtonHorizMouseDrag = new System.Windows.Forms.RadioButton();
- radioButtonVerticalMouseDrag = new System.Windows.Forms.RadioButton();
- tabPageExternalTools = new System.Windows.Forms.TabPage();
- labelToolsDescription = new System.Windows.Forms.Label();
- buttonToolDelete = new System.Windows.Forms.Button();
- buttonToolAdd = new System.Windows.Forms.Button();
- buttonToolDown = new System.Windows.Forms.Button();
- buttonToolUp = new System.Windows.Forms.Button();
- listBoxTools = new System.Windows.Forms.CheckedListBox();
- groupBoxToolSettings = new System.Windows.Forms.GroupBox();
- labelWorkingDir = new System.Windows.Forms.Label();
- buttonWorkingDir = new System.Windows.Forms.Button();
- textBoxWorkingDir = new System.Windows.Forms.TextBox();
- buttonIcon = new System.Windows.Forms.Button();
- labelToolName = new System.Windows.Forms.Label();
- labelToolColumnizerForOutput = new System.Windows.Forms.Label();
- comboBoxColumnizer = new System.Windows.Forms.ComboBox();
- textBoxToolName = new System.Windows.Forms.TextBox();
- checkBoxSysout = new System.Windows.Forms.CheckBox();
- buttonArguments = new System.Windows.Forms.Button();
- labelTool = new System.Windows.Forms.Label();
- buttonTool = new System.Windows.Forms.Button();
- textBoxTool = new System.Windows.Forms.TextBox();
- labelArguments = new System.Windows.Forms.Label();
- textBoxArguments = new System.Windows.Forms.TextBox();
- tabPageColumnizers = new System.Windows.Forms.TabPage();
- checkBoxAutoPick = new System.Windows.Forms.CheckBox();
- checkBoxMaskPrio = new System.Windows.Forms.CheckBox();
- buttonDelete = new System.Windows.Forms.Button();
- dataGridViewColumnizer = new System.Windows.Forms.DataGridView();
- columnFileMask = new System.Windows.Forms.DataGridViewTextBoxColumn();
- columnColumnizer = new System.Windows.Forms.DataGridViewComboBoxColumn();
- tabPageHighlightMask = new System.Windows.Forms.TabPage();
- dataGridViewHighlightMask = new System.Windows.Forms.DataGridView();
- columnFileName = new System.Windows.Forms.DataGridViewTextBoxColumn();
- columnHighlightGroup = new System.Windows.Forms.DataGridViewComboBoxColumn();
- tabPageMultiFile = new System.Windows.Forms.TabPage();
- groupBoxDefaultFileNamePattern = new System.Windows.Forms.GroupBox();
- labelMaxDays = new System.Windows.Forms.Label();
- labelPattern = new System.Windows.Forms.Label();
- upDownMultifileDays = new System.Windows.Forms.NumericUpDown();
- textBoxMultifilePattern = new System.Windows.Forms.TextBox();
- labelHintMultiFile = new System.Windows.Forms.Label();
- labelNoteMultiFile = new System.Windows.Forms.Label();
- groupBoxWhenOpeningMultiFile = new System.Windows.Forms.GroupBox();
- radioButtonAskWhatToDo = new System.Windows.Forms.RadioButton();
- radioButtonTreatAllFilesAsOneMultifile = new System.Windows.Forms.RadioButton();
- radioButtonLoadEveryFileIntoSeperatedTab = new System.Windows.Forms.RadioButton();
- tabPagePlugins = new System.Windows.Forms.TabPage();
- groupBoxPlugins = new System.Windows.Forms.GroupBox();
- listBoxPlugin = new System.Windows.Forms.ListBox();
- groupBoxSettings = new System.Windows.Forms.GroupBox();
- panelPlugin = new System.Windows.Forms.Panel();
- buttonConfigPlugin = new System.Windows.Forms.Button();
- tabPageSessions = new System.Windows.Forms.TabPage();
- checkBoxPortableMode = new System.Windows.Forms.CheckBox();
- checkBoxSaveFilter = new System.Windows.Forms.CheckBox();
- groupBoxPersistantFileLocation = new System.Windows.Forms.GroupBox();
- labelSessionSaveOwnDir = new System.Windows.Forms.Label();
- buttonSessionSaveDir = new System.Windows.Forms.Button();
- radioButtonSessionSaveOwn = new System.Windows.Forms.RadioButton();
- radioButtonsessionSaveDocuments = new System.Windows.Forms.RadioButton();
- radioButtonSessionSameDir = new System.Windows.Forms.RadioButton();
- radioButtonSessionApplicationStartupDir = new System.Windows.Forms.RadioButton();
- checkBoxSaveSessions = new System.Windows.Forms.CheckBox();
- tabPageMemory = new System.Windows.Forms.TabPage();
- groupBoxCPUAndStuff = new System.Windows.Forms.GroupBox();
- checkBoxLegacyReader = new System.Windows.Forms.CheckBox();
- checkBoxMultiThread = new System.Windows.Forms.CheckBox();
- labelFilePollingInterval = new System.Windows.Forms.Label();
- upDownPollingInterval = new System.Windows.Forms.NumericUpDown();
- groupBoxLineBufferUsage = new System.Windows.Forms.GroupBox();
- labelInfo = new System.Windows.Forms.Label();
- labelNumberOfBlocks = new System.Windows.Forms.Label();
- upDownLinesPerBlock = new System.Windows.Forms.NumericUpDown();
- upDownBlockCount = new System.Windows.Forms.NumericUpDown();
- labelLinesPerBlock = new System.Windows.Forms.Label();
- buttonCancel = new System.Windows.Forms.Button();
- buttonOk = new System.Windows.Forms.Button();
- helpProvider = new System.Windows.Forms.HelpProvider();
- toolTip = new System.Windows.Forms.ToolTip(components);
- buttonExport = new System.Windows.Forms.Button();
- buttonImport = new System.Windows.Forms.Button();
- dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
- tabControlSettings.SuspendLayout();
- tabPageViewSettings.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumLineLength).BeginInit();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumFilterEntriesDisplayed).BeginInit();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumFilterEntries).BeginInit();
- groupBoxMisc.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)cpDownColumnWidth).BeginInit();
- groupBoxDefaults.SuspendLayout();
- groupBoxFont.SuspendLayout();
- tabPageTimeStampFeatures.SuspendLayout();
- groupBoxTimeSpreadDisplay.SuspendLayout();
- groupBoxDisplayMode.SuspendLayout();
- groupBoxTimeStampNavigationControl.SuspendLayout();
- groupBoxMouseDragDefaults.SuspendLayout();
- tabPageExternalTools.SuspendLayout();
- groupBoxToolSettings.SuspendLayout();
- tabPageColumnizers.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridViewColumnizer).BeginInit();
- tabPageHighlightMask.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridViewHighlightMask).BeginInit();
- tabPageMultiFile.SuspendLayout();
- groupBoxDefaultFileNamePattern.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)upDownMultifileDays).BeginInit();
- groupBoxWhenOpeningMultiFile.SuspendLayout();
- tabPagePlugins.SuspendLayout();
- groupBoxPlugins.SuspendLayout();
- groupBoxSettings.SuspendLayout();
- panelPlugin.SuspendLayout();
- tabPageSessions.SuspendLayout();
- groupBoxPersistantFileLocation.SuspendLayout();
- tabPageMemory.SuspendLayout();
- groupBoxCPUAndStuff.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)upDownPollingInterval).BeginInit();
- groupBoxLineBufferUsage.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)upDownLinesPerBlock).BeginInit();
- ((System.ComponentModel.ISupportInitialize)upDownBlockCount).BeginInit();
- SuspendLayout();
+ this.tabControlSettings = new System.Windows.Forms.TabControl();
+ this.tabPageViewSettings = new System.Windows.Forms.TabPage();
+ this.upDownMaximumFilterEntriesDisplayed = new System.Windows.Forms.NumericUpDown();
+ this.labelMaximumFilterEntriesDisplayed = new System.Windows.Forms.Label();
+ this.upDownMaximumFilterEntries = new System.Windows.Forms.NumericUpDown();
+ this.labelMaximumFilterEntries = new System.Windows.Forms.Label();
+ this.labelDefaultEncoding = new System.Windows.Forms.Label();
+ this.comboBoxEncoding = new System.Windows.Forms.ComboBox();
+ this.groupBoxMisc = new System.Windows.Forms.GroupBox();
+ this.cpDownColumnWidth = new System.Windows.Forms.NumericUpDown();
+ this.checkBoxColumnSize = new System.Windows.Forms.CheckBox();
+ this.buttonTailColor = new System.Windows.Forms.Button();
+ this.checkBoxTailState = new System.Windows.Forms.CheckBox();
+ this.checkBoxOpenLastFiles = new System.Windows.Forms.CheckBox();
+ this.checkBoxSingleInstance = new System.Windows.Forms.CheckBox();
+ this.checkBoxAskCloseTabs = new System.Windows.Forms.CheckBox();
+ this.groupBoxDefaults = new System.Windows.Forms.GroupBox();
+ this.checkBoxDarkMode = new System.Windows.Forms.CheckBox();
+ this.checkBoxFollowTail = new System.Windows.Forms.CheckBox();
+ this.checkBoxColumnFinder = new System.Windows.Forms.CheckBox();
+ this.checkBoxSyncFilter = new System.Windows.Forms.CheckBox();
+ this.checkBoxFilterTail = new System.Windows.Forms.CheckBox();
+ this.groupBoxFont = new System.Windows.Forms.GroupBox();
+ this.buttonChangeFont = new System.Windows.Forms.Button();
+ this.labelFont = new System.Windows.Forms.Label();
+ this.tabPageTimeStampFeatures = new System.Windows.Forms.TabPage();
+ this.groupBoxTimeSpreadDisplay = new System.Windows.Forms.GroupBox();
+ this.groupBoxDisplayMode = new System.Windows.Forms.GroupBox();
+ this.radioButtonLineView = new System.Windows.Forms.RadioButton();
+ this.radioButtonTimeView = new System.Windows.Forms.RadioButton();
+ this.checkBoxReverseAlpha = new System.Windows.Forms.CheckBox();
+ this.buttonTimespreadColor = new System.Windows.Forms.Button();
+ this.checkBoxTimeSpread = new System.Windows.Forms.CheckBox();
+ this.groupBoxTimeStampNavigationControl = new System.Windows.Forms.GroupBox();
+ this.checkBoxTimestamp = new System.Windows.Forms.CheckBox();
+ this.groupBoxMouseDragDefaults = new System.Windows.Forms.GroupBox();
+ this.radioButtonVerticalMouseDragInverted = new System.Windows.Forms.RadioButton();
+ this.radioButtonHorizMouseDrag = new System.Windows.Forms.RadioButton();
+ this.radioButtonVerticalMouseDrag = new System.Windows.Forms.RadioButton();
+ this.tabPageExternalTools = new System.Windows.Forms.TabPage();
+ this.labelToolsDescription = new System.Windows.Forms.Label();
+ this.buttonToolDelete = new System.Windows.Forms.Button();
+ this.buttonToolAdd = new System.Windows.Forms.Button();
+ this.buttonToolDown = new System.Windows.Forms.Button();
+ this.buttonToolUp = new System.Windows.Forms.Button();
+ this.listBoxTools = new System.Windows.Forms.CheckedListBox();
+ this.groupBoxToolSettings = new System.Windows.Forms.GroupBox();
+ this.labelWorkingDir = new System.Windows.Forms.Label();
+ this.buttonWorkingDir = new System.Windows.Forms.Button();
+ this.textBoxWorkingDir = new System.Windows.Forms.TextBox();
+ this.buttonIcon = new System.Windows.Forms.Button();
+ this.labelToolName = new System.Windows.Forms.Label();
+ this.labelToolColumnizerForOutput = new System.Windows.Forms.Label();
+ this.comboBoxColumnizer = new System.Windows.Forms.ComboBox();
+ this.textBoxToolName = new System.Windows.Forms.TextBox();
+ this.checkBoxSysout = new System.Windows.Forms.CheckBox();
+ this.buttonArguments = new System.Windows.Forms.Button();
+ this.labelTool = new System.Windows.Forms.Label();
+ this.buttonTool = new System.Windows.Forms.Button();
+ this.textBoxTool = new System.Windows.Forms.TextBox();
+ this.labelArguments = new System.Windows.Forms.Label();
+ this.textBoxArguments = new System.Windows.Forms.TextBox();
+ this.tabPageColumnizers = new System.Windows.Forms.TabPage();
+ this.checkBoxAutoPick = new System.Windows.Forms.CheckBox();
+ this.checkBoxMaskPrio = new System.Windows.Forms.CheckBox();
+ this.buttonDelete = new System.Windows.Forms.Button();
+ this.dataGridViewColumnizer = new System.Windows.Forms.DataGridView();
+ this.columnFileMask = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.columnColumnizer = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.tabPageHighlightMask = new System.Windows.Forms.TabPage();
+ this.dataGridViewHighlightMask = new System.Windows.Forms.DataGridView();
+ this.columnFileName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.columnHighlightGroup = new System.Windows.Forms.DataGridViewComboBoxColumn();
+ this.tabPageMultiFile = new System.Windows.Forms.TabPage();
+ this.groupBoxDefaultFileNamePattern = new System.Windows.Forms.GroupBox();
+ this.labelMaxDays = new System.Windows.Forms.Label();
+ this.labelPattern = new System.Windows.Forms.Label();
+ this.upDownMultifileDays = new System.Windows.Forms.NumericUpDown();
+ this.textBoxMultifilePattern = new System.Windows.Forms.TextBox();
+ this.labelHintMultiFile = new System.Windows.Forms.Label();
+ this.labelNoteMultiFile = new System.Windows.Forms.Label();
+ this.groupBoxWhenOpeningMultiFile = new System.Windows.Forms.GroupBox();
+ this.radioButtonAskWhatToDo = new System.Windows.Forms.RadioButton();
+ this.radioButtonTreatAllFilesAsOneMultifile = new System.Windows.Forms.RadioButton();
+ this.radioButtonLoadEveryFileIntoSeperatedTab = new System.Windows.Forms.RadioButton();
+ this.tabPagePlugins = new System.Windows.Forms.TabPage();
+ this.groupBoxPlugins = new System.Windows.Forms.GroupBox();
+ this.listBoxPlugin = new System.Windows.Forms.ListBox();
+ this.groupBoxSettings = new System.Windows.Forms.GroupBox();
+ this.panelPlugin = new System.Windows.Forms.Panel();
+ this.buttonConfigPlugin = new System.Windows.Forms.Button();
+ this.tabPageSessions = new System.Windows.Forms.TabPage();
+ this.checkBoxPortableMode = new System.Windows.Forms.CheckBox();
+ this.checkBoxSaveFilter = new System.Windows.Forms.CheckBox();
+ this.groupBoxPersistantFileLocation = new System.Windows.Forms.GroupBox();
+ this.labelSessionSaveOwnDir = new System.Windows.Forms.Label();
+ this.buttonSessionSaveDir = new System.Windows.Forms.Button();
+ this.radioButtonSessionSaveOwn = new System.Windows.Forms.RadioButton();
+ this.radioButtonsessionSaveDocuments = new System.Windows.Forms.RadioButton();
+ this.radioButtonSessionSameDir = new System.Windows.Forms.RadioButton();
+ this.radioButtonSessionApplicationStartupDir = new System.Windows.Forms.RadioButton();
+ this.checkBoxSaveSessions = new System.Windows.Forms.CheckBox();
+ this.tabPageMemory = new System.Windows.Forms.TabPage();
+ this.groupBoxCPUAndStuff = new System.Windows.Forms.GroupBox();
+ this.checkBoxLegacyReader = new System.Windows.Forms.CheckBox();
+ this.checkBoxMultiThread = new System.Windows.Forms.CheckBox();
+ this.labelFilePollingInterval = new System.Windows.Forms.Label();
+ this.upDownPollingInterval = new System.Windows.Forms.NumericUpDown();
+ this.groupBoxLineBufferUsage = new System.Windows.Forms.GroupBox();
+ this.labelInfo = new System.Windows.Forms.Label();
+ this.labelNumberOfBlocks = new System.Windows.Forms.Label();
+ this.upDownLinesPerBlock = new System.Windows.Forms.NumericUpDown();
+ this.upDownBlockCount = new System.Windows.Forms.NumericUpDown();
+ this.labelLinesPerBlock = new System.Windows.Forms.Label();
+ this.buttonCancel = new System.Windows.Forms.Button();
+ this.buttonOk = new System.Windows.Forms.Button();
+ this.helpProvider = new System.Windows.Forms.HelpProvider();
+ this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+ this.buttonExport = new System.Windows.Forms.Button();
+ this.buttonImport = new System.Windows.Forms.Button();
+ this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.checkBoxShowErrorMessageOnlyOneInstance = new System.Windows.Forms.CheckBox();
+ this.tabControlSettings.SuspendLayout();
+ this.tabPageViewSettings.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMaximumFilterEntriesDisplayed)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMaximumFilterEntries)).BeginInit();
+ this.groupBoxMisc.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.cpDownColumnWidth)).BeginInit();
+ this.groupBoxDefaults.SuspendLayout();
+ this.groupBoxFont.SuspendLayout();
+ this.tabPageTimeStampFeatures.SuspendLayout();
+ this.groupBoxTimeSpreadDisplay.SuspendLayout();
+ this.groupBoxDisplayMode.SuspendLayout();
+ this.groupBoxTimeStampNavigationControl.SuspendLayout();
+ this.groupBoxMouseDragDefaults.SuspendLayout();
+ this.tabPageExternalTools.SuspendLayout();
+ this.groupBoxToolSettings.SuspendLayout();
+ this.tabPageColumnizers.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridViewColumnizer)).BeginInit();
+ this.tabPageHighlightMask.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridViewHighlightMask)).BeginInit();
+ this.tabPageMultiFile.SuspendLayout();
+ this.groupBoxDefaultFileNamePattern.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMultifileDays)).BeginInit();
+ this.groupBoxWhenOpeningMultiFile.SuspendLayout();
+ this.tabPagePlugins.SuspendLayout();
+ this.groupBoxPlugins.SuspendLayout();
+ this.groupBoxSettings.SuspendLayout();
+ this.panelPlugin.SuspendLayout();
+ this.tabPageSessions.SuspendLayout();
+ this.groupBoxPersistantFileLocation.SuspendLayout();
+ this.tabPageMemory.SuspendLayout();
+ this.groupBoxCPUAndStuff.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownPollingInterval)).BeginInit();
+ this.groupBoxLineBufferUsage.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownLinesPerBlock)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownBlockCount)).BeginInit();
+ this.SuspendLayout();
//
// tabControlSettings
//
- tabControlSettings.Controls.Add(tabPageViewSettings);
- tabControlSettings.Controls.Add(tabPageTimeStampFeatures);
- tabControlSettings.Controls.Add(tabPageExternalTools);
- tabControlSettings.Controls.Add(tabPageColumnizers);
- tabControlSettings.Controls.Add(tabPageHighlightMask);
- tabControlSettings.Controls.Add(tabPageMultiFile);
- tabControlSettings.Controls.Add(tabPagePlugins);
- tabControlSettings.Controls.Add(tabPageSessions);
- tabControlSettings.Controls.Add(tabPageMemory);
- tabControlSettings.Location = new System.Drawing.Point(2, 3);
- tabControlSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabControlSettings.Name = "tabControlSettings";
- tabControlSettings.SelectedIndex = 0;
- tabControlSettings.Size = new System.Drawing.Size(950, 468);
- tabControlSettings.TabIndex = 0;
+ this.tabControlSettings.Controls.Add(this.tabPageViewSettings);
+ this.tabControlSettings.Controls.Add(this.tabPageTimeStampFeatures);
+ this.tabControlSettings.Controls.Add(this.tabPageExternalTools);
+ this.tabControlSettings.Controls.Add(this.tabPageColumnizers);
+ this.tabControlSettings.Controls.Add(this.tabPageHighlightMask);
+ this.tabControlSettings.Controls.Add(this.tabPageMultiFile);
+ this.tabControlSettings.Controls.Add(this.tabPagePlugins);
+ this.tabControlSettings.Controls.Add(this.tabPageSessions);
+ this.tabControlSettings.Controls.Add(this.tabPageMemory);
+ this.tabControlSettings.Location = new System.Drawing.Point(2, 3);
+ this.tabControlSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabControlSettings.Name = "tabControlSettings";
+ this.tabControlSettings.SelectedIndex = 0;
+ this.tabControlSettings.Size = new System.Drawing.Size(950, 468);
+ this.tabControlSettings.TabIndex = 0;
//
// tabPageViewSettings
//
- tabPageViewSettings.Controls.Add(labelWarningMaximumLineLenght);
- tabPageViewSettings.Controls.Add(upDownMaximumLineLength);
- tabPageViewSettings.Controls.Add(labelMaximumLineLength);
- tabPageViewSettings.Controls.Add(upDownMaximumFilterEntriesDisplayed);
- tabPageViewSettings.Controls.Add(labelMaximumFilterEntriesDisplayed);
- tabPageViewSettings.Controls.Add(upDownMaximumFilterEntries);
- tabPageViewSettings.Controls.Add(labelMaximumFilterEntries);
- tabPageViewSettings.Controls.Add(labelDefaultEncoding);
- tabPageViewSettings.Controls.Add(comboBoxEncoding);
- tabPageViewSettings.Controls.Add(groupBoxMisc);
- tabPageViewSettings.Controls.Add(groupBoxDefaults);
- tabPageViewSettings.Controls.Add(groupBoxFont);
- tabPageViewSettings.Location = new System.Drawing.Point(4, 24);
- tabPageViewSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageViewSettings.Name = "tabPageViewSettings";
- tabPageViewSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageViewSettings.Size = new System.Drawing.Size(942, 440);
- tabPageViewSettings.TabIndex = 0;
- tabPageViewSettings.Text = "View settings";
- tabPageViewSettings.UseVisualStyleBackColor = true;
- //
- // labelWarningMaximumLineLenght
- //
- labelWarningMaximumLineLenght.AutoSize = true;
- labelWarningMaximumLineLenght.Location = new System.Drawing.Point(446, 118);
- labelWarningMaximumLineLenght.Name = "labelWarningMaximumLineLenght";
- labelWarningMaximumLineLenght.Size = new System.Drawing.Size(483, 15);
- labelWarningMaximumLineLenght.TabIndex = 16;
- labelWarningMaximumLineLenght.Text = "! Changing the Maximum Line Length can impact performance and is not recommended !";
- //
- // upDownMaximumLineLength
- //
- upDownMaximumLineLength.Location = new System.Drawing.Point(762, 138);
- upDownMaximumLineLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownMaximumLineLength.Maximum = new decimal(new int[] { 1000000, 0, 0, 0 });
- upDownMaximumLineLength.Minimum = new decimal(new int[] { 20000, 0, 0, 0 });
- upDownMaximumLineLength.Name = "upDownMaximumLineLength";
- upDownMaximumLineLength.Size = new System.Drawing.Size(106, 23);
- upDownMaximumLineLength.TabIndex = 15;
- upDownMaximumLineLength.Value = new decimal(new int[] { 20000, 0, 0, 0 });
- //
- // labelMaximumLineLength
- //
- labelMaximumLineLength.AutoSize = true;
- labelMaximumLineLength.Location = new System.Drawing.Point(467, 140);
- labelMaximumLineLength.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelMaximumLineLength.Name = "labelMaximumLineLength";
- labelMaximumLineLength.Size = new System.Drawing.Size(218, 15);
- labelMaximumLineLength.TabIndex = 14;
- labelMaximumLineLength.Text = "Maximum Line Length (restart required)";
+ this.tabPageViewSettings.Controls.Add(this.upDownMaximumFilterEntriesDisplayed);
+ this.tabPageViewSettings.Controls.Add(this.labelMaximumFilterEntriesDisplayed);
+ this.tabPageViewSettings.Controls.Add(this.upDownMaximumFilterEntries);
+ this.tabPageViewSettings.Controls.Add(this.labelMaximumFilterEntries);
+ this.tabPageViewSettings.Controls.Add(this.labelDefaultEncoding);
+ this.tabPageViewSettings.Controls.Add(this.comboBoxEncoding);
+ this.tabPageViewSettings.Controls.Add(this.groupBoxMisc);
+ this.tabPageViewSettings.Controls.Add(this.groupBoxDefaults);
+ this.tabPageViewSettings.Controls.Add(this.groupBoxFont);
+ this.tabPageViewSettings.Location = new System.Drawing.Point(4, 29);
+ this.tabPageViewSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageViewSettings.Name = "tabPageViewSettings";
+ this.tabPageViewSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageViewSettings.Size = new System.Drawing.Size(942, 435);
+ this.tabPageViewSettings.TabIndex = 0;
+ this.tabPageViewSettings.Text = "View settings";
+ this.tabPageViewSettings.UseVisualStyleBackColor = true;
//
// upDownMaximumFilterEntriesDisplayed
//
- upDownMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(762, 86);
- upDownMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownMaximumFilterEntriesDisplayed.Maximum = new decimal(new int[] { 30, 0, 0, 0 });
- upDownMaximumFilterEntriesDisplayed.Minimum = new decimal(new int[] { 10, 0, 0, 0 });
- upDownMaximumFilterEntriesDisplayed.Name = "upDownMaximumFilterEntriesDisplayed";
- upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(106, 23);
- upDownMaximumFilterEntriesDisplayed.TabIndex = 13;
- upDownMaximumFilterEntriesDisplayed.Value = new decimal(new int[] { 20, 0, 0, 0 });
+ this.upDownMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(762, 114);
+ this.upDownMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownMaximumFilterEntriesDisplayed.Maximum = new decimal(new int[] {
+ 30,
+ 0,
+ 0,
+ 0});
+ this.upDownMaximumFilterEntriesDisplayed.Minimum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.upDownMaximumFilterEntriesDisplayed.Name = "upDownMaximumFilterEntriesDisplayed";
+ this.upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(106, 26);
+ this.upDownMaximumFilterEntriesDisplayed.TabIndex = 13;
+ this.upDownMaximumFilterEntriesDisplayed.Value = new decimal(new int[] {
+ 20,
+ 0,
+ 0,
+ 0});
//
// labelMaximumFilterEntriesDisplayed
//
- labelMaximumFilterEntriesDisplayed.AutoSize = true;
- labelMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(467, 88);
- labelMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelMaximumFilterEntriesDisplayed.Name = "labelMaximumFilterEntriesDisplayed";
- labelMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(180, 15);
- labelMaximumFilterEntriesDisplayed.TabIndex = 12;
- labelMaximumFilterEntriesDisplayed.Text = "Maximum filter entries displayed";
+ this.labelMaximumFilterEntriesDisplayed.AutoSize = true;
+ this.labelMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(462, 117);
+ this.labelMaximumFilterEntriesDisplayed.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelMaximumFilterEntriesDisplayed.Name = "labelMaximumFilterEntriesDisplayed";
+ this.labelMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(232, 20);
+ this.labelMaximumFilterEntriesDisplayed.TabIndex = 12;
+ this.labelMaximumFilterEntriesDisplayed.Text = "Maximum filter entries displayed";
//
// upDownMaximumFilterEntries
//
- upDownMaximumFilterEntries.Location = new System.Drawing.Point(762, 59);
- upDownMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownMaximumFilterEntries.Minimum = new decimal(new int[] { 10, 0, 0, 0 });
- upDownMaximumFilterEntries.Name = "upDownMaximumFilterEntries";
- upDownMaximumFilterEntries.Size = new System.Drawing.Size(106, 23);
- upDownMaximumFilterEntries.TabIndex = 11;
- upDownMaximumFilterEntries.Value = new decimal(new int[] { 30, 0, 0, 0 });
+ this.upDownMaximumFilterEntries.Location = new System.Drawing.Point(762, 71);
+ this.upDownMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownMaximumFilterEntries.Minimum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.upDownMaximumFilterEntries.Name = "upDownMaximumFilterEntries";
+ this.upDownMaximumFilterEntries.Size = new System.Drawing.Size(106, 26);
+ this.upDownMaximumFilterEntries.TabIndex = 11;
+ this.upDownMaximumFilterEntries.Value = new decimal(new int[] {
+ 30,
+ 0,
+ 0,
+ 0});
//
// labelMaximumFilterEntries
//
- labelMaximumFilterEntries.AutoSize = true;
- labelMaximumFilterEntries.Location = new System.Drawing.Point(467, 61);
- labelMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelMaximumFilterEntries.Name = "labelMaximumFilterEntries";
- labelMaximumFilterEntries.Size = new System.Drawing.Size(127, 15);
- labelMaximumFilterEntries.TabIndex = 10;
- labelMaximumFilterEntries.Text = "Maximum filter entries";
+ this.labelMaximumFilterEntries.AutoSize = true;
+ this.labelMaximumFilterEntries.Location = new System.Drawing.Point(462, 74);
+ this.labelMaximumFilterEntries.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelMaximumFilterEntries.Name = "labelMaximumFilterEntries";
+ this.labelMaximumFilterEntries.Size = new System.Drawing.Size(162, 20);
+ this.labelMaximumFilterEntries.TabIndex = 10;
+ this.labelMaximumFilterEntries.Text = "Maximum filter entries";
//
// labelDefaultEncoding
//
- labelDefaultEncoding.AutoSize = true;
- labelDefaultEncoding.Location = new System.Drawing.Point(467, 34);
- labelDefaultEncoding.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelDefaultEncoding.Name = "labelDefaultEncoding";
- labelDefaultEncoding.Size = new System.Drawing.Size(98, 15);
- labelDefaultEncoding.TabIndex = 9;
- labelDefaultEncoding.Text = "Default encoding";
+ this.labelDefaultEncoding.AutoSize = true;
+ this.labelDefaultEncoding.Location = new System.Drawing.Point(462, 34);
+ this.labelDefaultEncoding.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelDefaultEncoding.Name = "labelDefaultEncoding";
+ this.labelDefaultEncoding.Size = new System.Drawing.Size(130, 20);
+ this.labelDefaultEncoding.TabIndex = 9;
+ this.labelDefaultEncoding.Text = "Default encoding";
//
// comboBoxEncoding
//
- comboBoxEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
- comboBoxEncoding.FormattingEnabled = true;
- comboBoxEncoding.Location = new System.Drawing.Point(691, 26);
- comboBoxEncoding.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- comboBoxEncoding.Name = "comboBoxEncoding";
- comboBoxEncoding.Size = new System.Drawing.Size(177, 23);
- comboBoxEncoding.TabIndex = 8;
- toolTip.SetToolTip(comboBoxEncoding, "Encoding to be used when no BOM header and no persistence data is available.");
+ this.comboBoxEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ this.comboBoxEncoding.FormattingEnabled = true;
+ this.comboBoxEncoding.Location = new System.Drawing.Point(688, 29);
+ this.comboBoxEncoding.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.comboBoxEncoding.Name = "comboBoxEncoding";
+ this.comboBoxEncoding.Size = new System.Drawing.Size(177, 28);
+ this.comboBoxEncoding.TabIndex = 8;
+ this.toolTip.SetToolTip(this.comboBoxEncoding, "Encoding to be used when no BOM header and no persistence data is available.");
//
// groupBoxMisc
//
- groupBoxMisc.Controls.Add(checkBoxShowErrorMessageOnlyOneInstance);
- groupBoxMisc.Controls.Add(cpDownColumnWidth);
- groupBoxMisc.Controls.Add(checkBoxColumnSize);
- groupBoxMisc.Controls.Add(buttonTailColor);
- groupBoxMisc.Controls.Add(checkBoxTailState);
- groupBoxMisc.Controls.Add(checkBoxOpenLastFiles);
- groupBoxMisc.Controls.Add(checkBoxSingleInstance);
- groupBoxMisc.Controls.Add(checkBoxAskCloseTabs);
- groupBoxMisc.Location = new System.Drawing.Point(458, 171);
- groupBoxMisc.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxMisc.Name = "groupBoxMisc";
- groupBoxMisc.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxMisc.Size = new System.Drawing.Size(410, 226);
- groupBoxMisc.TabIndex = 7;
- groupBoxMisc.TabStop = false;
- groupBoxMisc.Text = "Misc";
- //
- // checkBoxShowErrorMessageOnlyOneInstance
- //
- checkBoxShowErrorMessageOnlyOneInstance.AutoSize = true;
- checkBoxShowErrorMessageOnlyOneInstance.Location = new System.Drawing.Point(210, 66);
- checkBoxShowErrorMessageOnlyOneInstance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxShowErrorMessageOnlyOneInstance.Name = "checkBoxShowErrorMessageOnlyOneInstance";
- checkBoxShowErrorMessageOnlyOneInstance.Size = new System.Drawing.Size(137, 19);
- checkBoxShowErrorMessageOnlyOneInstance.TabIndex = 7;
- checkBoxShowErrorMessageOnlyOneInstance.Text = "Show Error Message?";
- checkBoxShowErrorMessageOnlyOneInstance.UseVisualStyleBackColor = true;
+ this.groupBoxMisc.Controls.Add(this.checkBoxShowErrorMessageOnlyOneInstance);
+ this.groupBoxMisc.Controls.Add(this.cpDownColumnWidth);
+ this.groupBoxMisc.Controls.Add(this.checkBoxColumnSize);
+ this.groupBoxMisc.Controls.Add(this.buttonTailColor);
+ this.groupBoxMisc.Controls.Add(this.checkBoxTailState);
+ this.groupBoxMisc.Controls.Add(this.checkBoxOpenLastFiles);
+ this.groupBoxMisc.Controls.Add(this.checkBoxSingleInstance);
+ this.groupBoxMisc.Controls.Add(this.checkBoxAskCloseTabs);
+ this.groupBoxMisc.Location = new System.Drawing.Point(458, 171);
+ this.groupBoxMisc.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxMisc.Name = "groupBoxMisc";
+ this.groupBoxMisc.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxMisc.Size = new System.Drawing.Size(410, 226);
+ this.groupBoxMisc.TabIndex = 7;
+ this.groupBoxMisc.TabStop = false;
+ this.groupBoxMisc.Text = "Misc";
//
// cpDownColumnWidth
//
- cpDownColumnWidth.Location = new System.Drawing.Point(304, 175);
- cpDownColumnWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- cpDownColumnWidth.Maximum = new decimal(new int[] { 9000, 0, 0, 0 });
- cpDownColumnWidth.Minimum = new decimal(new int[] { 300, 0, 0, 0 });
- cpDownColumnWidth.Name = "cpDownColumnWidth";
- cpDownColumnWidth.Size = new System.Drawing.Size(84, 23);
- cpDownColumnWidth.TabIndex = 6;
- cpDownColumnWidth.Value = new decimal(new int[] { 2000, 0, 0, 0 });
+ this.cpDownColumnWidth.Location = new System.Drawing.Point(304, 175);
+ this.cpDownColumnWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.cpDownColumnWidth.Maximum = new decimal(new int[] {
+ 9000,
+ 0,
+ 0,
+ 0});
+ this.cpDownColumnWidth.Minimum = new decimal(new int[] {
+ 300,
+ 0,
+ 0,
+ 0});
+ this.cpDownColumnWidth.Name = "cpDownColumnWidth";
+ this.cpDownColumnWidth.Size = new System.Drawing.Size(84, 26);
+ this.cpDownColumnWidth.TabIndex = 6;
+ this.cpDownColumnWidth.Value = new decimal(new int[] {
+ 2000,
+ 0,
+ 0,
+ 0});
//
// checkBoxColumnSize
//
- checkBoxColumnSize.AutoSize = true;
- checkBoxColumnSize.Location = new System.Drawing.Point(9, 177);
- checkBoxColumnSize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxColumnSize.Name = "checkBoxColumnSize";
- checkBoxColumnSize.Size = new System.Drawing.Size(140, 19);
- checkBoxColumnSize.TabIndex = 5;
- checkBoxColumnSize.Text = "Set last column width";
- checkBoxColumnSize.UseVisualStyleBackColor = true;
- checkBoxColumnSize.CheckedChanged += OnChkBoxColumnSizeCheckedChanged;
+ this.checkBoxColumnSize.AutoSize = true;
+ this.checkBoxColumnSize.Location = new System.Drawing.Point(9, 177);
+ this.checkBoxColumnSize.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxColumnSize.Name = "checkBoxColumnSize";
+ this.checkBoxColumnSize.Size = new System.Drawing.Size(185, 24);
+ this.checkBoxColumnSize.TabIndex = 5;
+ this.checkBoxColumnSize.Text = "Set last column width";
+ this.checkBoxColumnSize.UseVisualStyleBackColor = true;
+ this.checkBoxColumnSize.CheckedChanged += new System.EventHandler(this.OnChkBoxColumnSizeCheckedChanged);
//
// buttonTailColor
//
- buttonTailColor.Location = new System.Drawing.Point(304, 135);
- buttonTailColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonTailColor.Name = "buttonTailColor";
- buttonTailColor.Size = new System.Drawing.Size(84, 32);
- buttonTailColor.TabIndex = 4;
- buttonTailColor.Text = "Color...";
- buttonTailColor.UseVisualStyleBackColor = true;
- buttonTailColor.Click += OnBtnTailColorClick;
+ this.buttonTailColor.Location = new System.Drawing.Point(304, 135);
+ this.buttonTailColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonTailColor.Name = "buttonTailColor";
+ this.buttonTailColor.Size = new System.Drawing.Size(84, 32);
+ this.buttonTailColor.TabIndex = 4;
+ this.buttonTailColor.Text = "Color...";
+ this.buttonTailColor.UseVisualStyleBackColor = true;
+ this.buttonTailColor.Click += new System.EventHandler(this.OnBtnTailColorClick);
//
// checkBoxTailState
//
- checkBoxTailState.AutoSize = true;
- checkBoxTailState.Location = new System.Drawing.Point(9, 140);
- checkBoxTailState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxTailState.Name = "checkBoxTailState";
- checkBoxTailState.Size = new System.Drawing.Size(144, 19);
- checkBoxTailState.TabIndex = 3;
- checkBoxTailState.Text = "Show tail state on tabs";
- checkBoxTailState.UseVisualStyleBackColor = true;
+ this.checkBoxTailState.AutoSize = true;
+ this.checkBoxTailState.Location = new System.Drawing.Point(9, 140);
+ this.checkBoxTailState.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxTailState.Name = "checkBoxTailState";
+ this.checkBoxTailState.Size = new System.Drawing.Size(196, 24);
+ this.checkBoxTailState.TabIndex = 3;
+ this.checkBoxTailState.Text = "Show tail state on tabs";
+ this.checkBoxTailState.UseVisualStyleBackColor = true;
//
// checkBoxOpenLastFiles
//
- checkBoxOpenLastFiles.AutoSize = true;
- checkBoxOpenLastFiles.Location = new System.Drawing.Point(9, 103);
- checkBoxOpenLastFiles.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxOpenLastFiles.Name = "checkBoxOpenLastFiles";
- checkBoxOpenLastFiles.Size = new System.Drawing.Size(144, 19);
- checkBoxOpenLastFiles.TabIndex = 2;
- checkBoxOpenLastFiles.Text = "Re-open last used files";
- checkBoxOpenLastFiles.UseVisualStyleBackColor = true;
+ this.checkBoxOpenLastFiles.AutoSize = true;
+ this.checkBoxOpenLastFiles.Location = new System.Drawing.Point(9, 103);
+ this.checkBoxOpenLastFiles.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxOpenLastFiles.Name = "checkBoxOpenLastFiles";
+ this.checkBoxOpenLastFiles.Size = new System.Drawing.Size(197, 24);
+ this.checkBoxOpenLastFiles.TabIndex = 2;
+ this.checkBoxOpenLastFiles.Text = "Re-open last used files";
+ this.checkBoxOpenLastFiles.UseVisualStyleBackColor = true;
//
// checkBoxSingleInstance
//
- checkBoxSingleInstance.AutoSize = true;
- checkBoxSingleInstance.Location = new System.Drawing.Point(9, 66);
- checkBoxSingleInstance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxSingleInstance.Name = "checkBoxSingleInstance";
- checkBoxSingleInstance.Size = new System.Drawing.Size(138, 19);
- checkBoxSingleInstance.TabIndex = 1;
- checkBoxSingleInstance.Text = "Allow only 1 Instance";
- checkBoxSingleInstance.UseVisualStyleBackColor = true;
+ this.checkBoxSingleInstance.AutoSize = true;
+ this.checkBoxSingleInstance.Location = new System.Drawing.Point(9, 66);
+ this.checkBoxSingleInstance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxSingleInstance.Name = "checkBoxSingleInstance";
+ this.checkBoxSingleInstance.Size = new System.Drawing.Size(183, 24);
+ this.checkBoxSingleInstance.TabIndex = 1;
+ this.checkBoxSingleInstance.Text = "Allow only 1 Instance";
+ this.checkBoxSingleInstance.UseVisualStyleBackColor = true;
//
// checkBoxAskCloseTabs
//
- checkBoxAskCloseTabs.AutoSize = true;
- checkBoxAskCloseTabs.Location = new System.Drawing.Point(9, 29);
- checkBoxAskCloseTabs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxAskCloseTabs.Name = "checkBoxAskCloseTabs";
- checkBoxAskCloseTabs.Size = new System.Drawing.Size(148, 19);
- checkBoxAskCloseTabs.TabIndex = 0;
- checkBoxAskCloseTabs.Text = "Ask before closing tabs";
- checkBoxAskCloseTabs.UseVisualStyleBackColor = true;
+ this.checkBoxAskCloseTabs.AutoSize = true;
+ this.checkBoxAskCloseTabs.Location = new System.Drawing.Point(9, 29);
+ this.checkBoxAskCloseTabs.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxAskCloseTabs.Name = "checkBoxAskCloseTabs";
+ this.checkBoxAskCloseTabs.Size = new System.Drawing.Size(200, 24);
+ this.checkBoxAskCloseTabs.TabIndex = 0;
+ this.checkBoxAskCloseTabs.Text = "Ask before closing tabs";
+ this.checkBoxAskCloseTabs.UseVisualStyleBackColor = true;
//
// groupBoxDefaults
//
- groupBoxDefaults.Controls.Add(checkBoxDarkMode);
- groupBoxDefaults.Controls.Add(checkBoxFollowTail);
- groupBoxDefaults.Controls.Add(checkBoxColumnFinder);
- groupBoxDefaults.Controls.Add(checkBoxSyncFilter);
- groupBoxDefaults.Controls.Add(checkBoxFilterTail);
- groupBoxDefaults.Location = new System.Drawing.Point(10, 171);
- groupBoxDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDefaults.Name = "groupBoxDefaults";
- groupBoxDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDefaults.Size = new System.Drawing.Size(411, 226);
- groupBoxDefaults.TabIndex = 6;
- groupBoxDefaults.TabStop = false;
- groupBoxDefaults.Text = "Defaults";
+ this.groupBoxDefaults.Controls.Add(this.checkBoxDarkMode);
+ this.groupBoxDefaults.Controls.Add(this.checkBoxFollowTail);
+ this.groupBoxDefaults.Controls.Add(this.checkBoxColumnFinder);
+ this.groupBoxDefaults.Controls.Add(this.checkBoxSyncFilter);
+ this.groupBoxDefaults.Controls.Add(this.checkBoxFilterTail);
+ this.groupBoxDefaults.Location = new System.Drawing.Point(10, 171);
+ this.groupBoxDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDefaults.Name = "groupBoxDefaults";
+ this.groupBoxDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDefaults.Size = new System.Drawing.Size(411, 226);
+ this.groupBoxDefaults.TabIndex = 6;
+ this.groupBoxDefaults.TabStop = false;
+ this.groupBoxDefaults.Text = "Defaults";
//
// checkBoxDarkMode
//
- checkBoxDarkMode.AutoSize = true;
- checkBoxDarkMode.Location = new System.Drawing.Point(7, 141);
- checkBoxDarkMode.Margin = new System.Windows.Forms.Padding(4);
- checkBoxDarkMode.Name = "checkBoxDarkMode";
- checkBoxDarkMode.Size = new System.Drawing.Size(175, 19);
- checkBoxDarkMode.TabIndex = 6;
- checkBoxDarkMode.Text = "Dark Mode (restart required)";
- checkBoxDarkMode.UseVisualStyleBackColor = true;
+ this.checkBoxDarkMode.AutoSize = true;
+ this.checkBoxDarkMode.Location = new System.Drawing.Point(7, 141);
+ this.checkBoxDarkMode.Margin = new System.Windows.Forms.Padding(4);
+ this.checkBoxDarkMode.Name = "checkBoxDarkMode";
+ this.checkBoxDarkMode.Size = new System.Drawing.Size(374, 26);
+ this.checkBoxDarkMode.TabIndex = 6;
+ this.checkBoxDarkMode.Text = "Dark Mode (restart required)";
+ this.checkBoxDarkMode.UseVisualStyleBackColor = true;
//
// checkBoxFollowTail
//
- checkBoxFollowTail.AutoSize = true;
- checkBoxFollowTail.Location = new System.Drawing.Point(9, 29);
- checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxFollowTail.Name = "checkBoxFollowTail";
- checkBoxFollowTail.Size = new System.Drawing.Size(125, 19);
- checkBoxFollowTail.TabIndex = 3;
- checkBoxFollowTail.Text = "Follow tail enabled";
- checkBoxFollowTail.UseVisualStyleBackColor = true;
+ this.checkBoxFollowTail.AutoSize = true;
+ this.checkBoxFollowTail.Location = new System.Drawing.Point(9, 29);
+ this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxFollowTail.Name = "checkBoxFollowTail";
+ this.checkBoxFollowTail.Size = new System.Drawing.Size(165, 24);
+ this.checkBoxFollowTail.TabIndex = 3;
+ this.checkBoxFollowTail.Text = "Follow tail enabled";
+ this.checkBoxFollowTail.UseVisualStyleBackColor = true;
//
// checkBoxColumnFinder
//
- checkBoxColumnFinder.AutoSize = true;
- checkBoxColumnFinder.Location = new System.Drawing.Point(9, 140);
- checkBoxColumnFinder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxColumnFinder.Name = "checkBoxColumnFinder";
- checkBoxColumnFinder.Size = new System.Drawing.Size(133, 19);
- checkBoxColumnFinder.TabIndex = 5;
- checkBoxColumnFinder.Text = "Show column finder";
- checkBoxColumnFinder.UseVisualStyleBackColor = true;
+ this.checkBoxColumnFinder.AutoSize = true;
+ this.checkBoxColumnFinder.Location = new System.Drawing.Point(9, 140);
+ this.checkBoxColumnFinder.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxColumnFinder.Name = "checkBoxColumnFinder";
+ this.checkBoxColumnFinder.Size = new System.Drawing.Size(174, 24);
+ this.checkBoxColumnFinder.TabIndex = 5;
+ this.checkBoxColumnFinder.Text = "Show column finder";
+ this.checkBoxColumnFinder.UseVisualStyleBackColor = true;
//
// checkBoxSyncFilter
//
- checkBoxSyncFilter.AutoSize = true;
- checkBoxSyncFilter.Location = new System.Drawing.Point(9, 103);
- checkBoxSyncFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxSyncFilter.Name = "checkBoxSyncFilter";
- checkBoxSyncFilter.Size = new System.Drawing.Size(141, 19);
- checkBoxSyncFilter.TabIndex = 5;
- checkBoxSyncFilter.Text = "Sync filter list enabled";
- checkBoxSyncFilter.UseVisualStyleBackColor = true;
+ this.checkBoxSyncFilter.AutoSize = true;
+ this.checkBoxSyncFilter.Location = new System.Drawing.Point(9, 103);
+ this.checkBoxSyncFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxSyncFilter.Name = "checkBoxSyncFilter";
+ this.checkBoxSyncFilter.Size = new System.Drawing.Size(188, 24);
+ this.checkBoxSyncFilter.TabIndex = 5;
+ this.checkBoxSyncFilter.Text = "Sync filter list enabled";
+ this.checkBoxSyncFilter.UseVisualStyleBackColor = true;
//
// checkBoxFilterTail
//
- checkBoxFilterTail.AutoSize = true;
- checkBoxFilterTail.Location = new System.Drawing.Point(9, 66);
- checkBoxFilterTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxFilterTail.Name = "checkBoxFilterTail";
- checkBoxFilterTail.Size = new System.Drawing.Size(116, 19);
- checkBoxFilterTail.TabIndex = 4;
- checkBoxFilterTail.Text = "Filter tail enabled";
- checkBoxFilterTail.UseVisualStyleBackColor = true;
+ this.checkBoxFilterTail.AutoSize = true;
+ this.checkBoxFilterTail.Location = new System.Drawing.Point(9, 66);
+ this.checkBoxFilterTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxFilterTail.Name = "checkBoxFilterTail";
+ this.checkBoxFilterTail.Size = new System.Drawing.Size(155, 24);
+ this.checkBoxFilterTail.TabIndex = 4;
+ this.checkBoxFilterTail.Text = "Filter tail enabled";
+ this.checkBoxFilterTail.UseVisualStyleBackColor = true;
//
// groupBoxFont
//
- groupBoxFont.Controls.Add(buttonChangeFont);
- groupBoxFont.Controls.Add(labelFont);
- groupBoxFont.Location = new System.Drawing.Point(10, 9);
- groupBoxFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxFont.Name = "groupBoxFont";
- groupBoxFont.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxFont.Size = new System.Drawing.Size(408, 128);
- groupBoxFont.TabIndex = 1;
- groupBoxFont.TabStop = false;
- groupBoxFont.Text = "Font";
+ this.groupBoxFont.Controls.Add(this.buttonChangeFont);
+ this.groupBoxFont.Controls.Add(this.labelFont);
+ this.groupBoxFont.Location = new System.Drawing.Point(10, 9);
+ this.groupBoxFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxFont.Name = "groupBoxFont";
+ this.groupBoxFont.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxFont.Size = new System.Drawing.Size(408, 128);
+ this.groupBoxFont.TabIndex = 1;
+ this.groupBoxFont.TabStop = false;
+ this.groupBoxFont.Text = "Font";
//
// buttonChangeFont
//
- buttonChangeFont.Location = new System.Drawing.Point(9, 77);
- buttonChangeFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonChangeFont.Name = "buttonChangeFont";
- buttonChangeFont.Size = new System.Drawing.Size(112, 35);
- buttonChangeFont.TabIndex = 1;
- buttonChangeFont.Text = "Change...";
- buttonChangeFont.UseVisualStyleBackColor = true;
- buttonChangeFont.Click += OnBtnChangeFontClick;
+ this.buttonChangeFont.Location = new System.Drawing.Point(9, 77);
+ this.buttonChangeFont.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonChangeFont.Name = "buttonChangeFont";
+ this.buttonChangeFont.Size = new System.Drawing.Size(112, 35);
+ this.buttonChangeFont.TabIndex = 1;
+ this.buttonChangeFont.Text = "Change...";
+ this.buttonChangeFont.UseVisualStyleBackColor = true;
+ this.buttonChangeFont.Click += new System.EventHandler(this.OnBtnChangeFontClick);
//
// labelFont
//
- labelFont.Location = new System.Drawing.Point(9, 25);
- labelFont.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelFont.Name = "labelFont";
- labelFont.Size = new System.Drawing.Size(312, 48);
- labelFont.TabIndex = 0;
- labelFont.Text = "Font";
- labelFont.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.labelFont.Location = new System.Drawing.Point(9, 25);
+ this.labelFont.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelFont.Name = "labelFont";
+ this.labelFont.Size = new System.Drawing.Size(312, 48);
+ this.labelFont.TabIndex = 0;
+ this.labelFont.Text = "Font";
+ this.labelFont.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tabPageTimeStampFeatures
//
- tabPageTimeStampFeatures.Controls.Add(groupBoxTimeSpreadDisplay);
- tabPageTimeStampFeatures.Controls.Add(groupBoxTimeStampNavigationControl);
- tabPageTimeStampFeatures.Location = new System.Drawing.Point(4, 24);
- tabPageTimeStampFeatures.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageTimeStampFeatures.Name = "tabPageTimeStampFeatures";
- tabPageTimeStampFeatures.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageTimeStampFeatures.Size = new System.Drawing.Size(942, 440);
- tabPageTimeStampFeatures.TabIndex = 1;
- tabPageTimeStampFeatures.Text = "Timestamp features";
- tabPageTimeStampFeatures.UseVisualStyleBackColor = true;
+ this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeSpreadDisplay);
+ this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeStampNavigationControl);
+ this.tabPageTimeStampFeatures.Location = new System.Drawing.Point(4, 29);
+ this.tabPageTimeStampFeatures.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageTimeStampFeatures.Name = "tabPageTimeStampFeatures";
+ this.tabPageTimeStampFeatures.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageTimeStampFeatures.Size = new System.Drawing.Size(942, 435);
+ this.tabPageTimeStampFeatures.TabIndex = 1;
+ this.tabPageTimeStampFeatures.Text = "Timestamp features";
+ this.tabPageTimeStampFeatures.UseVisualStyleBackColor = true;
//
// groupBoxTimeSpreadDisplay
//
- groupBoxTimeSpreadDisplay.Controls.Add(groupBoxDisplayMode);
- groupBoxTimeSpreadDisplay.Controls.Add(checkBoxReverseAlpha);
- groupBoxTimeSpreadDisplay.Controls.Add(buttonTimespreadColor);
- groupBoxTimeSpreadDisplay.Controls.Add(checkBoxTimeSpread);
- groupBoxTimeSpreadDisplay.Location = new System.Drawing.Point(490, 25);
- groupBoxTimeSpreadDisplay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxTimeSpreadDisplay.Name = "groupBoxTimeSpreadDisplay";
- groupBoxTimeSpreadDisplay.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxTimeSpreadDisplay.Size = new System.Drawing.Size(300, 246);
- groupBoxTimeSpreadDisplay.TabIndex = 8;
- groupBoxTimeSpreadDisplay.TabStop = false;
- groupBoxTimeSpreadDisplay.Text = "Time spread display";
+ this.groupBoxTimeSpreadDisplay.Controls.Add(this.groupBoxDisplayMode);
+ this.groupBoxTimeSpreadDisplay.Controls.Add(this.checkBoxReverseAlpha);
+ this.groupBoxTimeSpreadDisplay.Controls.Add(this.buttonTimespreadColor);
+ this.groupBoxTimeSpreadDisplay.Controls.Add(this.checkBoxTimeSpread);
+ this.groupBoxTimeSpreadDisplay.Location = new System.Drawing.Point(490, 25);
+ this.groupBoxTimeSpreadDisplay.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxTimeSpreadDisplay.Name = "groupBoxTimeSpreadDisplay";
+ this.groupBoxTimeSpreadDisplay.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxTimeSpreadDisplay.Size = new System.Drawing.Size(300, 246);
+ this.groupBoxTimeSpreadDisplay.TabIndex = 8;
+ this.groupBoxTimeSpreadDisplay.TabStop = false;
+ this.groupBoxTimeSpreadDisplay.Text = "Time spread display";
//
// groupBoxDisplayMode
//
- groupBoxDisplayMode.Controls.Add(radioButtonLineView);
- groupBoxDisplayMode.Controls.Add(radioButtonTimeView);
- groupBoxDisplayMode.Location = new System.Drawing.Point(22, 109);
- groupBoxDisplayMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDisplayMode.Name = "groupBoxDisplayMode";
- groupBoxDisplayMode.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDisplayMode.Size = new System.Drawing.Size(188, 118);
- groupBoxDisplayMode.TabIndex = 11;
- groupBoxDisplayMode.TabStop = false;
- groupBoxDisplayMode.Text = "Display mode";
+ this.groupBoxDisplayMode.Controls.Add(this.radioButtonLineView);
+ this.groupBoxDisplayMode.Controls.Add(this.radioButtonTimeView);
+ this.groupBoxDisplayMode.Location = new System.Drawing.Point(22, 109);
+ this.groupBoxDisplayMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDisplayMode.Name = "groupBoxDisplayMode";
+ this.groupBoxDisplayMode.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDisplayMode.Size = new System.Drawing.Size(188, 118);
+ this.groupBoxDisplayMode.TabIndex = 11;
+ this.groupBoxDisplayMode.TabStop = false;
+ this.groupBoxDisplayMode.Text = "Display mode";
//
// radioButtonLineView
//
- radioButtonLineView.AutoSize = true;
- radioButtonLineView.Location = new System.Drawing.Point(9, 65);
- radioButtonLineView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonLineView.Name = "radioButtonLineView";
- radioButtonLineView.Size = new System.Drawing.Size(74, 19);
- radioButtonLineView.TabIndex = 9;
- radioButtonLineView.TabStop = true;
- radioButtonLineView.Text = "Line view";
- radioButtonLineView.UseVisualStyleBackColor = true;
+ this.radioButtonLineView.AutoSize = true;
+ this.radioButtonLineView.Location = new System.Drawing.Point(9, 65);
+ this.radioButtonLineView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonLineView.Name = "radioButtonLineView";
+ this.radioButtonLineView.Size = new System.Drawing.Size(98, 24);
+ this.radioButtonLineView.TabIndex = 9;
+ this.radioButtonLineView.TabStop = true;
+ this.radioButtonLineView.Text = "Line view";
+ this.radioButtonLineView.UseVisualStyleBackColor = true;
//
// radioButtonTimeView
//
- radioButtonTimeView.AutoSize = true;
- radioButtonTimeView.Location = new System.Drawing.Point(9, 29);
- radioButtonTimeView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonTimeView.Name = "radioButtonTimeView";
- radioButtonTimeView.Size = new System.Drawing.Size(78, 19);
- radioButtonTimeView.TabIndex = 10;
- radioButtonTimeView.TabStop = true;
- radioButtonTimeView.Text = "Time view";
- radioButtonTimeView.UseVisualStyleBackColor = true;
+ this.radioButtonTimeView.AutoSize = true;
+ this.radioButtonTimeView.Location = new System.Drawing.Point(9, 29);
+ this.radioButtonTimeView.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonTimeView.Name = "radioButtonTimeView";
+ this.radioButtonTimeView.Size = new System.Drawing.Size(102, 24);
+ this.radioButtonTimeView.TabIndex = 10;
+ this.radioButtonTimeView.TabStop = true;
+ this.radioButtonTimeView.Text = "Time view";
+ this.radioButtonTimeView.UseVisualStyleBackColor = true;
//
// checkBoxReverseAlpha
//
- checkBoxReverseAlpha.AutoSize = true;
- checkBoxReverseAlpha.Location = new System.Drawing.Point(22, 74);
- checkBoxReverseAlpha.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxReverseAlpha.Name = "checkBoxReverseAlpha";
- checkBoxReverseAlpha.Size = new System.Drawing.Size(98, 19);
- checkBoxReverseAlpha.TabIndex = 8;
- checkBoxReverseAlpha.Text = "Reverse alpha";
- checkBoxReverseAlpha.UseVisualStyleBackColor = true;
+ this.checkBoxReverseAlpha.AutoSize = true;
+ this.checkBoxReverseAlpha.Location = new System.Drawing.Point(22, 74);
+ this.checkBoxReverseAlpha.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxReverseAlpha.Name = "checkBoxReverseAlpha";
+ this.checkBoxReverseAlpha.Size = new System.Drawing.Size(137, 24);
+ this.checkBoxReverseAlpha.TabIndex = 8;
+ this.checkBoxReverseAlpha.Text = "Reverse alpha";
+ this.checkBoxReverseAlpha.UseVisualStyleBackColor = true;
//
// buttonTimespreadColor
//
- buttonTimespreadColor.Location = new System.Drawing.Point(207, 32);
- buttonTimespreadColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonTimespreadColor.Name = "buttonTimespreadColor";
- buttonTimespreadColor.Size = new System.Drawing.Size(84, 32);
- buttonTimespreadColor.TabIndex = 7;
- buttonTimespreadColor.Text = "Color...";
- buttonTimespreadColor.UseVisualStyleBackColor = true;
- buttonTimespreadColor.Click += OnBtnTimespreadColorClick;
+ this.buttonTimespreadColor.Location = new System.Drawing.Point(207, 32);
+ this.buttonTimespreadColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonTimespreadColor.Name = "buttonTimespreadColor";
+ this.buttonTimespreadColor.Size = new System.Drawing.Size(84, 32);
+ this.buttonTimespreadColor.TabIndex = 7;
+ this.buttonTimespreadColor.Text = "Color...";
+ this.buttonTimespreadColor.UseVisualStyleBackColor = true;
+ this.buttonTimespreadColor.Click += new System.EventHandler(this.OnBtnTimespreadColorClick);
//
// checkBoxTimeSpread
//
- checkBoxTimeSpread.AutoSize = true;
- checkBoxTimeSpread.Location = new System.Drawing.Point(22, 37);
- checkBoxTimeSpread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxTimeSpread.Name = "checkBoxTimeSpread";
- checkBoxTimeSpread.Size = new System.Drawing.Size(120, 19);
- checkBoxTimeSpread.TabIndex = 6;
- checkBoxTimeSpread.Text = "Show time spread";
- checkBoxTimeSpread.UseVisualStyleBackColor = true;
+ this.checkBoxTimeSpread.AutoSize = true;
+ this.checkBoxTimeSpread.Location = new System.Drawing.Point(22, 37);
+ this.checkBoxTimeSpread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxTimeSpread.Name = "checkBoxTimeSpread";
+ this.checkBoxTimeSpread.Size = new System.Drawing.Size(162, 24);
+ this.checkBoxTimeSpread.TabIndex = 6;
+ this.checkBoxTimeSpread.Text = "Show time spread";
+ this.checkBoxTimeSpread.UseVisualStyleBackColor = true;
//
// groupBoxTimeStampNavigationControl
//
- groupBoxTimeStampNavigationControl.Controls.Add(checkBoxTimestamp);
- groupBoxTimeStampNavigationControl.Controls.Add(groupBoxMouseDragDefaults);
- groupBoxTimeStampNavigationControl.Location = new System.Drawing.Point(10, 25);
- groupBoxTimeStampNavigationControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxTimeStampNavigationControl.Name = "groupBoxTimeStampNavigationControl";
- groupBoxTimeStampNavigationControl.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxTimeStampNavigationControl.Size = new System.Drawing.Size(450, 246);
- groupBoxTimeStampNavigationControl.TabIndex = 7;
- groupBoxTimeStampNavigationControl.TabStop = false;
- groupBoxTimeStampNavigationControl.Text = "Timestamp navigation control";
+ this.groupBoxTimeStampNavigationControl.Controls.Add(this.checkBoxTimestamp);
+ this.groupBoxTimeStampNavigationControl.Controls.Add(this.groupBoxMouseDragDefaults);
+ this.groupBoxTimeStampNavigationControl.Location = new System.Drawing.Point(10, 25);
+ this.groupBoxTimeStampNavigationControl.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxTimeStampNavigationControl.Name = "groupBoxTimeStampNavigationControl";
+ this.groupBoxTimeStampNavigationControl.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxTimeStampNavigationControl.Size = new System.Drawing.Size(450, 246);
+ this.groupBoxTimeStampNavigationControl.TabIndex = 7;
+ this.groupBoxTimeStampNavigationControl.TabStop = false;
+ this.groupBoxTimeStampNavigationControl.Text = "Timestamp navigation control";
//
// checkBoxTimestamp
//
- checkBoxTimestamp.AutoSize = true;
- checkBoxTimestamp.Location = new System.Drawing.Point(27, 37);
- checkBoxTimestamp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxTimestamp.Name = "checkBoxTimestamp";
- checkBoxTimestamp.Size = new System.Drawing.Size(304, 19);
- checkBoxTimestamp.TabIndex = 3;
- checkBoxTimestamp.Text = "Show timestamp control, if supported by columnizer";
- checkBoxTimestamp.UseVisualStyleBackColor = true;
+ this.checkBoxTimestamp.AutoSize = true;
+ this.checkBoxTimestamp.Location = new System.Drawing.Point(27, 37);
+ this.checkBoxTimestamp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxTimestamp.Name = "checkBoxTimestamp";
+ this.checkBoxTimestamp.Size = new System.Drawing.Size(397, 24);
+ this.checkBoxTimestamp.TabIndex = 3;
+ this.checkBoxTimestamp.Text = "Show timestamp control, if supported by columnizer";
+ this.checkBoxTimestamp.UseVisualStyleBackColor = true;
//
// groupBoxMouseDragDefaults
//
- groupBoxMouseDragDefaults.Controls.Add(radioButtonVerticalMouseDragInverted);
- groupBoxMouseDragDefaults.Controls.Add(radioButtonHorizMouseDrag);
- groupBoxMouseDragDefaults.Controls.Add(radioButtonVerticalMouseDrag);
- groupBoxMouseDragDefaults.Location = new System.Drawing.Point(27, 80);
- groupBoxMouseDragDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxMouseDragDefaults.Name = "groupBoxMouseDragDefaults";
- groupBoxMouseDragDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxMouseDragDefaults.Size = new System.Drawing.Size(186, 148);
- groupBoxMouseDragDefaults.TabIndex = 5;
- groupBoxMouseDragDefaults.TabStop = false;
- groupBoxMouseDragDefaults.Text = "Mouse Drag Default";
+ this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonVerticalMouseDragInverted);
+ this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonHorizMouseDrag);
+ this.groupBoxMouseDragDefaults.Controls.Add(this.radioButtonVerticalMouseDrag);
+ this.groupBoxMouseDragDefaults.Location = new System.Drawing.Point(27, 80);
+ this.groupBoxMouseDragDefaults.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxMouseDragDefaults.Name = "groupBoxMouseDragDefaults";
+ this.groupBoxMouseDragDefaults.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxMouseDragDefaults.Size = new System.Drawing.Size(186, 148);
+ this.groupBoxMouseDragDefaults.TabIndex = 5;
+ this.groupBoxMouseDragDefaults.TabStop = false;
+ this.groupBoxMouseDragDefaults.Text = "Mouse Drag Default";
//
// radioButtonVerticalMouseDragInverted
//
- radioButtonVerticalMouseDragInverted.AutoSize = true;
- radioButtonVerticalMouseDragInverted.Location = new System.Drawing.Point(9, 102);
- radioButtonVerticalMouseDragInverted.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonVerticalMouseDragInverted.Name = "radioButtonVerticalMouseDragInverted";
- radioButtonVerticalMouseDragInverted.Size = new System.Drawing.Size(109, 19);
- radioButtonVerticalMouseDragInverted.TabIndex = 6;
- radioButtonVerticalMouseDragInverted.TabStop = true;
- radioButtonVerticalMouseDragInverted.Text = "Vertical Inverted";
- radioButtonVerticalMouseDragInverted.UseVisualStyleBackColor = true;
+ this.radioButtonVerticalMouseDragInverted.AutoSize = true;
+ this.radioButtonVerticalMouseDragInverted.Location = new System.Drawing.Point(9, 102);
+ this.radioButtonVerticalMouseDragInverted.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonVerticalMouseDragInverted.Name = "radioButtonVerticalMouseDragInverted";
+ this.radioButtonVerticalMouseDragInverted.Size = new System.Drawing.Size(149, 24);
+ this.radioButtonVerticalMouseDragInverted.TabIndex = 6;
+ this.radioButtonVerticalMouseDragInverted.TabStop = true;
+ this.radioButtonVerticalMouseDragInverted.Text = "Vertical Inverted";
+ this.radioButtonVerticalMouseDragInverted.UseVisualStyleBackColor = true;
//
// radioButtonHorizMouseDrag
//
- radioButtonHorizMouseDrag.AutoSize = true;
- radioButtonHorizMouseDrag.Location = new System.Drawing.Point(9, 29);
- radioButtonHorizMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonHorizMouseDrag.Name = "radioButtonHorizMouseDrag";
- radioButtonHorizMouseDrag.Size = new System.Drawing.Size(80, 19);
- radioButtonHorizMouseDrag.TabIndex = 5;
- radioButtonHorizMouseDrag.TabStop = true;
- radioButtonHorizMouseDrag.Text = "Horizontal";
- radioButtonHorizMouseDrag.UseVisualStyleBackColor = true;
+ this.radioButtonHorizMouseDrag.AutoSize = true;
+ this.radioButtonHorizMouseDrag.Location = new System.Drawing.Point(9, 29);
+ this.radioButtonHorizMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonHorizMouseDrag.Name = "radioButtonHorizMouseDrag";
+ this.radioButtonHorizMouseDrag.Size = new System.Drawing.Size(106, 24);
+ this.radioButtonHorizMouseDrag.TabIndex = 5;
+ this.radioButtonHorizMouseDrag.TabStop = true;
+ this.radioButtonHorizMouseDrag.Text = "Horizontal";
+ this.radioButtonHorizMouseDrag.UseVisualStyleBackColor = true;
//
// radioButtonVerticalMouseDrag
//
- radioButtonVerticalMouseDrag.AutoSize = true;
- radioButtonVerticalMouseDrag.Location = new System.Drawing.Point(9, 65);
- radioButtonVerticalMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonVerticalMouseDrag.Name = "radioButtonVerticalMouseDrag";
- radioButtonVerticalMouseDrag.Size = new System.Drawing.Size(63, 19);
- radioButtonVerticalMouseDrag.TabIndex = 4;
- radioButtonVerticalMouseDrag.TabStop = true;
- radioButtonVerticalMouseDrag.Text = "Vertical";
- radioButtonVerticalMouseDrag.UseVisualStyleBackColor = true;
+ this.radioButtonVerticalMouseDrag.AutoSize = true;
+ this.radioButtonVerticalMouseDrag.Location = new System.Drawing.Point(9, 65);
+ this.radioButtonVerticalMouseDrag.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonVerticalMouseDrag.Name = "radioButtonVerticalMouseDrag";
+ this.radioButtonVerticalMouseDrag.Size = new System.Drawing.Size(87, 24);
+ this.radioButtonVerticalMouseDrag.TabIndex = 4;
+ this.radioButtonVerticalMouseDrag.TabStop = true;
+ this.radioButtonVerticalMouseDrag.Text = "Vertical";
+ this.radioButtonVerticalMouseDrag.UseVisualStyleBackColor = true;
//
// tabPageExternalTools
//
- tabPageExternalTools.Controls.Add(labelToolsDescription);
- tabPageExternalTools.Controls.Add(buttonToolDelete);
- tabPageExternalTools.Controls.Add(buttonToolAdd);
- tabPageExternalTools.Controls.Add(buttonToolDown);
- tabPageExternalTools.Controls.Add(buttonToolUp);
- tabPageExternalTools.Controls.Add(listBoxTools);
- tabPageExternalTools.Controls.Add(groupBoxToolSettings);
- tabPageExternalTools.Location = new System.Drawing.Point(4, 24);
- tabPageExternalTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageExternalTools.Name = "tabPageExternalTools";
- tabPageExternalTools.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageExternalTools.Size = new System.Drawing.Size(942, 440);
- tabPageExternalTools.TabIndex = 2;
- tabPageExternalTools.Text = "External Tools";
- tabPageExternalTools.UseVisualStyleBackColor = true;
+ this.tabPageExternalTools.Controls.Add(this.labelToolsDescription);
+ this.tabPageExternalTools.Controls.Add(this.buttonToolDelete);
+ this.tabPageExternalTools.Controls.Add(this.buttonToolAdd);
+ this.tabPageExternalTools.Controls.Add(this.buttonToolDown);
+ this.tabPageExternalTools.Controls.Add(this.buttonToolUp);
+ this.tabPageExternalTools.Controls.Add(this.listBoxTools);
+ this.tabPageExternalTools.Controls.Add(this.groupBoxToolSettings);
+ this.tabPageExternalTools.Location = new System.Drawing.Point(4, 29);
+ this.tabPageExternalTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageExternalTools.Name = "tabPageExternalTools";
+ this.tabPageExternalTools.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageExternalTools.Size = new System.Drawing.Size(942, 435);
+ this.tabPageExternalTools.TabIndex = 2;
+ this.tabPageExternalTools.Text = "External Tools";
+ this.tabPageExternalTools.UseVisualStyleBackColor = true;
//
// labelToolsDescription
//
- labelToolsDescription.Location = new System.Drawing.Point(546, 102);
- labelToolsDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelToolsDescription.Name = "labelToolsDescription";
- labelToolsDescription.Size = new System.Drawing.Size(376, 80);
- labelToolsDescription.TabIndex = 6;
- labelToolsDescription.Text = "You can configure as many tools as you want. \r\nChecked tools will appear in the icon bar. All other tools are available in the tools menu.";
+ this.labelToolsDescription.Location = new System.Drawing.Point(546, 102);
+ this.labelToolsDescription.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelToolsDescription.Name = "labelToolsDescription";
+ this.labelToolsDescription.Size = new System.Drawing.Size(376, 80);
+ this.labelToolsDescription.TabIndex = 6;
+ this.labelToolsDescription.Text = "You can configure as many tools as you want. \r\nChecked tools will appear in the i" +
+ "con bar. All other tools are available in the tools menu.";
//
// buttonToolDelete
//
- buttonToolDelete.Location = new System.Drawing.Point(550, 14);
- buttonToolDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonToolDelete.Name = "buttonToolDelete";
- buttonToolDelete.Size = new System.Drawing.Size(112, 35);
- buttonToolDelete.TabIndex = 2;
- buttonToolDelete.Text = "Remove";
- buttonToolDelete.UseVisualStyleBackColor = true;
- buttonToolDelete.Click += OnToolDeleteButtonClick;
+ this.buttonToolDelete.Location = new System.Drawing.Point(550, 14);
+ this.buttonToolDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonToolDelete.Name = "buttonToolDelete";
+ this.buttonToolDelete.Size = new System.Drawing.Size(112, 35);
+ this.buttonToolDelete.TabIndex = 2;
+ this.buttonToolDelete.Text = "Remove";
+ this.buttonToolDelete.UseVisualStyleBackColor = true;
+ this.buttonToolDelete.Click += new System.EventHandler(this.OnToolDeleteButtonClick);
//
// buttonToolAdd
//
- buttonToolAdd.Location = new System.Drawing.Point(429, 14);
- buttonToolAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonToolAdd.Name = "buttonToolAdd";
- buttonToolAdd.Size = new System.Drawing.Size(112, 35);
- buttonToolAdd.TabIndex = 1;
- buttonToolAdd.Text = "Add new";
- buttonToolAdd.UseVisualStyleBackColor = true;
- buttonToolAdd.Click += OnBtnToolAddClick;
+ this.buttonToolAdd.Location = new System.Drawing.Point(429, 14);
+ this.buttonToolAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonToolAdd.Name = "buttonToolAdd";
+ this.buttonToolAdd.Size = new System.Drawing.Size(112, 35);
+ this.buttonToolAdd.TabIndex = 1;
+ this.buttonToolAdd.Text = "Add new";
+ this.buttonToolAdd.UseVisualStyleBackColor = true;
+ this.buttonToolAdd.Click += new System.EventHandler(this.OnBtnToolAddClick);
//
// buttonToolDown
//
- buttonToolDown.Location = new System.Drawing.Point(429, 146);
- buttonToolDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonToolDown.Name = "buttonToolDown";
- buttonToolDown.Size = new System.Drawing.Size(64, 35);
- buttonToolDown.TabIndex = 4;
- buttonToolDown.Text = "Down";
- buttonToolDown.UseVisualStyleBackColor = true;
- buttonToolDown.Click += OnBtnToolDownClick;
+ this.buttonToolDown.Location = new System.Drawing.Point(429, 146);
+ this.buttonToolDown.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonToolDown.Name = "buttonToolDown";
+ this.buttonToolDown.Size = new System.Drawing.Size(64, 35);
+ this.buttonToolDown.TabIndex = 4;
+ this.buttonToolDown.Text = "Down";
+ this.buttonToolDown.UseVisualStyleBackColor = true;
+ this.buttonToolDown.Click += new System.EventHandler(this.OnBtnToolDownClick);
//
// buttonToolUp
//
- buttonToolUp.Location = new System.Drawing.Point(429, 102);
- buttonToolUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonToolUp.Name = "buttonToolUp";
- buttonToolUp.Size = new System.Drawing.Size(64, 35);
- buttonToolUp.TabIndex = 3;
- buttonToolUp.Text = "Up";
- buttonToolUp.UseVisualStyleBackColor = true;
- buttonToolUp.Click += OnBtnToolUpClick;
+ this.buttonToolUp.Location = new System.Drawing.Point(429, 102);
+ this.buttonToolUp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonToolUp.Name = "buttonToolUp";
+ this.buttonToolUp.Size = new System.Drawing.Size(64, 35);
+ this.buttonToolUp.TabIndex = 3;
+ this.buttonToolUp.Text = "Up";
+ this.buttonToolUp.UseVisualStyleBackColor = true;
+ this.buttonToolUp.Click += new System.EventHandler(this.OnBtnToolUpClick);
//
// listBoxTools
//
- listBoxTools.FormattingEnabled = true;
- listBoxTools.Location = new System.Drawing.Point(10, 14);
- listBoxTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- listBoxTools.Name = "listBoxTools";
- listBoxTools.Size = new System.Drawing.Size(406, 148);
- listBoxTools.TabIndex = 0;
- listBoxTools.SelectedIndexChanged += OnListBoxToolSelectedIndexChanged;
+ this.listBoxTools.FormattingEnabled = true;
+ this.listBoxTools.Location = new System.Drawing.Point(10, 14);
+ this.listBoxTools.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.listBoxTools.Name = "listBoxTools";
+ this.listBoxTools.Size = new System.Drawing.Size(406, 165);
+ this.listBoxTools.TabIndex = 0;
+ this.listBoxTools.SelectedIndexChanged += new System.EventHandler(this.OnListBoxToolSelectedIndexChanged);
//
// groupBoxToolSettings
//
- groupBoxToolSettings.Controls.Add(labelWorkingDir);
- groupBoxToolSettings.Controls.Add(buttonWorkingDir);
- groupBoxToolSettings.Controls.Add(textBoxWorkingDir);
- groupBoxToolSettings.Controls.Add(buttonIcon);
- groupBoxToolSettings.Controls.Add(labelToolName);
- groupBoxToolSettings.Controls.Add(labelToolColumnizerForOutput);
- groupBoxToolSettings.Controls.Add(comboBoxColumnizer);
- groupBoxToolSettings.Controls.Add(textBoxToolName);
- groupBoxToolSettings.Controls.Add(checkBoxSysout);
- groupBoxToolSettings.Controls.Add(buttonArguments);
- groupBoxToolSettings.Controls.Add(labelTool);
- groupBoxToolSettings.Controls.Add(buttonTool);
- groupBoxToolSettings.Controls.Add(textBoxTool);
- groupBoxToolSettings.Controls.Add(labelArguments);
- groupBoxToolSettings.Controls.Add(textBoxArguments);
- groupBoxToolSettings.Location = new System.Drawing.Point(10, 191);
- groupBoxToolSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxToolSettings.Name = "groupBoxToolSettings";
- groupBoxToolSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxToolSettings.Size = new System.Drawing.Size(912, 228);
- groupBoxToolSettings.TabIndex = 0;
- groupBoxToolSettings.TabStop = false;
- groupBoxToolSettings.Text = "Tool settings";
+ this.groupBoxToolSettings.Controls.Add(this.labelWorkingDir);
+ this.groupBoxToolSettings.Controls.Add(this.buttonWorkingDir);
+ this.groupBoxToolSettings.Controls.Add(this.textBoxWorkingDir);
+ this.groupBoxToolSettings.Controls.Add(this.buttonIcon);
+ this.groupBoxToolSettings.Controls.Add(this.labelToolName);
+ this.groupBoxToolSettings.Controls.Add(this.labelToolColumnizerForOutput);
+ this.groupBoxToolSettings.Controls.Add(this.comboBoxColumnizer);
+ this.groupBoxToolSettings.Controls.Add(this.textBoxToolName);
+ this.groupBoxToolSettings.Controls.Add(this.checkBoxSysout);
+ this.groupBoxToolSettings.Controls.Add(this.buttonArguments);
+ this.groupBoxToolSettings.Controls.Add(this.labelTool);
+ this.groupBoxToolSettings.Controls.Add(this.buttonTool);
+ this.groupBoxToolSettings.Controls.Add(this.textBoxTool);
+ this.groupBoxToolSettings.Controls.Add(this.labelArguments);
+ this.groupBoxToolSettings.Controls.Add(this.textBoxArguments);
+ this.groupBoxToolSettings.Location = new System.Drawing.Point(10, 191);
+ this.groupBoxToolSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxToolSettings.Name = "groupBoxToolSettings";
+ this.groupBoxToolSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxToolSettings.Size = new System.Drawing.Size(912, 228);
+ this.groupBoxToolSettings.TabIndex = 0;
+ this.groupBoxToolSettings.TabStop = false;
+ this.groupBoxToolSettings.Text = "Tool settings";
//
// labelWorkingDir
//
- labelWorkingDir.AutoSize = true;
- labelWorkingDir.Location = new System.Drawing.Point(474, 86);
- labelWorkingDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelWorkingDir.Name = "labelWorkingDir";
- labelWorkingDir.Size = new System.Drawing.Size(72, 15);
- labelWorkingDir.TabIndex = 11;
- labelWorkingDir.Text = "Working dir:";
+ this.labelWorkingDir.AutoSize = true;
+ this.labelWorkingDir.Location = new System.Drawing.Point(474, 86);
+ this.labelWorkingDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelWorkingDir.Name = "labelWorkingDir";
+ this.labelWorkingDir.Size = new System.Drawing.Size(92, 20);
+ this.labelWorkingDir.TabIndex = 11;
+ this.labelWorkingDir.Text = "Working dir:";
//
// buttonWorkingDir
//
- buttonWorkingDir.Location = new System.Drawing.Point(856, 80);
- buttonWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonWorkingDir.Name = "buttonWorkingDir";
- buttonWorkingDir.Size = new System.Drawing.Size(45, 31);
- buttonWorkingDir.TabIndex = 10;
- buttonWorkingDir.Text = "...";
- buttonWorkingDir.UseVisualStyleBackColor = true;
- buttonWorkingDir.Click += OnBtnWorkingDirClick;
+ this.buttonWorkingDir.Location = new System.Drawing.Point(856, 80);
+ this.buttonWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonWorkingDir.Name = "buttonWorkingDir";
+ this.buttonWorkingDir.Size = new System.Drawing.Size(45, 31);
+ this.buttonWorkingDir.TabIndex = 10;
+ this.buttonWorkingDir.Text = "...";
+ this.buttonWorkingDir.UseVisualStyleBackColor = true;
+ this.buttonWorkingDir.Click += new System.EventHandler(this.OnBtnWorkingDirClick);
//
// textBoxWorkingDir
//
- textBoxWorkingDir.Location = new System.Drawing.Point(576, 82);
- textBoxWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- textBoxWorkingDir.Name = "textBoxWorkingDir";
- textBoxWorkingDir.Size = new System.Drawing.Size(270, 23);
- textBoxWorkingDir.TabIndex = 9;
+ this.textBoxWorkingDir.Location = new System.Drawing.Point(576, 82);
+ this.textBoxWorkingDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBoxWorkingDir.Name = "textBoxWorkingDir";
+ this.textBoxWorkingDir.Size = new System.Drawing.Size(270, 26);
+ this.textBoxWorkingDir.TabIndex = 9;
//
// buttonIcon
//
- buttonIcon.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
- buttonIcon.Location = new System.Drawing.Point(418, 26);
- buttonIcon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonIcon.Name = "buttonIcon";
- buttonIcon.Size = new System.Drawing.Size(112, 35);
- buttonIcon.TabIndex = 1;
- buttonIcon.Text = " Icon...";
- buttonIcon.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
- buttonIcon.UseVisualStyleBackColor = true;
- buttonIcon.Click += OnBtnIconClick;
+ this.buttonIcon.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.buttonIcon.Location = new System.Drawing.Point(418, 26);
+ this.buttonIcon.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonIcon.Name = "buttonIcon";
+ this.buttonIcon.Size = new System.Drawing.Size(112, 35);
+ this.buttonIcon.TabIndex = 1;
+ this.buttonIcon.Text = " Icon...";
+ this.buttonIcon.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+ this.buttonIcon.UseVisualStyleBackColor = true;
+ this.buttonIcon.Click += new System.EventHandler(this.OnBtnIconClick);
//
// labelToolName
//
- labelToolName.AutoSize = true;
- labelToolName.Location = new System.Drawing.Point(9, 34);
- labelToolName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelToolName.Name = "labelToolName";
- labelToolName.Size = new System.Drawing.Size(42, 15);
- labelToolName.TabIndex = 8;
- labelToolName.Text = "Name:";
+ this.labelToolName.AutoSize = true;
+ this.labelToolName.Location = new System.Drawing.Point(9, 34);
+ this.labelToolName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelToolName.Name = "labelToolName";
+ this.labelToolName.Size = new System.Drawing.Size(55, 20);
+ this.labelToolName.TabIndex = 8;
+ this.labelToolName.Text = "Name:";
//
// labelToolColumnizerForOutput
//
- labelToolColumnizerForOutput.AutoSize = true;
- labelToolColumnizerForOutput.Location = new System.Drawing.Point(404, 185);
- labelToolColumnizerForOutput.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelToolColumnizerForOutput.Name = "labelToolColumnizerForOutput";
- labelToolColumnizerForOutput.Size = new System.Drawing.Size(128, 15);
- labelToolColumnizerForOutput.TabIndex = 6;
- labelToolColumnizerForOutput.Text = "Columnizer for output:";
+ this.labelToolColumnizerForOutput.AutoSize = true;
+ this.labelToolColumnizerForOutput.Location = new System.Drawing.Point(404, 185);
+ this.labelToolColumnizerForOutput.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelToolColumnizerForOutput.Name = "labelToolColumnizerForOutput";
+ this.labelToolColumnizerForOutput.Size = new System.Drawing.Size(165, 20);
+ this.labelToolColumnizerForOutput.TabIndex = 6;
+ this.labelToolColumnizerForOutput.Text = "Columnizer for output:";
//
// comboBoxColumnizer
//
- comboBoxColumnizer.FormattingEnabled = true;
- comboBoxColumnizer.Location = new System.Drawing.Point(576, 180);
- comboBoxColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- comboBoxColumnizer.Name = "comboBoxColumnizer";
- comboBoxColumnizer.Size = new System.Drawing.Size(270, 23);
- comboBoxColumnizer.TabIndex = 7;
+ this.comboBoxColumnizer.FormattingEnabled = true;
+ this.comboBoxColumnizer.Location = new System.Drawing.Point(576, 180);
+ this.comboBoxColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.comboBoxColumnizer.Name = "comboBoxColumnizer";
+ this.comboBoxColumnizer.Size = new System.Drawing.Size(270, 28);
+ this.comboBoxColumnizer.TabIndex = 7;
//
// textBoxToolName
//
- textBoxToolName.Location = new System.Drawing.Point(108, 29);
- textBoxToolName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- textBoxToolName.Name = "textBoxToolName";
- textBoxToolName.Size = new System.Drawing.Size(298, 23);
- textBoxToolName.TabIndex = 0;
+ this.textBoxToolName.Location = new System.Drawing.Point(108, 29);
+ this.textBoxToolName.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBoxToolName.Name = "textBoxToolName";
+ this.textBoxToolName.Size = new System.Drawing.Size(298, 26);
+ this.textBoxToolName.TabIndex = 0;
//
// checkBoxSysout
//
- checkBoxSysout.AutoSize = true;
- checkBoxSysout.Location = new System.Drawing.Point(108, 183);
- checkBoxSysout.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxSysout.Name = "checkBoxSysout";
- checkBoxSysout.Size = new System.Drawing.Size(120, 19);
- checkBoxSysout.TabIndex = 6;
- checkBoxSysout.Text = "Pipe sysout to tab";
- checkBoxSysout.UseVisualStyleBackColor = true;
- checkBoxSysout.CheckedChanged += OnChkBoxSysoutCheckedChanged;
+ this.checkBoxSysout.AutoSize = true;
+ this.checkBoxSysout.Location = new System.Drawing.Point(108, 183);
+ this.checkBoxSysout.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxSysout.Name = "checkBoxSysout";
+ this.checkBoxSysout.Size = new System.Drawing.Size(161, 24);
+ this.checkBoxSysout.TabIndex = 6;
+ this.checkBoxSysout.Text = "Pipe sysout to tab";
+ this.checkBoxSysout.UseVisualStyleBackColor = true;
+ this.checkBoxSysout.CheckedChanged += new System.EventHandler(this.OnChkBoxSysoutCheckedChanged);
//
// buttonArguments
//
- buttonArguments.Location = new System.Drawing.Point(856, 128);
- buttonArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonArguments.Name = "buttonArguments";
- buttonArguments.Size = new System.Drawing.Size(46, 32);
- buttonArguments.TabIndex = 5;
- buttonArguments.Text = "...";
- buttonArguments.UseVisualStyleBackColor = true;
- buttonArguments.Click += OnBtnArgClick;
+ this.buttonArguments.Location = new System.Drawing.Point(856, 128);
+ this.buttonArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonArguments.Name = "buttonArguments";
+ this.buttonArguments.Size = new System.Drawing.Size(46, 32);
+ this.buttonArguments.TabIndex = 5;
+ this.buttonArguments.Text = "...";
+ this.buttonArguments.UseVisualStyleBackColor = true;
+ this.buttonArguments.Click += new System.EventHandler(this.OnBtnArgClick);
//
// labelTool
//
- labelTool.AutoSize = true;
- labelTool.Location = new System.Drawing.Point(9, 86);
- labelTool.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelTool.Name = "labelTool";
- labelTool.Size = new System.Drawing.Size(56, 15);
- labelTool.TabIndex = 4;
- labelTool.Text = "Program:";
+ this.labelTool.AutoSize = true;
+ this.labelTool.Location = new System.Drawing.Point(9, 86);
+ this.labelTool.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelTool.Name = "labelTool";
+ this.labelTool.Size = new System.Drawing.Size(73, 20);
+ this.labelTool.TabIndex = 4;
+ this.labelTool.Text = "Program:";
//
// buttonTool
//
- buttonTool.Location = new System.Drawing.Point(418, 78);
- buttonTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonTool.Name = "buttonTool";
- buttonTool.Size = new System.Drawing.Size(45, 31);
- buttonTool.TabIndex = 3;
- buttonTool.Text = "...";
- buttonTool.UseVisualStyleBackColor = true;
- buttonTool.Click += OnBtnToolClick;
+ this.buttonTool.Location = new System.Drawing.Point(418, 78);
+ this.buttonTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonTool.Name = "buttonTool";
+ this.buttonTool.Size = new System.Drawing.Size(45, 31);
+ this.buttonTool.TabIndex = 3;
+ this.buttonTool.Text = "...";
+ this.buttonTool.UseVisualStyleBackColor = true;
+ this.buttonTool.Click += new System.EventHandler(this.OnBtnToolClick);
//
// textBoxTool
//
- textBoxTool.Location = new System.Drawing.Point(108, 80);
- textBoxTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- textBoxTool.Name = "textBoxTool";
- textBoxTool.Size = new System.Drawing.Size(298, 23);
- textBoxTool.TabIndex = 2;
+ this.textBoxTool.Location = new System.Drawing.Point(108, 80);
+ this.textBoxTool.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBoxTool.Name = "textBoxTool";
+ this.textBoxTool.Size = new System.Drawing.Size(298, 26);
+ this.textBoxTool.TabIndex = 2;
//
// labelArguments
//
- labelArguments.AutoSize = true;
- labelArguments.Location = new System.Drawing.Point(9, 134);
- labelArguments.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelArguments.Name = "labelArguments";
- labelArguments.Size = new System.Drawing.Size(69, 15);
- labelArguments.TabIndex = 1;
- labelArguments.Text = "Arguments:";
+ this.labelArguments.AutoSize = true;
+ this.labelArguments.Location = new System.Drawing.Point(9, 134);
+ this.labelArguments.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelArguments.Name = "labelArguments";
+ this.labelArguments.Size = new System.Drawing.Size(91, 20);
+ this.labelArguments.TabIndex = 1;
+ this.labelArguments.Text = "Arguments:";
//
// textBoxArguments
//
- textBoxArguments.Location = new System.Drawing.Point(108, 129);
- textBoxArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- textBoxArguments.Name = "textBoxArguments";
- textBoxArguments.Size = new System.Drawing.Size(738, 23);
- textBoxArguments.TabIndex = 4;
+ this.textBoxArguments.Location = new System.Drawing.Point(108, 129);
+ this.textBoxArguments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBoxArguments.Name = "textBoxArguments";
+ this.textBoxArguments.Size = new System.Drawing.Size(738, 26);
+ this.textBoxArguments.TabIndex = 4;
//
// tabPageColumnizers
//
- tabPageColumnizers.Controls.Add(checkBoxAutoPick);
- tabPageColumnizers.Controls.Add(checkBoxMaskPrio);
- tabPageColumnizers.Controls.Add(buttonDelete);
- tabPageColumnizers.Controls.Add(dataGridViewColumnizer);
- tabPageColumnizers.Location = new System.Drawing.Point(4, 24);
- tabPageColumnizers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageColumnizers.Name = "tabPageColumnizers";
- tabPageColumnizers.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageColumnizers.Size = new System.Drawing.Size(942, 440);
- tabPageColumnizers.TabIndex = 3;
- tabPageColumnizers.Text = "Columnizers";
- tabPageColumnizers.UseVisualStyleBackColor = true;
+ this.tabPageColumnizers.Controls.Add(this.checkBoxAutoPick);
+ this.tabPageColumnizers.Controls.Add(this.checkBoxMaskPrio);
+ this.tabPageColumnizers.Controls.Add(this.buttonDelete);
+ this.tabPageColumnizers.Controls.Add(this.dataGridViewColumnizer);
+ this.tabPageColumnizers.Location = new System.Drawing.Point(4, 29);
+ this.tabPageColumnizers.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageColumnizers.Name = "tabPageColumnizers";
+ this.tabPageColumnizers.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageColumnizers.Size = new System.Drawing.Size(942, 435);
+ this.tabPageColumnizers.TabIndex = 3;
+ this.tabPageColumnizers.Text = "Columnizers";
+ this.tabPageColumnizers.UseVisualStyleBackColor = true;
//
// checkBoxAutoPick
//
- checkBoxAutoPick.AutoSize = true;
- checkBoxAutoPick.Checked = true;
- checkBoxAutoPick.CheckState = System.Windows.Forms.CheckState.Checked;
- checkBoxAutoPick.Location = new System.Drawing.Point(530, 386);
- checkBoxAutoPick.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxAutoPick.Name = "checkBoxAutoPick";
- checkBoxAutoPick.Size = new System.Drawing.Size(192, 19);
- checkBoxAutoPick.TabIndex = 5;
- checkBoxAutoPick.Text = "Automatically pick for new files";
- checkBoxAutoPick.UseVisualStyleBackColor = true;
+ this.checkBoxAutoPick.AutoSize = true;
+ this.checkBoxAutoPick.Checked = true;
+ this.checkBoxAutoPick.CheckState = System.Windows.Forms.CheckState.Checked;
+ this.checkBoxAutoPick.Location = new System.Drawing.Point(530, 386);
+ this.checkBoxAutoPick.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxAutoPick.Name = "checkBoxAutoPick";
+ this.checkBoxAutoPick.Size = new System.Drawing.Size(249, 24);
+ this.checkBoxAutoPick.TabIndex = 5;
+ this.checkBoxAutoPick.Text = "Automatically pick for new files";
+ this.checkBoxAutoPick.UseVisualStyleBackColor = true;
//
// checkBoxMaskPrio
//
- checkBoxMaskPrio.AutoSize = true;
- checkBoxMaskPrio.Location = new System.Drawing.Point(213, 388);
- checkBoxMaskPrio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxMaskPrio.Name = "checkBoxMaskPrio";
- checkBoxMaskPrio.Size = new System.Drawing.Size(192, 19);
- checkBoxMaskPrio.TabIndex = 4;
- checkBoxMaskPrio.Text = "Mask has priority before history";
- checkBoxMaskPrio.UseVisualStyleBackColor = true;
+ this.checkBoxMaskPrio.AutoSize = true;
+ this.checkBoxMaskPrio.Location = new System.Drawing.Point(213, 388);
+ this.checkBoxMaskPrio.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxMaskPrio.Name = "checkBoxMaskPrio";
+ this.checkBoxMaskPrio.Size = new System.Drawing.Size(253, 24);
+ this.checkBoxMaskPrio.TabIndex = 4;
+ this.checkBoxMaskPrio.Text = "Mask has priority before history";
+ this.checkBoxMaskPrio.UseVisualStyleBackColor = true;
//
// buttonDelete
//
- buttonDelete.Location = new System.Drawing.Point(12, 380);
- buttonDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new System.Drawing.Size(112, 35);
- buttonDelete.TabIndex = 3;
- buttonDelete.Text = "Delete";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += OnBtnDeleteClick;
+ this.buttonDelete.Location = new System.Drawing.Point(12, 380);
+ this.buttonDelete.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonDelete.Name = "buttonDelete";
+ this.buttonDelete.Size = new System.Drawing.Size(112, 35);
+ this.buttonDelete.TabIndex = 3;
+ this.buttonDelete.Text = "Delete";
+ this.buttonDelete.UseVisualStyleBackColor = true;
+ this.buttonDelete.Click += new System.EventHandler(this.OnBtnDeleteClick);
//
// dataGridViewColumnizer
//
- dataGridViewColumnizer.AllowUserToResizeRows = false;
- dataGridViewColumnizer.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
- dataGridViewColumnizer.BackgroundColor = System.Drawing.SystemColors.ControlLight;
- dataGridViewColumnizer.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewColumnizer.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { columnFileMask, columnColumnizer });
- dataGridViewColumnizer.Dock = System.Windows.Forms.DockStyle.Top;
- dataGridViewColumnizer.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
- dataGridViewColumnizer.Location = new System.Drawing.Point(4, 5);
- dataGridViewColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- dataGridViewColumnizer.Name = "dataGridViewColumnizer";
- dataGridViewColumnizer.RowHeadersWidth = 62;
- dataGridViewColumnizer.Size = new System.Drawing.Size(934, 365);
- dataGridViewColumnizer.TabIndex = 2;
- dataGridViewColumnizer.RowsAdded += OnDataGridViewColumnizerRowsAdded;
+ this.dataGridViewColumnizer.AllowUserToResizeRows = false;
+ this.dataGridViewColumnizer.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dataGridViewColumnizer.BackgroundColor = System.Drawing.SystemColors.ControlLight;
+ this.dataGridViewColumnizer.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridViewColumnizer.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.columnFileMask,
+ this.columnColumnizer});
+ this.dataGridViewColumnizer.Dock = System.Windows.Forms.DockStyle.Top;
+ this.dataGridViewColumnizer.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
+ this.dataGridViewColumnizer.Location = new System.Drawing.Point(4, 5);
+ this.dataGridViewColumnizer.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.dataGridViewColumnizer.Name = "dataGridViewColumnizer";
+ this.dataGridViewColumnizer.RowHeadersWidth = 62;
+ this.dataGridViewColumnizer.Size = new System.Drawing.Size(934, 365);
+ this.dataGridViewColumnizer.TabIndex = 2;
+ this.dataGridViewColumnizer.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.OnDataGridViewColumnizerRowsAdded);
//
// columnFileMask
//
- columnFileMask.HeaderText = "File name mask (RegEx)";
- columnFileMask.MinimumWidth = 40;
- columnFileMask.Name = "columnFileMask";
+ this.columnFileMask.HeaderText = "File name mask (RegEx)";
+ this.columnFileMask.MinimumWidth = 40;
+ this.columnFileMask.Name = "columnFileMask";
//
// columnColumnizer
//
- columnColumnizer.HeaderText = "Columnizer";
- columnColumnizer.MinimumWidth = 230;
- columnColumnizer.Name = "columnColumnizer";
+ this.columnColumnizer.HeaderText = "Columnizer";
+ this.columnColumnizer.MinimumWidth = 230;
+ this.columnColumnizer.Name = "columnColumnizer";
//
// tabPageHighlightMask
//
- tabPageHighlightMask.Controls.Add(dataGridViewHighlightMask);
- tabPageHighlightMask.Location = new System.Drawing.Point(4, 24);
- tabPageHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageHighlightMask.Name = "tabPageHighlightMask";
- tabPageHighlightMask.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageHighlightMask.Size = new System.Drawing.Size(942, 440);
- tabPageHighlightMask.TabIndex = 8;
- tabPageHighlightMask.Text = "Highlight";
- tabPageHighlightMask.UseVisualStyleBackColor = true;
+ this.tabPageHighlightMask.Controls.Add(this.dataGridViewHighlightMask);
+ this.tabPageHighlightMask.Location = new System.Drawing.Point(4, 29);
+ this.tabPageHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageHighlightMask.Name = "tabPageHighlightMask";
+ this.tabPageHighlightMask.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageHighlightMask.Size = new System.Drawing.Size(942, 435);
+ this.tabPageHighlightMask.TabIndex = 8;
+ this.tabPageHighlightMask.Text = "Highlight";
+ this.tabPageHighlightMask.UseVisualStyleBackColor = true;
//
// dataGridViewHighlightMask
//
- dataGridViewHighlightMask.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
- dataGridViewHighlightMask.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridViewHighlightMask.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { columnFileName, columnHighlightGroup });
- dataGridViewHighlightMask.Dock = System.Windows.Forms.DockStyle.Fill;
- dataGridViewHighlightMask.Location = new System.Drawing.Point(4, 5);
- dataGridViewHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- dataGridViewHighlightMask.Name = "dataGridViewHighlightMask";
- dataGridViewHighlightMask.RowHeadersWidth = 62;
- dataGridViewHighlightMask.Size = new System.Drawing.Size(934, 430);
- dataGridViewHighlightMask.TabIndex = 0;
+ this.dataGridViewHighlightMask.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dataGridViewHighlightMask.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ this.dataGridViewHighlightMask.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.columnFileName,
+ this.columnHighlightGroup});
+ this.dataGridViewHighlightMask.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.dataGridViewHighlightMask.Location = new System.Drawing.Point(4, 5);
+ this.dataGridViewHighlightMask.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.dataGridViewHighlightMask.Name = "dataGridViewHighlightMask";
+ this.dataGridViewHighlightMask.RowHeadersWidth = 62;
+ this.dataGridViewHighlightMask.Size = new System.Drawing.Size(934, 425);
+ this.dataGridViewHighlightMask.TabIndex = 0;
//
// columnFileName
//
- columnFileName.HeaderText = "File name mask (RegEx)";
- columnFileName.MinimumWidth = 40;
- columnFileName.Name = "columnFileName";
+ this.columnFileName.HeaderText = "File name mask (RegEx)";
+ this.columnFileName.MinimumWidth = 40;
+ this.columnFileName.Name = "columnFileName";
//
// columnHighlightGroup
//
- columnHighlightGroup.HeaderText = "Highlight group";
- columnHighlightGroup.MinimumWidth = 50;
- columnHighlightGroup.Name = "columnHighlightGroup";
+ this.columnHighlightGroup.HeaderText = "Highlight group";
+ this.columnHighlightGroup.MinimumWidth = 50;
+ this.columnHighlightGroup.Name = "columnHighlightGroup";
//
// tabPageMultiFile
//
- tabPageMultiFile.Controls.Add(groupBoxDefaultFileNamePattern);
- tabPageMultiFile.Controls.Add(labelHintMultiFile);
- tabPageMultiFile.Controls.Add(labelNoteMultiFile);
- tabPageMultiFile.Controls.Add(groupBoxWhenOpeningMultiFile);
- tabPageMultiFile.Location = new System.Drawing.Point(4, 24);
- tabPageMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageMultiFile.Name = "tabPageMultiFile";
- tabPageMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageMultiFile.Size = new System.Drawing.Size(942, 440);
- tabPageMultiFile.TabIndex = 4;
- tabPageMultiFile.Text = "MultiFile";
- tabPageMultiFile.UseVisualStyleBackColor = true;
+ this.tabPageMultiFile.Controls.Add(this.groupBoxDefaultFileNamePattern);
+ this.tabPageMultiFile.Controls.Add(this.labelHintMultiFile);
+ this.tabPageMultiFile.Controls.Add(this.labelNoteMultiFile);
+ this.tabPageMultiFile.Controls.Add(this.groupBoxWhenOpeningMultiFile);
+ this.tabPageMultiFile.Location = new System.Drawing.Point(4, 29);
+ this.tabPageMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageMultiFile.Name = "tabPageMultiFile";
+ this.tabPageMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageMultiFile.Size = new System.Drawing.Size(942, 435);
+ this.tabPageMultiFile.TabIndex = 4;
+ this.tabPageMultiFile.Text = "MultiFile";
+ this.tabPageMultiFile.UseVisualStyleBackColor = true;
//
// groupBoxDefaultFileNamePattern
//
- groupBoxDefaultFileNamePattern.Controls.Add(labelMaxDays);
- groupBoxDefaultFileNamePattern.Controls.Add(labelPattern);
- groupBoxDefaultFileNamePattern.Controls.Add(upDownMultifileDays);
- groupBoxDefaultFileNamePattern.Controls.Add(textBoxMultifilePattern);
- groupBoxDefaultFileNamePattern.Location = new System.Drawing.Point(364, 28);
- groupBoxDefaultFileNamePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDefaultFileNamePattern.Name = "groupBoxDefaultFileNamePattern";
- groupBoxDefaultFileNamePattern.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxDefaultFileNamePattern.Size = new System.Drawing.Size(436, 154);
- groupBoxDefaultFileNamePattern.TabIndex = 3;
- groupBoxDefaultFileNamePattern.TabStop = false;
- groupBoxDefaultFileNamePattern.Text = "Default filename pattern";
+ this.groupBoxDefaultFileNamePattern.Controls.Add(this.labelMaxDays);
+ this.groupBoxDefaultFileNamePattern.Controls.Add(this.labelPattern);
+ this.groupBoxDefaultFileNamePattern.Controls.Add(this.upDownMultifileDays);
+ this.groupBoxDefaultFileNamePattern.Controls.Add(this.textBoxMultifilePattern);
+ this.groupBoxDefaultFileNamePattern.Location = new System.Drawing.Point(364, 28);
+ this.groupBoxDefaultFileNamePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDefaultFileNamePattern.Name = "groupBoxDefaultFileNamePattern";
+ this.groupBoxDefaultFileNamePattern.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxDefaultFileNamePattern.Size = new System.Drawing.Size(436, 154);
+ this.groupBoxDefaultFileNamePattern.TabIndex = 3;
+ this.groupBoxDefaultFileNamePattern.TabStop = false;
+ this.groupBoxDefaultFileNamePattern.Text = "Default filename pattern";
//
// labelMaxDays
//
- labelMaxDays.AutoSize = true;
- labelMaxDays.Location = new System.Drawing.Point(10, 75);
- labelMaxDays.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelMaxDays.Name = "labelMaxDays";
- labelMaxDays.Size = new System.Drawing.Size(60, 15);
- labelMaxDays.TabIndex = 3;
- labelMaxDays.Text = "Max days:";
+ this.labelMaxDays.AutoSize = true;
+ this.labelMaxDays.Location = new System.Drawing.Point(10, 75);
+ this.labelMaxDays.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelMaxDays.Name = "labelMaxDays";
+ this.labelMaxDays.Size = new System.Drawing.Size(79, 20);
+ this.labelMaxDays.TabIndex = 3;
+ this.labelMaxDays.Text = "Max days:";
//
// labelPattern
//
- labelPattern.AutoSize = true;
- labelPattern.Location = new System.Drawing.Point(10, 37);
- labelPattern.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelPattern.Name = "labelPattern";
- labelPattern.Size = new System.Drawing.Size(48, 15);
- labelPattern.TabIndex = 2;
- labelPattern.Text = "Pattern:";
+ this.labelPattern.AutoSize = true;
+ this.labelPattern.Location = new System.Drawing.Point(10, 37);
+ this.labelPattern.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelPattern.Name = "labelPattern";
+ this.labelPattern.Size = new System.Drawing.Size(65, 20);
+ this.labelPattern.TabIndex = 2;
+ this.labelPattern.Text = "Pattern:";
//
// upDownMultifileDays
//
- upDownMultifileDays.Location = new System.Drawing.Point(102, 72);
- upDownMultifileDays.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownMultifileDays.Maximum = new decimal(new int[] { 40, 0, 0, 0 });
- upDownMultifileDays.Name = "upDownMultifileDays";
- helpProvider.SetShowHelp(upDownMultifileDays, false);
- upDownMultifileDays.Size = new System.Drawing.Size(92, 23);
- upDownMultifileDays.TabIndex = 1;
- upDownMultifileDays.Value = new decimal(new int[] { 1, 0, 0, 0 });
+ this.upDownMultifileDays.Location = new System.Drawing.Point(102, 72);
+ this.upDownMultifileDays.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownMultifileDays.Maximum = new decimal(new int[] {
+ 40,
+ 0,
+ 0,
+ 0});
+ this.upDownMultifileDays.Name = "upDownMultifileDays";
+ this.helpProvider.SetShowHelp(this.upDownMultifileDays, false);
+ this.upDownMultifileDays.Size = new System.Drawing.Size(92, 26);
+ this.upDownMultifileDays.TabIndex = 1;
+ this.upDownMultifileDays.Value = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
//
// textBoxMultifilePattern
//
- textBoxMultifilePattern.Location = new System.Drawing.Point(102, 32);
- textBoxMultifilePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- textBoxMultifilePattern.Name = "textBoxMultifilePattern";
- textBoxMultifilePattern.Size = new System.Drawing.Size(278, 23);
- textBoxMultifilePattern.TabIndex = 0;
- textBoxMultifilePattern.TextChanged += OnMultiFilePatternTextChanged;
+ this.textBoxMultifilePattern.Location = new System.Drawing.Point(102, 32);
+ this.textBoxMultifilePattern.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.textBoxMultifilePattern.Name = "textBoxMultifilePattern";
+ this.textBoxMultifilePattern.Size = new System.Drawing.Size(278, 26);
+ this.textBoxMultifilePattern.TabIndex = 0;
+ this.textBoxMultifilePattern.TextChanged += new System.EventHandler(this.OnMultiFilePatternTextChanged);
//
// labelHintMultiFile
//
- labelHintMultiFile.Location = new System.Drawing.Point(6, 203);
- labelHintMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelHintMultiFile.Name = "labelHintMultiFile";
- labelHintMultiFile.Size = new System.Drawing.Size(304, 111);
- labelHintMultiFile.TabIndex = 2;
- labelHintMultiFile.Text = "Hint: Pressing the Shift key while dropping files onto LogExpert will switch the behaviour from single to multi and vice versa.";
+ this.labelHintMultiFile.Location = new System.Drawing.Point(6, 203);
+ this.labelHintMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelHintMultiFile.Name = "labelHintMultiFile";
+ this.labelHintMultiFile.Size = new System.Drawing.Size(304, 111);
+ this.labelHintMultiFile.TabIndex = 2;
+ this.labelHintMultiFile.Text = "Hint: Pressing the Shift key while dropping files onto LogExpert will switch the " +
+ "behaviour from single to multi and vice versa.";
//
// labelNoteMultiFile
//
- labelNoteMultiFile.Location = new System.Drawing.Point(6, 314);
- labelNoteMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelNoteMultiFile.Name = "labelNoteMultiFile";
- labelNoteMultiFile.Size = new System.Drawing.Size(705, 82);
- labelNoteMultiFile.TabIndex = 1;
- labelNoteMultiFile.Text = resources.GetString("labelNoteMultiFile.Text");
+ this.labelNoteMultiFile.Location = new System.Drawing.Point(6, 314);
+ this.labelNoteMultiFile.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelNoteMultiFile.Name = "labelNoteMultiFile";
+ this.labelNoteMultiFile.Size = new System.Drawing.Size(705, 82);
+ this.labelNoteMultiFile.TabIndex = 1;
+ this.labelNoteMultiFile.Text = resources.GetString("labelNoteMultiFile.Text");
//
// groupBoxWhenOpeningMultiFile
//
- groupBoxWhenOpeningMultiFile.Controls.Add(radioButtonAskWhatToDo);
- groupBoxWhenOpeningMultiFile.Controls.Add(radioButtonTreatAllFilesAsOneMultifile);
- groupBoxWhenOpeningMultiFile.Controls.Add(radioButtonLoadEveryFileIntoSeperatedTab);
- groupBoxWhenOpeningMultiFile.Location = new System.Drawing.Point(10, 28);
- groupBoxWhenOpeningMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxWhenOpeningMultiFile.Name = "groupBoxWhenOpeningMultiFile";
- groupBoxWhenOpeningMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxWhenOpeningMultiFile.Size = new System.Drawing.Size(300, 154);
- groupBoxWhenOpeningMultiFile.TabIndex = 0;
- groupBoxWhenOpeningMultiFile.TabStop = false;
- groupBoxWhenOpeningMultiFile.Text = "When opening multiple files...";
+ this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonAskWhatToDo);
+ this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonTreatAllFilesAsOneMultifile);
+ this.groupBoxWhenOpeningMultiFile.Controls.Add(this.radioButtonLoadEveryFileIntoSeperatedTab);
+ this.groupBoxWhenOpeningMultiFile.Location = new System.Drawing.Point(10, 28);
+ this.groupBoxWhenOpeningMultiFile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxWhenOpeningMultiFile.Name = "groupBoxWhenOpeningMultiFile";
+ this.groupBoxWhenOpeningMultiFile.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxWhenOpeningMultiFile.Size = new System.Drawing.Size(300, 154);
+ this.groupBoxWhenOpeningMultiFile.TabIndex = 0;
+ this.groupBoxWhenOpeningMultiFile.TabStop = false;
+ this.groupBoxWhenOpeningMultiFile.Text = "When opening multiple files...";
//
// radioButtonAskWhatToDo
//
- radioButtonAskWhatToDo.AutoSize = true;
- radioButtonAskWhatToDo.Location = new System.Drawing.Point(10, 105);
- radioButtonAskWhatToDo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonAskWhatToDo.Name = "radioButtonAskWhatToDo";
- radioButtonAskWhatToDo.Size = new System.Drawing.Size(104, 19);
- radioButtonAskWhatToDo.TabIndex = 2;
- radioButtonAskWhatToDo.TabStop = true;
- radioButtonAskWhatToDo.Text = "Ask what to do";
- radioButtonAskWhatToDo.UseVisualStyleBackColor = true;
+ this.radioButtonAskWhatToDo.AutoSize = true;
+ this.radioButtonAskWhatToDo.Location = new System.Drawing.Point(10, 105);
+ this.radioButtonAskWhatToDo.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonAskWhatToDo.Name = "radioButtonAskWhatToDo";
+ this.radioButtonAskWhatToDo.Size = new System.Drawing.Size(139, 24);
+ this.radioButtonAskWhatToDo.TabIndex = 2;
+ this.radioButtonAskWhatToDo.TabStop = true;
+ this.radioButtonAskWhatToDo.Text = "Ask what to do";
+ this.radioButtonAskWhatToDo.UseVisualStyleBackColor = true;
//
// radioButtonTreatAllFilesAsOneMultifile
//
- radioButtonTreatAllFilesAsOneMultifile.AutoSize = true;
- radioButtonTreatAllFilesAsOneMultifile.Location = new System.Drawing.Point(10, 68);
- radioButtonTreatAllFilesAsOneMultifile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonTreatAllFilesAsOneMultifile.Name = "radioButtonTreatAllFilesAsOneMultifile";
- radioButtonTreatAllFilesAsOneMultifile.Size = new System.Drawing.Size(181, 19);
- radioButtonTreatAllFilesAsOneMultifile.TabIndex = 1;
- radioButtonTreatAllFilesAsOneMultifile.TabStop = true;
- radioButtonTreatAllFilesAsOneMultifile.Text = "Treat all files as one 'MultiFile'";
- radioButtonTreatAllFilesAsOneMultifile.UseVisualStyleBackColor = true;
+ this.radioButtonTreatAllFilesAsOneMultifile.AutoSize = true;
+ this.radioButtonTreatAllFilesAsOneMultifile.Location = new System.Drawing.Point(10, 68);
+ this.radioButtonTreatAllFilesAsOneMultifile.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonTreatAllFilesAsOneMultifile.Name = "radioButtonTreatAllFilesAsOneMultifile";
+ this.radioButtonTreatAllFilesAsOneMultifile.Size = new System.Drawing.Size(242, 24);
+ this.radioButtonTreatAllFilesAsOneMultifile.TabIndex = 1;
+ this.radioButtonTreatAllFilesAsOneMultifile.TabStop = true;
+ this.radioButtonTreatAllFilesAsOneMultifile.Text = "Treat all files as one \'MultiFile\'";
+ this.radioButtonTreatAllFilesAsOneMultifile.UseVisualStyleBackColor = true;
//
// radioButtonLoadEveryFileIntoSeperatedTab
//
- radioButtonLoadEveryFileIntoSeperatedTab.AutoSize = true;
- radioButtonLoadEveryFileIntoSeperatedTab.Location = new System.Drawing.Point(10, 31);
- radioButtonLoadEveryFileIntoSeperatedTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonLoadEveryFileIntoSeperatedTab.Name = "radioButtonLoadEveryFileIntoSeperatedTab";
- radioButtonLoadEveryFileIntoSeperatedTab.Size = new System.Drawing.Size(201, 19);
- radioButtonLoadEveryFileIntoSeperatedTab.TabIndex = 0;
- radioButtonLoadEveryFileIntoSeperatedTab.TabStop = true;
- radioButtonLoadEveryFileIntoSeperatedTab.Text = "Load every file into a separate tab";
- radioButtonLoadEveryFileIntoSeperatedTab.UseVisualStyleBackColor = true;
+ this.radioButtonLoadEveryFileIntoSeperatedTab.AutoSize = true;
+ this.radioButtonLoadEveryFileIntoSeperatedTab.Location = new System.Drawing.Point(10, 31);
+ this.radioButtonLoadEveryFileIntoSeperatedTab.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonLoadEveryFileIntoSeperatedTab.Name = "radioButtonLoadEveryFileIntoSeperatedTab";
+ this.radioButtonLoadEveryFileIntoSeperatedTab.Size = new System.Drawing.Size(272, 24);
+ this.radioButtonLoadEveryFileIntoSeperatedTab.TabIndex = 0;
+ this.radioButtonLoadEveryFileIntoSeperatedTab.TabStop = true;
+ this.radioButtonLoadEveryFileIntoSeperatedTab.Text = "Load every file into a separate tab";
+ this.radioButtonLoadEveryFileIntoSeperatedTab.UseVisualStyleBackColor = true;
//
// tabPagePlugins
//
- tabPagePlugins.Controls.Add(groupBoxPlugins);
- tabPagePlugins.Controls.Add(groupBoxSettings);
- tabPagePlugins.Location = new System.Drawing.Point(4, 24);
- tabPagePlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPagePlugins.Name = "tabPagePlugins";
- tabPagePlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPagePlugins.Size = new System.Drawing.Size(942, 440);
- tabPagePlugins.TabIndex = 5;
- tabPagePlugins.Text = "Plugins";
- tabPagePlugins.UseVisualStyleBackColor = true;
+ this.tabPagePlugins.Controls.Add(this.groupBoxPlugins);
+ this.tabPagePlugins.Controls.Add(this.groupBoxSettings);
+ this.tabPagePlugins.Location = new System.Drawing.Point(4, 29);
+ this.tabPagePlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPagePlugins.Name = "tabPagePlugins";
+ this.tabPagePlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPagePlugins.Size = new System.Drawing.Size(942, 435);
+ this.tabPagePlugins.TabIndex = 5;
+ this.tabPagePlugins.Text = "Plugins";
+ this.tabPagePlugins.UseVisualStyleBackColor = true;
//
// groupBoxPlugins
//
- groupBoxPlugins.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
- groupBoxPlugins.Controls.Add(listBoxPlugin);
- groupBoxPlugins.Location = new System.Drawing.Point(10, 23);
- groupBoxPlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxPlugins.Name = "groupBoxPlugins";
- groupBoxPlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxPlugins.Size = new System.Drawing.Size(342, 400);
- groupBoxPlugins.TabIndex = 3;
- groupBoxPlugins.TabStop = false;
- groupBoxPlugins.Text = "Plugins";
+ this.groupBoxPlugins.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxPlugins.Controls.Add(this.listBoxPlugin);
+ this.groupBoxPlugins.Location = new System.Drawing.Point(10, 23);
+ this.groupBoxPlugins.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxPlugins.Name = "groupBoxPlugins";
+ this.groupBoxPlugins.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxPlugins.Size = new System.Drawing.Size(342, 395);
+ this.groupBoxPlugins.TabIndex = 3;
+ this.groupBoxPlugins.TabStop = false;
+ this.groupBoxPlugins.Text = "Plugins";
//
// listBoxPlugin
//
- listBoxPlugin.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
- listBoxPlugin.DisplayMember = "Text";
- listBoxPlugin.FormattingEnabled = true;
- listBoxPlugin.ItemHeight = 15;
- listBoxPlugin.Location = new System.Drawing.Point(9, 29);
- listBoxPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- listBoxPlugin.Name = "listBoxPlugin";
- listBoxPlugin.Size = new System.Drawing.Size(322, 349);
- listBoxPlugin.TabIndex = 0;
- listBoxPlugin.ValueMember = "Text";
- listBoxPlugin.SelectedIndexChanged += OnListBoxPluginSelectedIndexChanged;
+ this.listBoxPlugin.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.listBoxPlugin.DisplayMember = "Text";
+ this.listBoxPlugin.FormattingEnabled = true;
+ this.listBoxPlugin.ItemHeight = 20;
+ this.listBoxPlugin.Location = new System.Drawing.Point(9, 29);
+ this.listBoxPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.listBoxPlugin.Name = "listBoxPlugin";
+ this.listBoxPlugin.Size = new System.Drawing.Size(322, 344);
+ this.listBoxPlugin.TabIndex = 0;
+ this.listBoxPlugin.ValueMember = "Text";
+ this.listBoxPlugin.SelectedIndexChanged += new System.EventHandler(this.OnListBoxPluginSelectedIndexChanged);
//
// groupBoxSettings
//
- groupBoxSettings.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
- groupBoxSettings.Controls.Add(panelPlugin);
- groupBoxSettings.Location = new System.Drawing.Point(362, 23);
- groupBoxSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxSettings.Name = "groupBoxSettings";
- groupBoxSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxSettings.Size = new System.Drawing.Size(567, 400);
- groupBoxSettings.TabIndex = 2;
- groupBoxSettings.TabStop = false;
- groupBoxSettings.Text = "Settings";
+ this.groupBoxSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.groupBoxSettings.Controls.Add(this.panelPlugin);
+ this.groupBoxSettings.Location = new System.Drawing.Point(362, 23);
+ this.groupBoxSettings.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxSettings.Name = "groupBoxSettings";
+ this.groupBoxSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxSettings.Size = new System.Drawing.Size(567, 395);
+ this.groupBoxSettings.TabIndex = 2;
+ this.groupBoxSettings.TabStop = false;
+ this.groupBoxSettings.Text = "Settings";
//
// panelPlugin
//
- panelPlugin.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
- panelPlugin.AutoScroll = true;
- panelPlugin.Controls.Add(buttonConfigPlugin);
- panelPlugin.Location = new System.Drawing.Point(9, 29);
- panelPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- panelPlugin.Name = "panelPlugin";
- panelPlugin.Size = new System.Drawing.Size(549, 362);
- panelPlugin.TabIndex = 1;
+ this.panelPlugin.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panelPlugin.AutoScroll = true;
+ this.panelPlugin.Controls.Add(this.buttonConfigPlugin);
+ this.panelPlugin.Location = new System.Drawing.Point(9, 29);
+ this.panelPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.panelPlugin.Name = "panelPlugin";
+ this.panelPlugin.Size = new System.Drawing.Size(549, 357);
+ this.panelPlugin.TabIndex = 1;
//
// buttonConfigPlugin
//
- buttonConfigPlugin.Location = new System.Drawing.Point(164, 163);
- buttonConfigPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonConfigPlugin.Name = "buttonConfigPlugin";
- buttonConfigPlugin.Size = new System.Drawing.Size(170, 35);
- buttonConfigPlugin.TabIndex = 0;
- buttonConfigPlugin.Text = "Configure...";
- buttonConfigPlugin.UseVisualStyleBackColor = true;
- buttonConfigPlugin.Click += OnBtnConfigPluginClick;
+ this.buttonConfigPlugin.Location = new System.Drawing.Point(164, 163);
+ this.buttonConfigPlugin.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonConfigPlugin.Name = "buttonConfigPlugin";
+ this.buttonConfigPlugin.Size = new System.Drawing.Size(170, 35);
+ this.buttonConfigPlugin.TabIndex = 0;
+ this.buttonConfigPlugin.Text = "Configure...";
+ this.buttonConfigPlugin.UseVisualStyleBackColor = true;
+ this.buttonConfigPlugin.Click += new System.EventHandler(this.OnBtnConfigPluginClick);
//
// tabPageSessions
//
- tabPageSessions.Controls.Add(checkBoxPortableMode);
- tabPageSessions.Controls.Add(checkBoxSaveFilter);
- tabPageSessions.Controls.Add(groupBoxPersistantFileLocation);
- tabPageSessions.Controls.Add(checkBoxSaveSessions);
- tabPageSessions.Location = new System.Drawing.Point(4, 24);
- tabPageSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageSessions.Name = "tabPageSessions";
- tabPageSessions.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageSessions.Size = new System.Drawing.Size(942, 440);
- tabPageSessions.TabIndex = 6;
- tabPageSessions.Text = "Persistence";
- tabPageSessions.UseVisualStyleBackColor = true;
+ this.tabPageSessions.Controls.Add(this.checkBoxPortableMode);
+ this.tabPageSessions.Controls.Add(this.checkBoxSaveFilter);
+ this.tabPageSessions.Controls.Add(this.groupBoxPersistantFileLocation);
+ this.tabPageSessions.Controls.Add(this.checkBoxSaveSessions);
+ this.tabPageSessions.Location = new System.Drawing.Point(4, 29);
+ this.tabPageSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageSessions.Name = "tabPageSessions";
+ this.tabPageSessions.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageSessions.Size = new System.Drawing.Size(942, 435);
+ this.tabPageSessions.TabIndex = 6;
+ this.tabPageSessions.Text = "Persistence";
+ this.tabPageSessions.UseVisualStyleBackColor = true;
//
// checkBoxPortableMode
//
- checkBoxPortableMode.AutoSize = true;
- checkBoxPortableMode.Location = new System.Drawing.Point(34, 377);
- checkBoxPortableMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxPortableMode.Name = "checkBoxPortableMode";
- checkBoxPortableMode.Size = new System.Drawing.Size(150, 19);
- checkBoxPortableMode.TabIndex = 3;
- checkBoxPortableMode.Text = "Activate Portable Mode";
- toolTip.SetToolTip(checkBoxPortableMode, "If this mode is activated, the save file will be loaded from the Executable Location");
- checkBoxPortableMode.UseVisualStyleBackColor = true;
- checkBoxPortableMode.CheckedChanged += OnPortableModeCheckedChanged;
+ this.checkBoxPortableMode.AutoSize = true;
+ this.checkBoxPortableMode.Location = new System.Drawing.Point(34, 377);
+ this.checkBoxPortableMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxPortableMode.Name = "checkBoxPortableMode";
+ this.checkBoxPortableMode.Size = new System.Drawing.Size(199, 24);
+ this.checkBoxPortableMode.TabIndex = 3;
+ this.checkBoxPortableMode.Text = "Activate Portable Mode";
+ this.toolTip.SetToolTip(this.checkBoxPortableMode, "If this mode is activated, the save file will be loaded from the Executable Locat" +
+ "ion");
+ this.checkBoxPortableMode.UseVisualStyleBackColor = true;
+ this.checkBoxPortableMode.CheckedChanged += new System.EventHandler(this.OnPortableModeCheckedChanged);
//
// checkBoxSaveFilter
//
- checkBoxSaveFilter.AutoSize = true;
- checkBoxSaveFilter.Location = new System.Drawing.Point(34, 74);
- checkBoxSaveFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxSaveFilter.Name = "checkBoxSaveFilter";
- checkBoxSaveFilter.Size = new System.Drawing.Size(217, 19);
- checkBoxSaveFilter.TabIndex = 2;
- checkBoxSaveFilter.Text = " Save and restore filter and filter tabs";
- checkBoxSaveFilter.UseVisualStyleBackColor = true;
+ this.checkBoxSaveFilter.AutoSize = true;
+ this.checkBoxSaveFilter.Location = new System.Drawing.Point(34, 74);
+ this.checkBoxSaveFilter.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxSaveFilter.Name = "checkBoxSaveFilter";
+ this.checkBoxSaveFilter.Size = new System.Drawing.Size(294, 24);
+ this.checkBoxSaveFilter.TabIndex = 2;
+ this.checkBoxSaveFilter.Text = " Save and restore filter and filter tabs";
+ this.checkBoxSaveFilter.UseVisualStyleBackColor = true;
//
// groupBoxPersistantFileLocation
//
- groupBoxPersistantFileLocation.Controls.Add(labelSessionSaveOwnDir);
- groupBoxPersistantFileLocation.Controls.Add(buttonSessionSaveDir);
- groupBoxPersistantFileLocation.Controls.Add(radioButtonSessionSaveOwn);
- groupBoxPersistantFileLocation.Controls.Add(radioButtonsessionSaveDocuments);
- groupBoxPersistantFileLocation.Controls.Add(radioButtonSessionSameDir);
- groupBoxPersistantFileLocation.Controls.Add(radioButtonSessionApplicationStartupDir);
- groupBoxPersistantFileLocation.Location = new System.Drawing.Point(34, 134);
- groupBoxPersistantFileLocation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxPersistantFileLocation.Name = "groupBoxPersistantFileLocation";
- groupBoxPersistantFileLocation.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxPersistantFileLocation.Size = new System.Drawing.Size(411, 211);
- groupBoxPersistantFileLocation.TabIndex = 1;
- groupBoxPersistantFileLocation.TabStop = false;
- groupBoxPersistantFileLocation.Text = "Persistence file location";
+ this.groupBoxPersistantFileLocation.Controls.Add(this.labelSessionSaveOwnDir);
+ this.groupBoxPersistantFileLocation.Controls.Add(this.buttonSessionSaveDir);
+ this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionSaveOwn);
+ this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonsessionSaveDocuments);
+ this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionSameDir);
+ this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionApplicationStartupDir);
+ this.groupBoxPersistantFileLocation.Location = new System.Drawing.Point(34, 134);
+ this.groupBoxPersistantFileLocation.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxPersistantFileLocation.Name = "groupBoxPersistantFileLocation";
+ this.groupBoxPersistantFileLocation.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxPersistantFileLocation.Size = new System.Drawing.Size(411, 211);
+ this.groupBoxPersistantFileLocation.TabIndex = 1;
+ this.groupBoxPersistantFileLocation.TabStop = false;
+ this.groupBoxPersistantFileLocation.Text = "Persistence file location";
//
// labelSessionSaveOwnDir
//
- labelSessionSaveOwnDir.Location = new System.Drawing.Point(39, 142);
- labelSessionSaveOwnDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelSessionSaveOwnDir.Name = "labelSessionSaveOwnDir";
- labelSessionSaveOwnDir.Size = new System.Drawing.Size(252, 31);
- labelSessionSaveOwnDir.TabIndex = 4;
- labelSessionSaveOwnDir.Text = "sessionSaveOwnDirLabel";
+ this.labelSessionSaveOwnDir.Location = new System.Drawing.Point(39, 142);
+ this.labelSessionSaveOwnDir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelSessionSaveOwnDir.Name = "labelSessionSaveOwnDir";
+ this.labelSessionSaveOwnDir.Size = new System.Drawing.Size(252, 31);
+ this.labelSessionSaveOwnDir.TabIndex = 4;
+ this.labelSessionSaveOwnDir.Text = "sessionSaveOwnDirLabel";
//
// buttonSessionSaveDir
//
- buttonSessionSaveDir.Location = new System.Drawing.Point(357, 102);
- buttonSessionSaveDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonSessionSaveDir.Name = "buttonSessionSaveDir";
- buttonSessionSaveDir.Size = new System.Drawing.Size(45, 31);
- buttonSessionSaveDir.TabIndex = 3;
- buttonSessionSaveDir.Text = "...";
- buttonSessionSaveDir.UseVisualStyleBackColor = true;
- buttonSessionSaveDir.Click += OnBtnSessionSaveDirClick;
+ this.buttonSessionSaveDir.Location = new System.Drawing.Point(357, 102);
+ this.buttonSessionSaveDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonSessionSaveDir.Name = "buttonSessionSaveDir";
+ this.buttonSessionSaveDir.Size = new System.Drawing.Size(45, 31);
+ this.buttonSessionSaveDir.TabIndex = 3;
+ this.buttonSessionSaveDir.Text = "...";
+ this.buttonSessionSaveDir.UseVisualStyleBackColor = true;
+ this.buttonSessionSaveDir.Click += new System.EventHandler(this.OnBtnSessionSaveDirClick);
//
// radioButtonSessionSaveOwn
//
- radioButtonSessionSaveOwn.AutoSize = true;
- radioButtonSessionSaveOwn.Location = new System.Drawing.Point(10, 105);
- radioButtonSessionSaveOwn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonSessionSaveOwn.Name = "radioButtonSessionSaveOwn";
- radioButtonSessionSaveOwn.Size = new System.Drawing.Size(100, 19);
- radioButtonSessionSaveOwn.TabIndex = 2;
- radioButtonSessionSaveOwn.TabStop = true;
- radioButtonSessionSaveOwn.Text = "Own directory";
- radioButtonSessionSaveOwn.UseVisualStyleBackColor = true;
+ this.radioButtonSessionSaveOwn.AutoSize = true;
+ this.radioButtonSessionSaveOwn.Location = new System.Drawing.Point(10, 105);
+ this.radioButtonSessionSaveOwn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonSessionSaveOwn.Name = "radioButtonSessionSaveOwn";
+ this.radioButtonSessionSaveOwn.Size = new System.Drawing.Size(130, 24);
+ this.radioButtonSessionSaveOwn.TabIndex = 2;
+ this.radioButtonSessionSaveOwn.TabStop = true;
+ this.radioButtonSessionSaveOwn.Text = "Own directory";
+ this.radioButtonSessionSaveOwn.UseVisualStyleBackColor = true;
//
// radioButtonsessionSaveDocuments
//
- radioButtonsessionSaveDocuments.AutoSize = true;
- radioButtonsessionSaveDocuments.Location = new System.Drawing.Point(10, 68);
- radioButtonsessionSaveDocuments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonsessionSaveDocuments.Name = "radioButtonsessionSaveDocuments";
- radioButtonsessionSaveDocuments.Size = new System.Drawing.Size(161, 19);
- radioButtonsessionSaveDocuments.TabIndex = 1;
- radioButtonsessionSaveDocuments.TabStop = true;
- radioButtonsessionSaveDocuments.Text = "MyDocuments/LogExpert";
- radioButtonsessionSaveDocuments.UseVisualStyleBackColor = true;
+ this.radioButtonsessionSaveDocuments.AutoSize = true;
+ this.radioButtonsessionSaveDocuments.Location = new System.Drawing.Point(10, 68);
+ this.radioButtonsessionSaveDocuments.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonsessionSaveDocuments.Name = "radioButtonsessionSaveDocuments";
+ this.radioButtonsessionSaveDocuments.Size = new System.Drawing.Size(213, 24);
+ this.radioButtonsessionSaveDocuments.TabIndex = 1;
+ this.radioButtonsessionSaveDocuments.TabStop = true;
+ this.radioButtonsessionSaveDocuments.Text = "MyDocuments/LogExpert";
+ this.radioButtonsessionSaveDocuments.UseVisualStyleBackColor = true;
//
// radioButtonSessionSameDir
//
- radioButtonSessionSameDir.AutoSize = true;
- radioButtonSessionSameDir.Location = new System.Drawing.Point(10, 31);
- radioButtonSessionSameDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonSessionSameDir.Name = "radioButtonSessionSameDir";
- radioButtonSessionSameDir.Size = new System.Drawing.Size(157, 19);
- radioButtonSessionSameDir.TabIndex = 0;
- radioButtonSessionSameDir.TabStop = true;
- radioButtonSessionSameDir.Text = "Same directory as log file";
- radioButtonSessionSameDir.UseVisualStyleBackColor = true;
+ this.radioButtonSessionSameDir.AutoSize = true;
+ this.radioButtonSessionSameDir.Location = new System.Drawing.Point(10, 31);
+ this.radioButtonSessionSameDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonSessionSameDir.Name = "radioButtonSessionSameDir";
+ this.radioButtonSessionSameDir.Size = new System.Drawing.Size(210, 24);
+ this.radioButtonSessionSameDir.TabIndex = 0;
+ this.radioButtonSessionSameDir.TabStop = true;
+ this.radioButtonSessionSameDir.Text = "Same directory as log file";
+ this.radioButtonSessionSameDir.UseVisualStyleBackColor = true;
//
// radioButtonSessionApplicationStartupDir
//
- radioButtonSessionApplicationStartupDir.AutoSize = true;
- radioButtonSessionApplicationStartupDir.Location = new System.Drawing.Point(8, 177);
- radioButtonSessionApplicationStartupDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- radioButtonSessionApplicationStartupDir.Name = "radioButtonSessionApplicationStartupDir";
- radioButtonSessionApplicationStartupDir.Size = new System.Drawing.Size(176, 19);
- radioButtonSessionApplicationStartupDir.TabIndex = 5;
- radioButtonSessionApplicationStartupDir.TabStop = true;
- radioButtonSessionApplicationStartupDir.Text = "Application startup directory";
- toolTip.SetToolTip(radioButtonSessionApplicationStartupDir, "This path is based on the executable and where it has been started from.");
- radioButtonSessionApplicationStartupDir.UseVisualStyleBackColor = true;
+ this.radioButtonSessionApplicationStartupDir.AutoSize = true;
+ this.radioButtonSessionApplicationStartupDir.Location = new System.Drawing.Point(8, 177);
+ this.radioButtonSessionApplicationStartupDir.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.radioButtonSessionApplicationStartupDir.Name = "radioButtonSessionApplicationStartupDir";
+ this.radioButtonSessionApplicationStartupDir.Size = new System.Drawing.Size(230, 24);
+ this.radioButtonSessionApplicationStartupDir.TabIndex = 5;
+ this.radioButtonSessionApplicationStartupDir.TabStop = true;
+ this.radioButtonSessionApplicationStartupDir.Text = "Application startup directory";
+ this.toolTip.SetToolTip(this.radioButtonSessionApplicationStartupDir, "This path is based on the executable and where it has been started from.");
+ this.radioButtonSessionApplicationStartupDir.UseVisualStyleBackColor = true;
//
// checkBoxSaveSessions
//
- checkBoxSaveSessions.AutoSize = true;
- checkBoxSaveSessions.Location = new System.Drawing.Point(34, 38);
- checkBoxSaveSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxSaveSessions.Name = "checkBoxSaveSessions";
- checkBoxSaveSessions.Size = new System.Drawing.Size(242, 19);
- checkBoxSaveSessions.TabIndex = 0;
- checkBoxSaveSessions.Text = "Automatically save persistence files (.lxp)";
- checkBoxSaveSessions.UseVisualStyleBackColor = true;
+ this.checkBoxSaveSessions.AutoSize = true;
+ this.checkBoxSaveSessions.Location = new System.Drawing.Point(34, 38);
+ this.checkBoxSaveSessions.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxSaveSessions.Name = "checkBoxSaveSessions";
+ this.checkBoxSaveSessions.Size = new System.Drawing.Size(321, 24);
+ this.checkBoxSaveSessions.TabIndex = 0;
+ this.checkBoxSaveSessions.Text = "Automatically save persistence files (.lxp)";
+ this.checkBoxSaveSessions.UseVisualStyleBackColor = true;
//
// tabPageMemory
//
- tabPageMemory.Controls.Add(groupBoxCPUAndStuff);
- tabPageMemory.Controls.Add(groupBoxLineBufferUsage);
- tabPageMemory.Location = new System.Drawing.Point(4, 24);
- tabPageMemory.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageMemory.Name = "tabPageMemory";
- tabPageMemory.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- tabPageMemory.Size = new System.Drawing.Size(942, 440);
- tabPageMemory.TabIndex = 7;
- tabPageMemory.Text = "Memory/CPU";
- tabPageMemory.UseVisualStyleBackColor = true;
+ this.tabPageMemory.Controls.Add(this.groupBoxCPUAndStuff);
+ this.tabPageMemory.Controls.Add(this.groupBoxLineBufferUsage);
+ this.tabPageMemory.Location = new System.Drawing.Point(4, 29);
+ this.tabPageMemory.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageMemory.Name = "tabPageMemory";
+ this.tabPageMemory.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.tabPageMemory.Size = new System.Drawing.Size(942, 435);
+ this.tabPageMemory.TabIndex = 7;
+ this.tabPageMemory.Text = "Memory/CPU";
+ this.tabPageMemory.UseVisualStyleBackColor = true;
//
// groupBoxCPUAndStuff
//
- groupBoxCPUAndStuff.Controls.Add(checkBoxLegacyReader);
- groupBoxCPUAndStuff.Controls.Add(checkBoxMultiThread);
- groupBoxCPUAndStuff.Controls.Add(labelFilePollingInterval);
- groupBoxCPUAndStuff.Controls.Add(upDownPollingInterval);
- groupBoxCPUAndStuff.Location = new System.Drawing.Point(408, 29);
- groupBoxCPUAndStuff.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxCPUAndStuff.Name = "groupBoxCPUAndStuff";
- groupBoxCPUAndStuff.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxCPUAndStuff.Size = new System.Drawing.Size(300, 197);
- groupBoxCPUAndStuff.TabIndex = 8;
- groupBoxCPUAndStuff.TabStop = false;
- groupBoxCPUAndStuff.Text = "CPU and stuff";
+ this.groupBoxCPUAndStuff.Controls.Add(this.checkBoxLegacyReader);
+ this.groupBoxCPUAndStuff.Controls.Add(this.checkBoxMultiThread);
+ this.groupBoxCPUAndStuff.Controls.Add(this.labelFilePollingInterval);
+ this.groupBoxCPUAndStuff.Controls.Add(this.upDownPollingInterval);
+ this.groupBoxCPUAndStuff.Location = new System.Drawing.Point(408, 29);
+ this.groupBoxCPUAndStuff.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxCPUAndStuff.Name = "groupBoxCPUAndStuff";
+ this.groupBoxCPUAndStuff.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxCPUAndStuff.Size = new System.Drawing.Size(300, 197);
+ this.groupBoxCPUAndStuff.TabIndex = 8;
+ this.groupBoxCPUAndStuff.TabStop = false;
+ this.groupBoxCPUAndStuff.Text = "CPU and stuff";
//
// checkBoxLegacyReader
//
- checkBoxLegacyReader.AutoSize = true;
- checkBoxLegacyReader.Location = new System.Drawing.Point(14, 138);
- checkBoxLegacyReader.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxLegacyReader.Name = "checkBoxLegacyReader";
- checkBoxLegacyReader.Size = new System.Drawing.Size(182, 19);
- checkBoxLegacyReader.TabIndex = 9;
- checkBoxLegacyReader.Text = "Use legacy file reader (slower)";
- toolTip.SetToolTip(checkBoxLegacyReader, "Slower but more compatible with strange linefeeds and encodings");
- checkBoxLegacyReader.UseVisualStyleBackColor = true;
+ this.checkBoxLegacyReader.AutoSize = true;
+ this.checkBoxLegacyReader.Location = new System.Drawing.Point(14, 138);
+ this.checkBoxLegacyReader.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxLegacyReader.Name = "checkBoxLegacyReader";
+ this.checkBoxLegacyReader.Size = new System.Drawing.Size(246, 24);
+ this.checkBoxLegacyReader.TabIndex = 9;
+ this.checkBoxLegacyReader.Text = "Use legacy file reader (slower)";
+ this.toolTip.SetToolTip(this.checkBoxLegacyReader, "Slower but more compatible with strange linefeeds and encodings");
+ this.checkBoxLegacyReader.UseVisualStyleBackColor = true;
//
// checkBoxMultiThread
//
- checkBoxMultiThread.AutoSize = true;
- checkBoxMultiThread.Location = new System.Drawing.Point(14, 103);
- checkBoxMultiThread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- checkBoxMultiThread.Name = "checkBoxMultiThread";
- checkBoxMultiThread.Size = new System.Drawing.Size(131, 19);
- checkBoxMultiThread.TabIndex = 5;
- checkBoxMultiThread.Text = "Multi threaded filter";
- checkBoxMultiThread.UseVisualStyleBackColor = true;
+ this.checkBoxMultiThread.AutoSize = true;
+ this.checkBoxMultiThread.Location = new System.Drawing.Point(14, 103);
+ this.checkBoxMultiThread.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxMultiThread.Name = "checkBoxMultiThread";
+ this.checkBoxMultiThread.Size = new System.Drawing.Size(170, 24);
+ this.checkBoxMultiThread.TabIndex = 5;
+ this.checkBoxMultiThread.Text = "Multi threaded filter";
+ this.checkBoxMultiThread.UseVisualStyleBackColor = true;
//
// labelFilePollingInterval
//
- labelFilePollingInterval.AutoSize = true;
- labelFilePollingInterval.Location = new System.Drawing.Point(9, 52);
- labelFilePollingInterval.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelFilePollingInterval.Name = "labelFilePollingInterval";
- labelFilePollingInterval.Size = new System.Drawing.Size(137, 15);
- labelFilePollingInterval.TabIndex = 7;
- labelFilePollingInterval.Text = "File polling interval (ms):";
+ this.labelFilePollingInterval.AutoSize = true;
+ this.labelFilePollingInterval.Location = new System.Drawing.Point(9, 52);
+ this.labelFilePollingInterval.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelFilePollingInterval.Name = "labelFilePollingInterval";
+ this.labelFilePollingInterval.Size = new System.Drawing.Size(176, 20);
+ this.labelFilePollingInterval.TabIndex = 7;
+ this.labelFilePollingInterval.Text = "File polling interval (ms):";
//
// upDownPollingInterval
//
- upDownPollingInterval.Location = new System.Drawing.Point(190, 49);
- upDownPollingInterval.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownPollingInterval.Maximum = new decimal(new int[] { 5000, 0, 0, 0 });
- upDownPollingInterval.Minimum = new decimal(new int[] { 20, 0, 0, 0 });
- upDownPollingInterval.Name = "upDownPollingInterval";
- upDownPollingInterval.Size = new System.Drawing.Size(86, 23);
- upDownPollingInterval.TabIndex = 6;
- upDownPollingInterval.Value = new decimal(new int[] { 20, 0, 0, 0 });
+ this.upDownPollingInterval.Location = new System.Drawing.Point(190, 49);
+ this.upDownPollingInterval.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownPollingInterval.Maximum = new decimal(new int[] {
+ 5000,
+ 0,
+ 0,
+ 0});
+ this.upDownPollingInterval.Minimum = new decimal(new int[] {
+ 20,
+ 0,
+ 0,
+ 0});
+ this.upDownPollingInterval.Name = "upDownPollingInterval";
+ this.upDownPollingInterval.Size = new System.Drawing.Size(86, 26);
+ this.upDownPollingInterval.TabIndex = 6;
+ this.upDownPollingInterval.Value = new decimal(new int[] {
+ 20,
+ 0,
+ 0,
+ 0});
//
// groupBoxLineBufferUsage
//
- groupBoxLineBufferUsage.Controls.Add(labelInfo);
- groupBoxLineBufferUsage.Controls.Add(labelNumberOfBlocks);
- groupBoxLineBufferUsage.Controls.Add(upDownLinesPerBlock);
- groupBoxLineBufferUsage.Controls.Add(upDownBlockCount);
- groupBoxLineBufferUsage.Controls.Add(labelLinesPerBlock);
- groupBoxLineBufferUsage.Location = new System.Drawing.Point(10, 29);
- groupBoxLineBufferUsage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxLineBufferUsage.Name = "groupBoxLineBufferUsage";
- groupBoxLineBufferUsage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
- groupBoxLineBufferUsage.Size = new System.Drawing.Size(326, 197);
- groupBoxLineBufferUsage.TabIndex = 4;
- groupBoxLineBufferUsage.TabStop = false;
- groupBoxLineBufferUsage.Text = "Line buffer usage";
+ this.groupBoxLineBufferUsage.Controls.Add(this.labelInfo);
+ this.groupBoxLineBufferUsage.Controls.Add(this.labelNumberOfBlocks);
+ this.groupBoxLineBufferUsage.Controls.Add(this.upDownLinesPerBlock);
+ this.groupBoxLineBufferUsage.Controls.Add(this.upDownBlockCount);
+ this.groupBoxLineBufferUsage.Controls.Add(this.labelLinesPerBlock);
+ this.groupBoxLineBufferUsage.Location = new System.Drawing.Point(10, 29);
+ this.groupBoxLineBufferUsage.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxLineBufferUsage.Name = "groupBoxLineBufferUsage";
+ this.groupBoxLineBufferUsage.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.groupBoxLineBufferUsage.Size = new System.Drawing.Size(326, 197);
+ this.groupBoxLineBufferUsage.TabIndex = 4;
+ this.groupBoxLineBufferUsage.TabStop = false;
+ this.groupBoxLineBufferUsage.Text = "Line buffer usage";
//
// labelInfo
//
- labelInfo.AutoSize = true;
- labelInfo.Location = new System.Drawing.Point(9, 145);
- labelInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelInfo.Name = "labelInfo";
- labelInfo.Size = new System.Drawing.Size(220, 15);
- labelInfo.TabIndex = 4;
- labelInfo.Text = "Changes will take effect on next file load";
+ this.labelInfo.AutoSize = true;
+ this.labelInfo.Location = new System.Drawing.Point(9, 145);
+ this.labelInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelInfo.Name = "labelInfo";
+ this.labelInfo.Size = new System.Drawing.Size(291, 20);
+ this.labelInfo.TabIndex = 4;
+ this.labelInfo.Text = "Changes will take effect on next file load";
//
// labelNumberOfBlocks
//
- labelNumberOfBlocks.AutoSize = true;
- labelNumberOfBlocks.Location = new System.Drawing.Point(9, 52);
- labelNumberOfBlocks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelNumberOfBlocks.Name = "labelNumberOfBlocks";
- labelNumberOfBlocks.Size = new System.Drawing.Size(102, 15);
- labelNumberOfBlocks.TabIndex = 1;
- labelNumberOfBlocks.Text = "Number of blocks";
+ this.labelNumberOfBlocks.AutoSize = true;
+ this.labelNumberOfBlocks.Location = new System.Drawing.Point(9, 52);
+ this.labelNumberOfBlocks.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelNumberOfBlocks.Name = "labelNumberOfBlocks";
+ this.labelNumberOfBlocks.Size = new System.Drawing.Size(132, 20);
+ this.labelNumberOfBlocks.TabIndex = 1;
+ this.labelNumberOfBlocks.Text = "Number of blocks";
//
// upDownLinesPerBlock
//
- upDownLinesPerBlock.Location = new System.Drawing.Point(210, 102);
- upDownLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownLinesPerBlock.Maximum = new decimal(new int[] { 5000, 0, 0, 0 });
- upDownLinesPerBlock.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
- upDownLinesPerBlock.Name = "upDownLinesPerBlock";
- upDownLinesPerBlock.Size = new System.Drawing.Size(94, 23);
- upDownLinesPerBlock.TabIndex = 3;
- upDownLinesPerBlock.Value = new decimal(new int[] { 500, 0, 0, 0 });
- upDownLinesPerBlock.ValueChanged += OnNumericUpDown1ValueChanged;
+ this.upDownLinesPerBlock.Location = new System.Drawing.Point(210, 102);
+ this.upDownLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownLinesPerBlock.Maximum = new decimal(new int[] {
+ 5000,
+ 0,
+ 0,
+ 0});
+ this.upDownLinesPerBlock.Minimum = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 0});
+ this.upDownLinesPerBlock.Name = "upDownLinesPerBlock";
+ this.upDownLinesPerBlock.Size = new System.Drawing.Size(94, 26);
+ this.upDownLinesPerBlock.TabIndex = 3;
+ this.upDownLinesPerBlock.Value = new decimal(new int[] {
+ 500,
+ 0,
+ 0,
+ 0});
+ this.upDownLinesPerBlock.ValueChanged += new System.EventHandler(this.OnNumericUpDown1ValueChanged);
//
// upDownBlockCount
//
- upDownBlockCount.Location = new System.Drawing.Point(210, 49);
- upDownBlockCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- upDownBlockCount.Maximum = new decimal(new int[] { 5000, 0, 0, 0 });
- upDownBlockCount.Minimum = new decimal(new int[] { 10, 0, 0, 0 });
- upDownBlockCount.Name = "upDownBlockCount";
- upDownBlockCount.Size = new System.Drawing.Size(94, 23);
- upDownBlockCount.TabIndex = 0;
- upDownBlockCount.Value = new decimal(new int[] { 100, 0, 0, 0 });
+ this.upDownBlockCount.Location = new System.Drawing.Point(210, 49);
+ this.upDownBlockCount.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.upDownBlockCount.Maximum = new decimal(new int[] {
+ 5000,
+ 0,
+ 0,
+ 0});
+ this.upDownBlockCount.Minimum = new decimal(new int[] {
+ 10,
+ 0,
+ 0,
+ 0});
+ this.upDownBlockCount.Name = "upDownBlockCount";
+ this.upDownBlockCount.Size = new System.Drawing.Size(94, 26);
+ this.upDownBlockCount.TabIndex = 0;
+ this.upDownBlockCount.Value = new decimal(new int[] {
+ 100,
+ 0,
+ 0,
+ 0});
//
// labelLinesPerBlock
//
- labelLinesPerBlock.AutoSize = true;
- labelLinesPerBlock.Location = new System.Drawing.Point(9, 105);
- labelLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- labelLinesPerBlock.Name = "labelLinesPerBlock";
- labelLinesPerBlock.Size = new System.Drawing.Size(68, 15);
- labelLinesPerBlock.TabIndex = 2;
- labelLinesPerBlock.Text = "Lines/block";
+ this.labelLinesPerBlock.AutoSize = true;
+ this.labelLinesPerBlock.Location = new System.Drawing.Point(9, 105);
+ this.labelLinesPerBlock.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.labelLinesPerBlock.Name = "labelLinesPerBlock";
+ this.labelLinesPerBlock.Size = new System.Drawing.Size(88, 20);
+ this.labelLinesPerBlock.TabIndex = 2;
+ this.labelLinesPerBlock.Text = "Lines/block";
//
// buttonCancel
//
- buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- buttonCancel.Location = new System.Drawing.Point(818, 509);
- buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new System.Drawing.Size(112, 35);
- buttonCancel.TabIndex = 1;
- buttonCancel.Text = "Cancel";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += OnBtnCancelClick;
+ this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.buttonCancel.Location = new System.Drawing.Point(818, 509);
+ this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonCancel.Name = "buttonCancel";
+ this.buttonCancel.Size = new System.Drawing.Size(112, 35);
+ this.buttonCancel.TabIndex = 1;
+ this.buttonCancel.Text = "Cancel";
+ this.buttonCancel.UseVisualStyleBackColor = true;
+ this.buttonCancel.Click += new System.EventHandler(this.OnBtnCancelClick);
//
// buttonOk
//
- buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;
- buttonOk.Location = new System.Drawing.Point(696, 509);
- buttonOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonOk.Name = "buttonOk";
- buttonOk.Size = new System.Drawing.Size(112, 35);
- buttonOk.TabIndex = 0;
- buttonOk.Text = "OK";
- buttonOk.UseVisualStyleBackColor = true;
- buttonOk.Click += OnBtnOkClick;
+ this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;
+ this.buttonOk.Location = new System.Drawing.Point(696, 509);
+ this.buttonOk.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonOk.Name = "buttonOk";
+ this.buttonOk.Size = new System.Drawing.Size(112, 35);
+ this.buttonOk.TabIndex = 0;
+ this.buttonOk.Text = "OK";
+ this.buttonOk.UseVisualStyleBackColor = true;
+ this.buttonOk.Click += new System.EventHandler(this.OnBtnOkClick);
//
// helpProvider
//
- helpProvider.HelpNamespace = "LogExpert.chm";
+ this.helpProvider.HelpNamespace = "LogExpert.chm";
//
// buttonExport
//
- buttonExport.Location = new System.Drawing.Point(20, 509);
- buttonExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonExport.Name = "buttonExport";
- buttonExport.Size = new System.Drawing.Size(112, 35);
- buttonExport.TabIndex = 2;
- buttonExport.Text = "Export...";
- buttonExport.UseVisualStyleBackColor = true;
- buttonExport.Click += OnBtnExportClick;
+ this.buttonExport.Location = new System.Drawing.Point(20, 509);
+ this.buttonExport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonExport.Name = "buttonExport";
+ this.buttonExport.Size = new System.Drawing.Size(112, 35);
+ this.buttonExport.TabIndex = 2;
+ this.buttonExport.Text = "Export...";
+ this.buttonExport.UseVisualStyleBackColor = true;
+ this.buttonExport.Click += new System.EventHandler(this.OnBtnExportClick);
//
// buttonImport
//
- buttonImport.Location = new System.Drawing.Point(142, 509);
- buttonImport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- buttonImport.Name = "buttonImport";
- buttonImport.Size = new System.Drawing.Size(112, 35);
- buttonImport.TabIndex = 3;
- buttonImport.Text = "Import...";
- buttonImport.UseVisualStyleBackColor = true;
- buttonImport.Click += OnBtnImportClick;
+ this.buttonImport.Location = new System.Drawing.Point(142, 509);
+ this.buttonImport.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.buttonImport.Name = "buttonImport";
+ this.buttonImport.Size = new System.Drawing.Size(112, 35);
+ this.buttonImport.TabIndex = 3;
+ this.buttonImport.Text = "Import...";
+ this.buttonImport.UseVisualStyleBackColor = true;
+ this.buttonImport.Click += new System.EventHandler(this.OnBtnImportClick);
//
// dataGridViewTextBoxColumn1
//
- dataGridViewTextBoxColumn1.HeaderText = "File name mask (RegEx)";
- dataGridViewTextBoxColumn1.MinimumWidth = 40;
- dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
- dataGridViewTextBoxColumn1.Width = 99;
+ this.dataGridViewTextBoxColumn1.HeaderText = "File name mask (RegEx)";
+ this.dataGridViewTextBoxColumn1.MinimumWidth = 40;
+ this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
+ this.dataGridViewTextBoxColumn1.Width = 99;
//
// dataGridViewTextBoxColumn2
//
- dataGridViewTextBoxColumn2.HeaderText = "File name mask (RegEx)";
- dataGridViewTextBoxColumn2.MinimumWidth = 40;
- dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
- dataGridViewTextBoxColumn2.Width = 259;
+ this.dataGridViewTextBoxColumn2.HeaderText = "File name mask (RegEx)";
+ this.dataGridViewTextBoxColumn2.MinimumWidth = 40;
+ this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
+ this.dataGridViewTextBoxColumn2.Width = 259;
+ //
+ // checkBoxShowErrorMessageOnlyOneInstance
+ //
+ this.checkBoxShowErrorMessageOnlyOneInstance.AutoSize = true;
+ this.checkBoxShowErrorMessageOnlyOneInstance.Location = new System.Drawing.Point(210, 66);
+ this.checkBoxShowErrorMessageOnlyOneInstance.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.checkBoxShowErrorMessageOnlyOneInstance.Name = "checkBoxShowErrorMessageOnlyOneInstance";
+ this.checkBoxShowErrorMessageOnlyOneInstance.Size = new System.Drawing.Size(192, 24);
+ this.checkBoxShowErrorMessageOnlyOneInstance.TabIndex = 7;
+ this.checkBoxShowErrorMessageOnlyOneInstance.Text = "Show Error Message?";
+ this.checkBoxShowErrorMessageOnlyOneInstance.UseVisualStyleBackColor = true;
//
// SettingsDialog
//
- AcceptButton = buttonOk;
- CancelButton = buttonCancel;
- ClientSize = new System.Drawing.Size(956, 563);
- Controls.Add(buttonImport);
- Controls.Add(buttonExport);
- Controls.Add(buttonOk);
- Controls.Add(buttonCancel);
- Controls.Add(tabControlSettings);
- FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- helpProvider.SetHelpKeyword(this, "Settings.htm");
- helpProvider.SetHelpNavigator(this, System.Windows.Forms.HelpNavigator.Topic);
- Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon");
- Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
- MaximizeBox = false;
- MinimizeBox = false;
- Name = "SettingsDialog";
- helpProvider.SetShowHelp(this, true);
- StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- Text = "Settings";
- Load += OnSettingsDialogLoad;
- tabControlSettings.ResumeLayout(false);
- tabPageViewSettings.ResumeLayout(false);
- tabPageViewSettings.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumLineLength).EndInit();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumFilterEntriesDisplayed).EndInit();
- ((System.ComponentModel.ISupportInitialize)upDownMaximumFilterEntries).EndInit();
- groupBoxMisc.ResumeLayout(false);
- groupBoxMisc.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)cpDownColumnWidth).EndInit();
- groupBoxDefaults.ResumeLayout(false);
- groupBoxDefaults.PerformLayout();
- groupBoxFont.ResumeLayout(false);
- tabPageTimeStampFeatures.ResumeLayout(false);
- groupBoxTimeSpreadDisplay.ResumeLayout(false);
- groupBoxTimeSpreadDisplay.PerformLayout();
- groupBoxDisplayMode.ResumeLayout(false);
- groupBoxDisplayMode.PerformLayout();
- groupBoxTimeStampNavigationControl.ResumeLayout(false);
- groupBoxTimeStampNavigationControl.PerformLayout();
- groupBoxMouseDragDefaults.ResumeLayout(false);
- groupBoxMouseDragDefaults.PerformLayout();
- tabPageExternalTools.ResumeLayout(false);
- groupBoxToolSettings.ResumeLayout(false);
- groupBoxToolSettings.PerformLayout();
- tabPageColumnizers.ResumeLayout(false);
- tabPageColumnizers.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridViewColumnizer).EndInit();
- tabPageHighlightMask.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)dataGridViewHighlightMask).EndInit();
- tabPageMultiFile.ResumeLayout(false);
- groupBoxDefaultFileNamePattern.ResumeLayout(false);
- groupBoxDefaultFileNamePattern.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)upDownMultifileDays).EndInit();
- groupBoxWhenOpeningMultiFile.ResumeLayout(false);
- groupBoxWhenOpeningMultiFile.PerformLayout();
- tabPagePlugins.ResumeLayout(false);
- groupBoxPlugins.ResumeLayout(false);
- groupBoxSettings.ResumeLayout(false);
- panelPlugin.ResumeLayout(false);
- tabPageSessions.ResumeLayout(false);
- tabPageSessions.PerformLayout();
- groupBoxPersistantFileLocation.ResumeLayout(false);
- groupBoxPersistantFileLocation.PerformLayout();
- tabPageMemory.ResumeLayout(false);
- groupBoxCPUAndStuff.ResumeLayout(false);
- groupBoxCPUAndStuff.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)upDownPollingInterval).EndInit();
- groupBoxLineBufferUsage.ResumeLayout(false);
- groupBoxLineBufferUsage.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)upDownLinesPerBlock).EndInit();
- ((System.ComponentModel.ISupportInitialize)upDownBlockCount).EndInit();
- ResumeLayout(false);
- }
+ this.AcceptButton = this.buttonOk;
+ this.CancelButton = this.buttonCancel;
+ this.ClientSize = new System.Drawing.Size(956, 563);
+ this.Controls.Add(this.buttonImport);
+ this.Controls.Add(this.buttonExport);
+ this.Controls.Add(this.buttonOk);
+ this.Controls.Add(this.buttonCancel);
+ this.Controls.Add(this.tabControlSettings);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.helpProvider.SetHelpKeyword(this, "Settings.htm");
+ this.helpProvider.SetHelpNavigator(this, System.Windows.Forms.HelpNavigator.Topic);
+ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+ this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "SettingsDialog";
+ this.helpProvider.SetShowHelp(this, true);
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Settings";
+ this.Load += new System.EventHandler(this.OnSettingsDialogLoad);
+ this.tabControlSettings.ResumeLayout(false);
+ this.tabPageViewSettings.ResumeLayout(false);
+ this.tabPageViewSettings.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMaximumFilterEntriesDisplayed)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMaximumFilterEntries)).EndInit();
+ this.groupBoxMisc.ResumeLayout(false);
+ this.groupBoxMisc.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.cpDownColumnWidth)).EndInit();
+ this.groupBoxDefaults.ResumeLayout(false);
+ this.groupBoxDefaults.PerformLayout();
+ this.groupBoxFont.ResumeLayout(false);
+ this.tabPageTimeStampFeatures.ResumeLayout(false);
+ this.groupBoxTimeSpreadDisplay.ResumeLayout(false);
+ this.groupBoxTimeSpreadDisplay.PerformLayout();
+ this.groupBoxDisplayMode.ResumeLayout(false);
+ this.groupBoxDisplayMode.PerformLayout();
+ this.groupBoxTimeStampNavigationControl.ResumeLayout(false);
+ this.groupBoxTimeStampNavigationControl.PerformLayout();
+ this.groupBoxMouseDragDefaults.ResumeLayout(false);
+ this.groupBoxMouseDragDefaults.PerformLayout();
+ this.tabPageExternalTools.ResumeLayout(false);
+ this.groupBoxToolSettings.ResumeLayout(false);
+ this.groupBoxToolSettings.PerformLayout();
+ this.tabPageColumnizers.ResumeLayout(false);
+ this.tabPageColumnizers.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridViewColumnizer)).EndInit();
+ this.tabPageHighlightMask.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.dataGridViewHighlightMask)).EndInit();
+ this.tabPageMultiFile.ResumeLayout(false);
+ this.groupBoxDefaultFileNamePattern.ResumeLayout(false);
+ this.groupBoxDefaultFileNamePattern.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownMultifileDays)).EndInit();
+ this.groupBoxWhenOpeningMultiFile.ResumeLayout(false);
+ this.groupBoxWhenOpeningMultiFile.PerformLayout();
+ this.tabPagePlugins.ResumeLayout(false);
+ this.groupBoxPlugins.ResumeLayout(false);
+ this.groupBoxSettings.ResumeLayout(false);
+ this.panelPlugin.ResumeLayout(false);
+ this.tabPageSessions.ResumeLayout(false);
+ this.tabPageSessions.PerformLayout();
+ this.groupBoxPersistantFileLocation.ResumeLayout(false);
+ this.groupBoxPersistantFileLocation.PerformLayout();
+ this.tabPageMemory.ResumeLayout(false);
+ this.groupBoxCPUAndStuff.ResumeLayout(false);
+ this.groupBoxCPUAndStuff.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownPollingInterval)).EndInit();
+ this.groupBoxLineBufferUsage.ResumeLayout(false);
+ this.groupBoxLineBufferUsage.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownLinesPerBlock)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.upDownBlockCount)).EndInit();
+ this.ResumeLayout(false);
+
+ }
- #endregion
+ #endregion
- private System.Windows.Forms.TabControl tabControlSettings;
+ private System.Windows.Forms.TabControl tabControlSettings;
private System.Windows.Forms.TabPage tabPageViewSettings;
private System.Windows.Forms.Label labelFont;
private System.Windows.Forms.TabPage tabPageTimeStampFeatures;
@@ -1839,8 +1893,5 @@ private void InitializeComponent()
private System.Windows.Forms.RadioButton radioButtonSessionApplicationStartupDir;
private System.Windows.Forms.CheckBox checkBoxShowErrorMessageOnlyOneInstance;
private System.Windows.Forms.CheckBox checkBoxDarkMode;
- private System.Windows.Forms.NumericUpDown upDownMaximumLineLength;
- private System.Windows.Forms.Label labelMaximumLineLength;
- private System.Windows.Forms.Label labelWarningMaximumLineLenght;
}
}
diff --git a/src/LogExpert/Dialogs/SettingsDialog.cs b/src/LogExpert/Dialogs/SettingsDialog.cs
index fc93e2be..3d886f1c 100644
--- a/src/LogExpert/Dialogs/SettingsDialog.cs
+++ b/src/LogExpert/Dialogs/SettingsDialog.cs
@@ -73,8 +73,6 @@ private void FillDialog()
FillPortableMode();
- upDownMaximumLineLength.Value = Preferences.MaxLineLength;
-
checkBoxDarkMode.Checked = Preferences.darkMode;
checkBoxTimestamp.Checked = Preferences.timestampControl;
checkBoxSyncFilter.Checked = Preferences.filterSync;
@@ -209,10 +207,8 @@ private void SaveMultifileData()
private void OnBtnToolClickInternal(TextBox textBox)
{
- OpenFileDialog dlg = new()
- {
- InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles)
- };
+ OpenFileDialog dlg = new();
+ dlg.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles);
if (string.IsNullOrEmpty(textBox.Text) == false)
{
@@ -351,18 +347,18 @@ private void FillHighlightMaskList()
//TODO Remove if not necessary
DataGridViewTextBoxColumn textColumn = (DataGridViewTextBoxColumn)dataGridViewHighlightMask.Columns[0];
- foreach (HighlightGroup group in (IList)_logTabWin.HighlightGroupList)
+ foreach (HilightGroup group in (IList)_logTabWin.HilightGroupList)
{
comboColumn.Items.Add(group.GroupName);
}
- foreach (HighlightMaskEntry maskEntry in Preferences.HighlightMaskList)
+ foreach (HighlightMaskEntry maskEntry in Preferences.highlightMaskList)
{
DataGridViewRow row = new();
row.Cells.Add(new DataGridViewTextBoxCell());
DataGridViewComboBoxCell cell = new();
- foreach (HighlightGroup group in (IList)_logTabWin.HighlightGroupList)
+ foreach (HilightGroup group in (IList)_logTabWin.HilightGroupList)
{
cell.Items.Add(group.GroupName);
}
@@ -370,9 +366,9 @@ private void FillHighlightMaskList()
row.Cells.Add(cell);
row.Cells[0].Value = maskEntry.mask;
- HighlightGroup currentGroup = _logTabWin.FindHighlightGroup(maskEntry.highlightGroupName);
- currentGroup ??= ((IList)_logTabWin.HighlightGroupList)[0];
- currentGroup ??= new HighlightGroup();
+ HilightGroup currentGroup = _logTabWin.FindHighlightGroup(maskEntry.highlightGroupName);
+ currentGroup ??= ((IList)_logTabWin.HilightGroupList)[0];
+ currentGroup ??= new HilightGroup();
row.Cells[1].Value = currentGroup.GroupName;
dataGridViewHighlightMask.Rows.Add(row);
@@ -396,11 +392,9 @@ private void SaveColumnizerList()
{
if (!row.IsNewRow)
{
- ColumnizerMaskEntry entry = new()
- {
- mask = (string)row.Cells[0].Value,
- columnizerName = (string)row.Cells[1].Value
- };
+ ColumnizerMaskEntry entry = new();
+ entry.mask = (string)row.Cells[0].Value;
+ entry.columnizerName = (string)row.Cells[1].Value;
Preferences.columnizerMaskList.Add(entry);
}
}
@@ -408,18 +402,16 @@ private void SaveColumnizerList()
private void SaveHighlightMaskList()
{
- Preferences.HighlightMaskList.Clear();
+ Preferences.highlightMaskList.Clear();
foreach (DataGridViewRow row in dataGridViewHighlightMask.Rows)
{
if (!row.IsNewRow)
{
- HighlightMaskEntry entry = new()
- {
- mask = (string)row.Cells[0].Value,
- highlightGroupName = (string)row.Cells[1].Value
- };
- Preferences.HighlightMaskList.Add(entry);
+ HighlightMaskEntry entry = new();
+ entry.mask = (string)row.Cells[0].Value;
+ entry.highlightGroupName = (string)row.Cells[1].Value;
+ Preferences.highlightMaskList.Add(entry);
}
}
}
@@ -673,7 +665,6 @@ private void OnBtnOkClick(object sender, EventArgs e)
Preferences.saveLocation = SessionSaveLocation.SameDir;
}
- Preferences.MaxLineLength = (int)upDownMaximumLineLength.Value;
Preferences.saveFilters = checkBoxSaveFilter.Checked;
Preferences.bufferCount = (int)upDownBlockCount.Value;
Preferences.linesPerBuffer = (int)upDownLinesPerBlock.Value;
@@ -994,10 +985,12 @@ private void OnBtnExportClick(object sender, EventArgs e)
Filter = @"Settings (*.json)|*.json|All files (*.*)|*.*"
};
- if (dlg.ShowDialog() == DialogResult.OK)
+ DialogResult result = dlg.ShowDialog();
+
+ if (result == DialogResult.OK)
{
FileInfo fileInfo = new(dlg.FileName);
- ConfigManager.ExportSettings(fileInfo);
+ ConfigManager.Export(fileInfo);
}
}
@@ -1029,7 +1022,7 @@ private void OnBtnImportClick(object sender, EventArgs e)
}
ConfigManager.Import(fileInfo, dlg.ImportFlags);
- Preferences = ConfigManager.Settings.Preferences;
+ Preferences = ConfigManager.Settings.preferences;
FillDialog();
MessageBox.Show(this, @"Settings imported", @"LogExpert");
}
diff --git a/src/LogExpert/Dialogs/SettingsDialog.resx b/src/LogExpert/Dialogs/SettingsDialog.resx
index 2c2d8d82..9426b76c 100644
--- a/src/LogExpert/Dialogs/SettingsDialog.resx
+++ b/src/LogExpert/Dialogs/SettingsDialog.resx
@@ -1,17 +1,17 @@
-
diff --git a/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs b/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs
index 45e86aa1..b08ba025 100644
--- a/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs
+++ b/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs
@@ -10,7 +10,7 @@ public class CurrentHighlightGroupChangedEventArgs
#region cTor
- public CurrentHighlightGroupChangedEventArgs(LogWindow logWindow, HighlightGroup currentGroup)
+ public CurrentHighlightGroupChangedEventArgs(LogWindow logWindow, HilightGroup currentGroup)
{
this.LogWindow = logWindow;
this.CurrentGroup = currentGroup;
@@ -22,7 +22,7 @@ public CurrentHighlightGroupChangedEventArgs(LogWindow logWindow, HighlightGroup
public LogWindow LogWindow { get; }
- public HighlightGroup CurrentGroup { get; }
+ public HilightGroup CurrentGroup { get; }
#endregion
}
diff --git a/src/LogExpert/Entities/HighlightGroup.cs b/src/LogExpert/Entities/HilightGroup.cs
similarity index 57%
rename from src/LogExpert/Entities/HighlightGroup.cs
rename to src/LogExpert/Entities/HilightGroup.cs
index b3caede4..b2115103 100644
--- a/src/LogExpert/Entities/HighlightGroup.cs
+++ b/src/LogExpert/Entities/HilightGroup.cs
@@ -1,34 +1,34 @@
-using LogExpert.Classes.Highlight;
-
-using System;
-using System.Collections.Generic;
-
-namespace LogExpert.Entities
-{
- [Serializable]
- public class HighlightGroup : ICloneable
- {
- #region Properties
-
- public string GroupName { get; set; } = string.Empty;
-
- public List HighlightEntryList { get; set; } = [];
-
- public object Clone()
- {
- HighlightGroup clone = new()
- {
- GroupName = GroupName
- };
-
- foreach (HighlightEntry entry in HighlightEntryList)
- {
- clone.HighlightEntryList.Add((HighlightEntry)entry.Clone());
- }
-
- return clone;
- }
-
- #endregion
- }
+using LogExpert.Classes.Highlight;
+
+using System;
+using System.Collections.Generic;
+
+namespace LogExpert.Entities
+{
+ [Serializable]
+ public class HilightGroup : ICloneable
+ {
+ #region Properties
+
+ public string GroupName { get; set; } = string.Empty;
+
+ public List HilightEntryList { get; set; } = [];
+
+ public object Clone()
+ {
+ HilightGroup clone = new()
+ {
+ GroupName = GroupName
+ };
+
+ foreach (HilightEntry entry in HilightEntryList)
+ {
+ clone.HilightEntryList.Add((HilightEntry)entry.Clone());
+ }
+
+ return clone;
+ }
+
+ #endregion
+ }
}
\ No newline at end of file
diff --git a/src/LogExpert/Interface/ILogPaintContext.cs b/src/LogExpert/Interface/ILogPaintContext.cs
index b6babf1a..367d4ff1 100644
--- a/src/LogExpert/Interface/ILogPaintContext.cs
+++ b/src/LogExpert/Interface/ILogPaintContext.cs
@@ -27,7 +27,7 @@ public interface ILogPaintContext
Bookmark GetBookmarkForLine(int lineNum);
- HighlightEntry FindHighlightEntry(ITextValue line, bool noWordMatches);
+ HilightEntry FindHighlightEntry(ITextValue line, bool noWordMatches);
IList FindHighlightMatches(ITextValue line);
diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs
index d62fb4e7..5713627e 100644
--- a/src/LogExpert/Program.cs
+++ b/src/LogExpert/Program.cs
@@ -65,7 +65,6 @@ private static void Sub_Main(Server server, string[] orgArgs)
CmdLine cmdLine = new();
CmdLineString configFile = new("config", false, "A configuration (settings) file");
- CmdLineString configFileHighlights = new("highlightConfig", false, "A configuration (settings) file for highlights");
cmdLine.RegisterParameter(configFile);
string[] remainingArgs = cmdLine.Parse(orgArgs);
@@ -87,9 +86,19 @@ private static void Sub_Main(Server server, string[] orgArgs)
}
}
string[] args = [.. argsList];
+ if (configFile.Exists)
+ {
+ FileInfo cfgFileInfo = new(configFile.Value);
- LoadConfigurationFile(configFile);
- LoadConfigurationHighlightsFile(configFileHighlights);
+ if (cfgFileInfo.Exists)
+ {
+ ConfigManager.Import(cfgFileInfo, ExportImportFlags.All);
+ }
+ else
+ {
+ MessageBox.Show(@"Config file not found", @"LogExpert");
+ }
+ }
int pId = Process.GetCurrentProcess().SessionId;
@@ -141,7 +150,7 @@ private static void Sub_Main(Server server, string[] orgArgs)
// another instance already exists
WindowsIdentity wi = WindowsIdentity.GetCurrent();
//LogExpertProxy proxy = (LogExpertProxy)Activator.GetObject(typeof(LogExpertProxy), "ipc://LogExpert" + pId + "/LogExpertProxy");
- if (settings.Preferences.allowOnlyOneInstance)
+ if (settings.preferences.allowOnlyOneInstance)
{
client.LoadFiles(new Grpc.FileNames { FileNames_ = { args } });
}
@@ -167,12 +176,12 @@ private static void Sub_Main(Server server, string[] orgArgs)
MessageBox.Show($"Cannot open connection to first instance ({errMsg})", "LogExpert");
}
- if (settings.Preferences.allowOnlyOneInstance && settings.Preferences.ShowErrorMessageAllowOnlyOneInstances)
+ if (settings.preferences.allowOnlyOneInstance && settings.preferences.ShowErrorMessageAllowOnlyOneInstances)
{
AllowOnlyOneInstanceErrorDialog a = new();
if (a.ShowDialog() == DialogResult.OK)
{
- settings.Preferences.ShowErrorMessageAllowOnlyOneInstances = !a.DoNotShowThisMessageAgain;
+ settings.preferences.ShowErrorMessageAllowOnlyOneInstances = !a.DoNotShowThisMessageAgain;
ConfigManager.Save(SettingsFlags.All);
}
@@ -189,41 +198,6 @@ private static void Sub_Main(Server server, string[] orgArgs)
}
}
- private static void LoadConfigurationFile(CmdLineString configFile)
- {
- if (configFile.Exists)
- {
- FileInfo cfgFileInfo = new(configFile.Value);
-
- if (cfgFileInfo.Exists)
- {
- ConfigManager.Import(cfgFileInfo, ExportImportFlags.All);
- }
- else
- {
- MessageBox.Show(@"Config file not found", @"LogExpert");
- }
- }
- }
-
- private static void LoadConfigurationHighlightsFile(CmdLineString configFile)
- {
- if (configFile.Exists)
- {
- FileInfo cfgFileInfo = new(configFile.Value);
-
- if (cfgFileInfo.Exists)
- {
- ConfigManager.ImportHighlightSettings(cfgFileInfo);
- }
- else
- {
- MessageBox.Show(@"Highlights config file not found", @"LogExpert");
- }
- }
- }
-
-
[STAThread]
private static void ShowUnhandledException(object exceptionObject)
{