diff --git a/.github/workflows/test_dotnet.yml b/.github/workflows/test_dotnet.yml new file mode 100644 index 00000000..57c53a4e --- /dev/null +++ b/.github/workflows/test_dotnet.yml @@ -0,0 +1,31 @@ +# This workflow will build a .NET project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-net + +name: .NET + +on: + push: + branches: [ "Development" ] + pull_request: + branches: [ "Development" ] + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + - name: Setup .NET + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 8.0.x + - name: Restore dependencies + run: dotnet restore + working-directory: src + - name: Build + run: dotnet build --no-restore + working-directory: src + - name: Test + run: dotnet test --no-build --verbosity normal + working-directory: src diff --git a/README.md b/README.md index ca2f1614..602c4873 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# LogExpert [![Build status](https://ci.appveyor.com/api/projects/status/hxwxyyxy81l4tee8/branch/master?svg=true)](https://ci.appveyor.com/project/Zarunbal/logexpert/branch/master) +# LogExpert [![.NET](https://github.com/LogExperts/LogExpert/actions/workflows/test_dotnet.yml/badge.svg)](https://github.com/LogExperts/LogExpert/actions/workflows/test_dotnet.yml) This is a clone from (no longer exists) https://logexpert.codeplex.com/ diff --git a/build/Build.cs b/build/Build.cs index 78004d8e..43dc4947 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -78,7 +78,7 @@ Version Version patch = AppVeyor.Instance.BuildNumber; } - return new Version(1, 11, 2, patch); + return new Version(1, 12, 0, patch); } } diff --git a/build/_build.csproj b/build/_build.csproj index c875927d..d11d75f7 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -11,19 +11,15 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + - + all runtime; build; native; contentfiles; analyzers - + - + diff --git a/src/AutoColumnizer/AutoColumnizer.csproj b/src/AutoColumnizer/AutoColumnizer.csproj index dc8b8316..1bed4e34 100644 --- a/src/AutoColumnizer/AutoColumnizer.csproj +++ b/src/AutoColumnizer/AutoColumnizer.csproj @@ -6,6 +6,7 @@ AutoColumnizer true ..\Solution Items\Key.snk + false false $(SolutionDir)..\bin\$(Configuration)\plugins diff --git a/src/ColumnizerLib/ColumnizerLib.csproj b/src/ColumnizerLib/ColumnizerLib.csproj index 5695fc9f..ec4cc262 100644 --- a/src/ColumnizerLib/ColumnizerLib.csproj +++ b/src/ColumnizerLib/ColumnizerLib.csproj @@ -1,14 +1,12 @@  - net8.0-windows - true + net8.0 Library Properties LogExpert false - true - true $(SolutionDir)..\bin\Docs\ColumnizerLib.xml + false false $(SolutionDir)..\bin\$(Configuration) CS1591; diff --git a/src/ColumnizerLib/ILogExpertPluginConfigurator.cs b/src/ColumnizerLib/ILogExpertPluginConfigurator.cs index 5e8ac7ce..c142541b 100644 --- a/src/ColumnizerLib/ILogExpertPluginConfigurator.cs +++ b/src/ColumnizerLib/ILogExpertPluginConfigurator.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text; -using System.Windows.Forms; namespace LogExpert { @@ -46,7 +45,7 @@ public interface ILogExpertPluginConfigurator /// /// /// Set this panel as the parent for you config dialog. - void ShowConfigForm(Panel parentPanel); + void ShowConfigForm(object parentPanel); /// /// Implement this function if your plugin uses an own top level dialog for the configuration (modal config dialog). @@ -60,7 +59,7 @@ public interface ILogExpertPluginConfigurator /// /// /// Set the given Form as the owner of your dialog. - void ShowConfigDialog(Form owner); + void ShowConfigDialog(object owner); /// /// This function is called when the user selects another plugin in the list. You should retrieve diff --git a/src/CsvColumnizer/CsvColumnizer.cs b/src/CsvColumnizer/CsvColumnizer.cs index 1b06162b..d2e46764 100644 --- a/src/CsvColumnizer/CsvColumnizer.cs +++ b/src/CsvColumnizer/CsvColumnizer.cs @@ -6,8 +6,10 @@ using System.IO; using System.Linq; using System.Reflection; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace CsvColumnizer { /// diff --git a/src/CsvColumnizer/CsvColumnizer.csproj b/src/CsvColumnizer/CsvColumnizer.csproj index 0b5bf3db..070afa9e 100644 --- a/src/CsvColumnizer/CsvColumnizer.csproj +++ b/src/CsvColumnizer/CsvColumnizer.csproj @@ -3,13 +3,13 @@ net8.0-windows true Library + false false true true false $(SolutionDir)..\bin\$(Configuration)\plugins true - CA1416; False diff --git a/src/CsvColumnizer/CsvColumnizerConfigDlg.Designer.cs b/src/CsvColumnizer/CsvColumnizerConfigDlg.Designer.cs index 7b6aa0f8..d05ebcdf 100644 --- a/src/CsvColumnizer/CsvColumnizerConfigDlg.Designer.cs +++ b/src/CsvColumnizer/CsvColumnizerConfigDlg.Designer.cs @@ -20,216 +20,213 @@ 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() - { - this.okButton = new System.Windows.Forms.Button(); - this.cancelButton = new System.Windows.Forms.Button(); - this.delimiterTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.quoteCharTextBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.escapeCharTextBox = new System.Windows.Forms.TextBox(); - this.label3 = new System.Windows.Forms.Label(); - this.escapeCheckBox = new System.Windows.Forms.CheckBox(); - this.commentCharTextBox = new System.Windows.Forms.TextBox(); - this.label4 = new System.Windows.Forms.Label(); - this.fieldNamesCheckBox = new System.Windows.Forms.CheckBox(); - this.minColumnsNumericUpDown = new System.Windows.Forms.NumericUpDown(); - this.label5 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.minColumnsNumericUpDown)).BeginInit(); - this.SuspendLayout(); - // - // okButton - // - this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK; - this.okButton.Location = new System.Drawing.Point(148, 202); - this.okButton.Name = "okButton"; - this.okButton.Size = new System.Drawing.Size(75, 23); - this.okButton.TabIndex = 0; - this.okButton.Text = "OK"; - this.okButton.UseVisualStyleBackColor = true; - this.okButton.Click += new System.EventHandler(this.OnOkButtonClick); - // - // cancelButton - // - this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.cancelButton.Location = new System.Drawing.Point(229, 202); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 1; - this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - // - // delimiterTextBox - // - this.delimiterTextBox.Location = new System.Drawing.Point(95, 13); - this.delimiterTextBox.MaxLength = 1; - this.delimiterTextBox.Name = "delimiterTextBox"; - this.delimiterTextBox.Size = new System.Drawing.Size(28, 20); - this.delimiterTextBox.TabIndex = 2; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(12, 16); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(74, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Delimiter char:"; - // - // quoteCharTextBox - // - this.quoteCharTextBox.Location = new System.Drawing.Point(95, 40); - this.quoteCharTextBox.Name = "quoteCharTextBox"; - this.quoteCharTextBox.Size = new System.Drawing.Size(28, 20); - this.quoteCharTextBox.TabIndex = 4; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(12, 43); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(63, 13); - this.label2.TabIndex = 5; - this.label2.Text = "Quote char:"; - // - // escapeCharTextBox - // - this.escapeCharTextBox.Location = new System.Drawing.Point(95, 67); - this.escapeCharTextBox.Name = "escapeCharTextBox"; - this.escapeCharTextBox.Size = new System.Drawing.Size(28, 20); - this.escapeCharTextBox.TabIndex = 6; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(12, 70); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(70, 13); - this.label3.TabIndex = 7; - this.label3.Text = "Escape char:"; - // - // escapeCheckBox - // - this.escapeCheckBox.AutoSize = true; - this.escapeCheckBox.Location = new System.Drawing.Point(130, 69); - this.escapeCheckBox.Name = "escapeCheckBox"; - this.escapeCheckBox.Size = new System.Drawing.Size(110, 17); - this.escapeCheckBox.TabIndex = 8; - this.escapeCheckBox.Text = "use escape chars"; - this.escapeCheckBox.UseVisualStyleBackColor = true; - this.escapeCheckBox.CheckedChanged += new System.EventHandler(this.OnEscapeCheckBoxCheckedChanged); - // - // commentCharTextBox - // - this.commentCharTextBox.Location = new System.Drawing.Point(95, 94); - this.commentCharTextBox.Name = "commentCharTextBox"; - this.commentCharTextBox.Size = new System.Drawing.Size(28, 20); - this.commentCharTextBox.TabIndex = 9; - // - // label4 - // - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(12, 97); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(78, 13); - this.label4.TabIndex = 10; - this.label4.Text = "Comment char:"; - // - // fieldNamesCheckBox - // - this.fieldNamesCheckBox.AutoSize = true; - this.fieldNamesCheckBox.Location = new System.Drawing.Point(15, 161); - this.fieldNamesCheckBox.Name = "fieldNamesCheckBox"; - this.fieldNamesCheckBox.Size = new System.Drawing.Size(163, 17); - this.fieldNamesCheckBox.TabIndex = 11; - this.fieldNamesCheckBox.Text = "First line contains field names"; - this.fieldNamesCheckBox.UseVisualStyleBackColor = true; - // - // minColumnsNumericUpDown - // - this.minColumnsNumericUpDown.Location = new System.Drawing.Point(95, 120); - this.minColumnsNumericUpDown.Maximum = new decimal(new int[] { - 10, - 0, - 0, - 0}); - this.minColumnsNumericUpDown.Name = "minColumnsNumericUpDown"; - this.minColumnsNumericUpDown.Size = new System.Drawing.Size(48, 20); - this.minColumnsNumericUpDown.TabIndex = 12; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(12, 122); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(66, 13); - this.label5.TabIndex = 13; - this.label5.Text = "Min columns"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(149, 122); - this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(119, 13); - this.label6.TabIndex = 14; - this.label6.Text = "(0 = no minimum check)"; - // - // CsvColumnizerConfigDlg - // - this.ClientSize = new System.Drawing.Size(316, 237); - this.ControlBox = false; - this.Controls.Add(this.label6); - this.Controls.Add(this.label5); - this.Controls.Add(this.minColumnsNumericUpDown); - this.Controls.Add(this.fieldNamesCheckBox); - this.Controls.Add(this.label4); - this.Controls.Add(this.commentCharTextBox); - this.Controls.Add(this.escapeCheckBox); - this.Controls.Add(this.label3); - this.Controls.Add(this.escapeCharTextBox); - this.Controls.Add(this.label2); - this.Controls.Add(this.quoteCharTextBox); - this.Controls.Add(this.label1); - this.Controls.Add(this.delimiterTextBox); - this.Controls.Add(this.cancelButton); - this.Controls.Add(this.okButton); - this.MaximizeBox = false; - this.Name = "CsvColumnizerConfigDlg"; - this.ShowIcon = false; - this.ShowInTaskbar = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; - this.Text = "CSV Columnizer Configuration"; - ((System.ComponentModel.ISupportInitialize)(this.minColumnsNumericUpDown)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + okButton = new System.Windows.Forms.Button(); + cancelButton = new System.Windows.Forms.Button(); + delimiterTextBox = new System.Windows.Forms.TextBox(); + label1 = new System.Windows.Forms.Label(); + textBoxQuoteChar = new System.Windows.Forms.TextBox(); + labelQuoteChar = new System.Windows.Forms.Label(); + textboxEscapeChar = new System.Windows.Forms.TextBox(); + labelEscapeChar = new System.Windows.Forms.Label(); + checkBoxEscape = new System.Windows.Forms.CheckBox(); + textBoxCommentChar = new System.Windows.Forms.TextBox(); + labelCommentChar = new System.Windows.Forms.Label(); + checkBoxFieldNames = new System.Windows.Forms.CheckBox(); + numericUpDownMinColumns = new System.Windows.Forms.NumericUpDown(); + labelMinColumns = new System.Windows.Forms.Label(); + labelMinColumnsNoCheck = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)numericUpDownMinColumns).BeginInit(); + SuspendLayout(); + // + // okButton + // + okButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + okButton.DialogResult = System.Windows.Forms.DialogResult.OK; + okButton.Location = new System.Drawing.Point(15, 217); + okButton.Name = "okButton"; + okButton.Size = new System.Drawing.Size(75, 25); + okButton.TabIndex = 0; + okButton.Text = "OK"; + okButton.UseVisualStyleBackColor = true; + okButton.Click += OnOkButtonClick; + // + // cancelButton + // + cancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left; + cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + cancelButton.Location = new System.Drawing.Point(96, 217); + cancelButton.Name = "cancelButton"; + cancelButton.Size = new System.Drawing.Size(75, 25); + cancelButton.TabIndex = 1; + cancelButton.Text = "Cancel"; + cancelButton.UseVisualStyleBackColor = true; + // + // delimiterTextBox + // + delimiterTextBox.Location = new System.Drawing.Point(126, 12); + delimiterTextBox.MaxLength = 1; + delimiterTextBox.Name = "delimiterTextBox"; + delimiterTextBox.Size = new System.Drawing.Size(28, 23); + delimiterTextBox.TabIndex = 2; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(15, 15); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(84, 15); + label1.TabIndex = 3; + label1.Text = "Delimiter char:"; + // + // textBoxQuoteChar + // + textBoxQuoteChar.Location = new System.Drawing.Point(126, 41); + textBoxQuoteChar.Name = "textBoxQuoteChar"; + textBoxQuoteChar.Size = new System.Drawing.Size(28, 23); + textBoxQuoteChar.TabIndex = 4; + // + // labelQuoteChar + // + labelQuoteChar.AutoSize = true; + labelQuoteChar.Location = new System.Drawing.Point(15, 44); + labelQuoteChar.Name = "labelQuoteChar"; + labelQuoteChar.Size = new System.Drawing.Size(69, 15); + labelQuoteChar.TabIndex = 5; + labelQuoteChar.Text = "Quote char:"; + // + // textboxEscapeChar + // + textboxEscapeChar.Location = new System.Drawing.Point(126, 70); + textboxEscapeChar.Name = "textboxEscapeChar"; + textboxEscapeChar.Size = new System.Drawing.Size(28, 23); + textboxEscapeChar.TabIndex = 6; + // + // labelEscapeChar + // + labelEscapeChar.AutoSize = true; + labelEscapeChar.Location = new System.Drawing.Point(15, 73); + labelEscapeChar.Name = "labelEscapeChar"; + labelEscapeChar.Size = new System.Drawing.Size(72, 15); + labelEscapeChar.TabIndex = 7; + labelEscapeChar.Text = "Escape char:"; + // + // checkBoxEscape + // + checkBoxEscape.AutoSize = true; + checkBoxEscape.Location = new System.Drawing.Point(15, 99); + checkBoxEscape.Name = "checkBoxEscape"; + checkBoxEscape.Size = new System.Drawing.Size(114, 19); + checkBoxEscape.TabIndex = 8; + checkBoxEscape.Text = "use escape chars"; + checkBoxEscape.UseVisualStyleBackColor = true; + checkBoxEscape.CheckedChanged += OnEscapeCheckBoxCheckedChanged; + // + // textBoxCommentChar + // + textBoxCommentChar.Location = new System.Drawing.Point(126, 119); + textBoxCommentChar.Name = "textBoxCommentChar"; + textBoxCommentChar.Size = new System.Drawing.Size(28, 23); + textBoxCommentChar.TabIndex = 9; + // + // labelCommentChar + // + labelCommentChar.AutoSize = true; + labelCommentChar.Location = new System.Drawing.Point(12, 124); + labelCommentChar.Name = "labelCommentChar"; + labelCommentChar.Size = new System.Drawing.Size(90, 15); + labelCommentChar.TabIndex = 10; + labelCommentChar.Text = "Comment char:"; + // + // checkBoxFieldNames + // + checkBoxFieldNames.AutoSize = true; + checkBoxFieldNames.Location = new System.Drawing.Point(15, 192); + checkBoxFieldNames.Name = "checkBoxFieldNames"; + checkBoxFieldNames.Size = new System.Drawing.Size(182, 19); + checkBoxFieldNames.TabIndex = 11; + checkBoxFieldNames.Text = "First line contains field names"; + checkBoxFieldNames.UseVisualStyleBackColor = true; + // + // numericUpDownMinColumns + // + numericUpDownMinColumns.Location = new System.Drawing.Point(106, 148); + numericUpDownMinColumns.Maximum = new decimal(new int[] { 10, 0, 0, 0 }); + numericUpDownMinColumns.Name = "numericUpDownMinColumns"; + numericUpDownMinColumns.Size = new System.Drawing.Size(48, 23); + numericUpDownMinColumns.TabIndex = 12; + // + // labelMinColumns + // + labelMinColumns.AutoSize = true; + labelMinColumns.Location = new System.Drawing.Point(15, 150); + labelMinColumns.Name = "labelMinColumns"; + labelMinColumns.Size = new System.Drawing.Size(77, 15); + labelMinColumns.TabIndex = 13; + labelMinColumns.Text = "Min columns"; + // + // labelMinColumnsNoCheck + // + labelMinColumnsNoCheck.AutoSize = true; + labelMinColumnsNoCheck.Location = new System.Drawing.Point(15, 174); + labelMinColumnsNoCheck.Name = "labelMinColumnsNoCheck"; + labelMinColumnsNoCheck.Size = new System.Drawing.Size(139, 15); + labelMinColumnsNoCheck.TabIndex = 14; + labelMinColumnsNoCheck.Text = "(0 = no minimum check)"; + // + // CsvColumnizerConfigDlg + // + ClientSize = new System.Drawing.Size(204, 250); + ControlBox = false; + Controls.Add(labelMinColumnsNoCheck); + Controls.Add(labelMinColumns); + Controls.Add(numericUpDownMinColumns); + Controls.Add(checkBoxFieldNames); + Controls.Add(labelCommentChar); + Controls.Add(textBoxCommentChar); + Controls.Add(checkBoxEscape); + Controls.Add(labelEscapeChar); + Controls.Add(textboxEscapeChar); + Controls.Add(labelQuoteChar); + Controls.Add(textBoxQuoteChar); + Controls.Add(label1); + Controls.Add(delimiterTextBox); + Controls.Add(cancelButton); + Controls.Add(okButton); + MaximizeBox = false; + Name = "CsvColumnizerConfigDlg"; + ShowIcon = false; + ShowInTaskbar = false; + StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + Text = "CSV Columnizer Configuration"; + ((System.ComponentModel.ISupportInitialize)numericUpDownMinColumns).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private System.Windows.Forms.Button okButton; + private System.Windows.Forms.Button okButton; private System.Windows.Forms.Button cancelButton; private System.Windows.Forms.TextBox delimiterTextBox; private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox quoteCharTextBox; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox escapeCharTextBox; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.CheckBox escapeCheckBox; - private System.Windows.Forms.TextBox commentCharTextBox; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.CheckBox fieldNamesCheckBox; - private System.Windows.Forms.NumericUpDown minColumnsNumericUpDown; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label6; + private System.Windows.Forms.TextBox textBoxQuoteChar; + private System.Windows.Forms.Label labelQuoteChar; + private System.Windows.Forms.TextBox textboxEscapeChar; + private System.Windows.Forms.Label labelEscapeChar; + private System.Windows.Forms.CheckBox checkBoxEscape; + private System.Windows.Forms.TextBox textBoxCommentChar; + private System.Windows.Forms.Label labelCommentChar; + private System.Windows.Forms.CheckBox checkBoxFieldNames; + private System.Windows.Forms.NumericUpDown numericUpDownMinColumns; + private System.Windows.Forms.Label labelMinColumns; + private System.Windows.Forms.Label labelMinColumnsNoCheck; } } \ No newline at end of file diff --git a/src/CsvColumnizer/CsvColumnizerConfigDlg.cs b/src/CsvColumnizer/CsvColumnizerConfigDlg.cs index bd477eaa..4c2fd0ab 100644 --- a/src/CsvColumnizer/CsvColumnizerConfigDlg.cs +++ b/src/CsvColumnizer/CsvColumnizerConfigDlg.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Windows.Forms; namespace CsvColumnizer @@ -15,9 +16,14 @@ public partial class CsvColumnizerConfigDlg : Form public CsvColumnizerConfigDlg(CsvColumnizerConfig config) { + SuspendLayout(); + AutoScaleDimensions = new SizeF(96F, 96F); + AutoScaleMode = AutoScaleMode.Dpi; + _config = config; InitializeComponent(); FillValues(); + ResumeLayout(); } #endregion @@ -27,23 +33,23 @@ public CsvColumnizerConfigDlg(CsvColumnizerConfig config) private void FillValues() { delimiterTextBox.Text = _config.DelimiterChar; - quoteCharTextBox.Text = _config.QuoteChar.ToString(); - escapeCharTextBox.Text = _config.EscapeChar.ToString(); - escapeCheckBox.Checked = _config.EscapeChar != '\0'; - commentCharTextBox.Text = _config.CommentChar.ToString(); - fieldNamesCheckBox.Checked = _config.HasFieldNames; - escapeCharTextBox.Enabled = escapeCheckBox.Checked; - minColumnsNumericUpDown.Value = _config.MinColumns; + textBoxQuoteChar.Text = _config.QuoteChar.ToString(); + textboxEscapeChar.Text = _config.EscapeChar.ToString(); + checkBoxEscape.Checked = _config.EscapeChar != '\0'; + textBoxCommentChar.Text = _config.CommentChar.ToString(); + checkBoxFieldNames.Checked = _config.HasFieldNames; + textboxEscapeChar.Enabled = checkBoxEscape.Checked; + numericUpDownMinColumns.Value = _config.MinColumns; } private void RetrieveValues() { _config.DelimiterChar = delimiterTextBox.Text; - _config.QuoteChar = quoteCharTextBox.Text[0]; - _config.EscapeChar = escapeCheckBox.Checked ? escapeCharTextBox.Text[0] : '\0'; - _config.CommentChar = commentCharTextBox.Text[0]; - _config.HasFieldNames = fieldNamesCheckBox.Checked; - _config.MinColumns = (int) minColumnsNumericUpDown.Value; + _config.QuoteChar = textBoxQuoteChar.Text[0]; + _config.EscapeChar = checkBoxEscape.Checked ? textboxEscapeChar.Text[0] : '\0'; + _config.CommentChar = textBoxCommentChar.Text[0]; + _config.HasFieldNames = checkBoxFieldNames.Checked; + _config.MinColumns = (int)numericUpDownMinColumns.Value; } #endregion @@ -57,9 +63,10 @@ private void OnOkButtonClick(object sender, EventArgs e) private void OnEscapeCheckBoxCheckedChanged(object sender, EventArgs e) { - escapeCharTextBox.Enabled = escapeCheckBox.Checked; + textboxEscapeChar.Enabled = checkBoxEscape.Checked; } #endregion + } } \ No newline at end of file diff --git a/src/CsvColumnizer/CsvColumnizerConfigDlg.resx b/src/CsvColumnizer/CsvColumnizerConfigDlg.resx index ff31a6db..e0a4c980 100644 --- a/src/CsvColumnizer/CsvColumnizerConfigDlg.resx +++ b/src/CsvColumnizer/CsvColumnizerConfigDlg.resx @@ -1,17 +1,17 @@ - diff --git a/src/DefaultPlugins/DefaultPlugins.csproj b/src/DefaultPlugins/DefaultPlugins.csproj index 72705236..d3c7b1c6 100644 --- a/src/DefaultPlugins/DefaultPlugins.csproj +++ b/src/DefaultPlugins/DefaultPlugins.csproj @@ -3,13 +3,13 @@ net8.0-windows true Library + false LogExpert false true true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/DefaultPlugins/Eminus.cs b/src/DefaultPlugins/Eminus.cs index d60ffc77..d062fd5a 100644 --- a/src/DefaultPlugins/Eminus.cs +++ b/src/DefaultPlugins/Eminus.cs @@ -6,7 +6,9 @@ using System.IO; using System.Runtime.Serialization; using Newtonsoft.Json; +using System.Runtime.Versioning; +[assembly: SupportedOSPlatform("windows")] namespace LogExpert { public class Eminus : IContextMenuEntry, ILogExpertPluginConfigurator @@ -241,10 +243,10 @@ public bool HasEmbeddedForm() return true; } - public void ShowConfigForm(Panel panel) + public void ShowConfigForm(object panel) { dlg = new EminusConfigDlg(tmpConfig); - dlg.Parent = panel; + dlg.Parent = (Panel)panel; dlg.Show(); } @@ -253,11 +255,11 @@ public void ShowConfigForm(Panel panel) /// is pressed (HasEmbeddedForm() must return false for this). /// /// - public void ShowConfigDialog(Form owner) + public void ShowConfigDialog(object owner) { dlg = new EminusConfigDlg(tmpConfig); dlg.TopLevel = true; - dlg.Owner = owner; + dlg.Owner = (Form)owner; dlg.ShowDialog(); dlg.ApplyChanges(); } diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 8d5b69ff..95be07a3 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -9,10 +9,10 @@ - - + + - + diff --git a/src/FlashIconHighlighter/FlashIconHighlighter.csproj b/src/FlashIconHighlighter/FlashIconHighlighter.csproj index b5a8f53b..cc54b3b7 100644 --- a/src/FlashIconHighlighter/FlashIconHighlighter.csproj +++ b/src/FlashIconHighlighter/FlashIconHighlighter.csproj @@ -3,12 +3,12 @@ net8.0-windows true Library + false false true true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/FlashIconHighlighter/FlashIconPlugin.cs b/src/FlashIconHighlighter/FlashIconPlugin.cs index c5b01909..9572b4d9 100644 --- a/src/FlashIconHighlighter/FlashIconPlugin.cs +++ b/src/FlashIconHighlighter/FlashIconPlugin.cs @@ -2,8 +2,10 @@ using System; using System.Runtime.InteropServices; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace FlashIconHighlighter { internal class FlashIconPlugin : IKeywordAction @@ -17,8 +19,6 @@ public string Text #endregion - private delegate void FlashWindowFx(Form form); - #region IKeywordAction Member public void Execute(string keyword, string param, ILogExpertCallback callback, ILogLineColumnizer columnizer) @@ -28,8 +28,7 @@ public void Execute(string keyword, string param, ILogExpertCallback callback, I { if (form.TopLevel && form.Name.Equals("LogTabWindow") && form.Text.Contains(callback.GetFileName())) { - FlashWindowFx fx = FlashWindow; - form.BeginInvoke(fx, [form]); + form.BeginInvoke(FlashWindow, [form]); } } } diff --git a/src/GlassfishColumnizer/GlassfishColumnizer.csproj b/src/GlassfishColumnizer/GlassfishColumnizer.csproj index 4e3ef5cb..c9928ba1 100644 --- a/src/GlassfishColumnizer/GlassfishColumnizer.csproj +++ b/src/GlassfishColumnizer/GlassfishColumnizer.csproj @@ -2,6 +2,7 @@ net8.0-windows Library + false false false $(SolutionDir)..\bin\$(Configuration)\plugins diff --git a/src/JsonColumnizer/JsonColumnizer.csproj b/src/JsonColumnizer/JsonColumnizer.csproj index 08ea9fb1..ffcc325e 100644 --- a/src/JsonColumnizer/JsonColumnizer.csproj +++ b/src/JsonColumnizer/JsonColumnizer.csproj @@ -3,6 +3,7 @@ net8.0-windows true Library + false false true true diff --git a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj index 86b2eba4..67cae4d8 100644 --- a/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj +++ b/src/JsonCompactColumnizer/JsonCompactColumnizer.csproj @@ -3,6 +3,7 @@ net8.0-windows true Library + false JsonColumnizer false true diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs index b542a6cd..88e66fc2 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.cs @@ -1,14 +1,15 @@ -using System; +using Newtonsoft.Json; + +using System; using System.Collections.Generic; using System.Globalization; using System.IO; using System.Linq; -using System.Runtime.Serialization.Formatters.Binary; using System.Runtime.Serialization; +using System.Runtime.Versioning; using System.Windows.Forms; -using Newtonsoft.Json; - +[assembly: SupportedOSPlatform("windows")] namespace LogExpert { /// @@ -221,7 +222,6 @@ public IColumnizedLogLine SplitLine(ILogLineColumnizerCallback callback, ILogLin Column[] columns = Column.CreateColumns(COLUMN_COUNT, clogLine); - // If the line is too short (i.e. does not follow the format for this columnizer) return the whole line content // in colum 8 (the log message column). Date and time column will be left blank. if (line.FullLine.Length < 15) @@ -233,10 +233,12 @@ public IColumnizedLogLine SplitLine(ILogLineColumnizerCallback callback, ILogLin try { DateTime dateTime = GetTimestamp(callback, line); + if (dateTime == DateTime.MinValue) { columns[8].FullValue = line.FullLine; } + string newDate = dateTime.ToString(DATETIME_FORMAT); columns[0].FullValue = newDate; } @@ -305,6 +307,7 @@ public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line) } int endIndex = line.FullLine.IndexOf(separatorChar, 1); + if (endIndex > 20 || endIndex < 0) { return DateTime.MinValue; @@ -314,12 +317,12 @@ public DateTime GetTimestamp(ILogLineColumnizerCallback callback, ILogLine line) try { // convert log4j timestamp into a readable format: - long timestamp; - if (long.TryParse(value, out timestamp)) + if (long.TryParse(value, out long timestamp)) { // Add the time offset before returning DateTime dateTime = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); dateTime = dateTime.AddMilliseconds(timestamp); + if (_config.localTimestamps) { dateTime = dateTime.ToLocalTime(); @@ -347,7 +350,7 @@ public void PushValue(ILogLineColumnizerCallback callback, int column, string va DateTime oldDateTime = DateTime.ParseExact(oldValue, DATETIME_FORMAT, cultureInfo); long mSecsOld = oldDateTime.Ticks / TimeSpan.TicksPerMillisecond; long mSecsNew = newDateTime.Ticks / TimeSpan.TicksPerMillisecond; - timeOffset = (int) (mSecsNew - mSecsOld); + timeOffset = (int)(mSecsNew - mSecsOld); } catch (FormatException) { @@ -411,10 +414,7 @@ public Priority GetPriority(string fileName, IEnumerable samples) #region Private Methods - private string[] GetAllColumnNames() - { - return ["Timestamp", "Level", "Logger", "Thread", "Class", "Method", "File", "Line", "Message"]; - } + private string[] GetAllColumnNames() => ["Timestamp", "Level", "Logger", "Thread", "Class", "Method", "File", "Line", "Message"]; /// @@ -442,7 +442,7 @@ private Column[] MapColumns(Column[] cols) } - return output.ToArray(); + return [.. output]; } #endregion diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj index 8b1834e7..11231a69 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj @@ -3,12 +3,12 @@ net8.0-windows true Library + false false true true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/Log4jXmlColumnizer/Log4jXmlColumnizerConfigDlg.cs b/src/Log4jXmlColumnizer/Log4jXmlColumnizerConfigDlg.cs index ca386094..fae1414d 100644 --- a/src/Log4jXmlColumnizer/Log4jXmlColumnizerConfigDlg.cs +++ b/src/Log4jXmlColumnizer/Log4jXmlColumnizerConfigDlg.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Windows.Forms; namespace LogExpert @@ -15,10 +16,15 @@ public partial class Log4jXmlColumnizerConfigDlg : Form public Log4jXmlColumnizerConfigDlg(Log4jXmlColumnizerConfig config) { + SuspendLayout(); + AutoScaleDimensions = new SizeF(96F, 96F); + AutoScaleMode = AutoScaleMode.Dpi; + _config = config; InitializeComponent(); FillListBox(); localTimeCheckBox.Checked = _config.localTimestamps; + ResumeLayout(); } #endregion @@ -33,7 +39,7 @@ private void FillListBox() foreach (Log4jColumnEntry entry in _config.columnList) { - DataGridViewRow row = new DataGridViewRow(); + DataGridViewRow row = new(); row.Cells.Add(new DataGridViewCheckBoxCell()); row.Cells.Add(new DataGridViewTextBoxCell()); row.Cells.Add(new DataGridViewTextBoxCell()); @@ -58,8 +64,8 @@ private void OkButton_Click(object sender, EventArgs e) { _config.columnList[i].visible = (bool)columnGridView.Rows[i].Cells[0].Value; string sLen = (string)columnGridView.Rows[i].Cells[2].Value; - int len; - if (int.TryParse(sLen, out len)) + + if (int.TryParse(sLen, out int len)) { _config.columnList[i].maxLen = len; } diff --git a/src/LogExpert.Tests/ColumnizerPickerTest.cs b/src/LogExpert.Tests/ColumnizerPickerTest.cs index a69311c3..ae6bedad 100644 --- a/src/LogExpert.Tests/ColumnizerPickerTest.cs +++ b/src/LogExpert.Tests/ColumnizerPickerTest.cs @@ -74,7 +74,7 @@ public void FindReplacementForAutoColumnizer_ValidTextFile_ReturnCorrectColumniz autoColumnizer.Setup(a => a.GetName()).Returns("Auto Columnizer"); // TODO: When DI container is ready, we can mock this set up. - PluginRegistry.GetInstance().RegisteredColumnizers.Add(new JsonCompactColumnizer()); + PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer()); var result = ColumnizerPicker.FindReplacementForAutoColumnizer(fileName, reader, autoColumnizer.Object); Assert.That(columnizerType, Is.EqualTo(result.GetType())); @@ -87,9 +87,9 @@ public void DecideColumnizerByName_WhenReaderIsNotReady_ReturnCorrectColumnizer( string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, fileName); // TODO: When DI container is ready, we can mock this set up. - PluginRegistry.GetInstance().RegisteredColumnizers.Add(new JsonCompactColumnizer()); + PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonCompactColumnizer()); var result = ColumnizerPicker.DecideColumnizerByName(fileName, - PluginRegistry.GetInstance().RegisteredColumnizers); + PluginRegistry.Instance.RegisteredColumnizers); Assert.That(columnizerType, Is.EqualTo(result.GetType())); } @@ -102,10 +102,10 @@ public void DecideColumnizerByName_ValidTextFile_ReturnCorrectColumnizer( string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, columnizerName); // TODO: When DI container is ready, we can mock this set up. - PluginRegistry.GetInstance().RegisteredColumnizers.Add(new JsonColumnizer.JsonColumnizer()); + PluginRegistry.Instance.RegisteredColumnizers.Add(new JsonColumnizer.JsonColumnizer()); var result = ColumnizerPicker.DecideColumnizerByName(columnizerName, - PluginRegistry.GetInstance().RegisteredColumnizers); + PluginRegistry.Instance.RegisteredColumnizers); Assert.That(columnizerType, Is.EqualTo(result.GetType())); } diff --git a/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs b/src/LogExpert/Classes/Columnizer/ColumnizerPicker.cs index 8e46e056..4ccc4cc9 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; } @@ -120,13 +120,13 @@ public static ILogLineColumnizer FindColumnizer(string fileName, IAutoLogLineCol ]; } - var registeredColumnizer = PluginRegistry.GetInstance().RegisteredColumnizers; + var registeredColumnizer = PluginRegistry.Instance.RegisteredColumnizers; List> priorityListOfColumnizers = []; foreach (ILogLineColumnizer logLineColumnizer in registeredColumnizer) { - Priority priority = default(Priority); + Priority priority = default; if (logLineColumnizer is IColumnizerPriority columnizerPriority) { priority = columnizerPriority.GetPriority(fileName, loglines); diff --git a/src/LogExpert/Classes/DelayedTrigger.cs b/src/LogExpert/Classes/DelayedTrigger.cs deleted file mode 100644 index a69f0096..00000000 --- a/src/LogExpert/Classes/DelayedTrigger.cs +++ /dev/null @@ -1,107 +0,0 @@ -using System; -using System.Threading; - -namespace LogExpert.Classes -{ - /// - /// This class receives Trigger calls and sends an event as soons as no more input triggers calls - /// are received for a given time. - /// - internal class DelayedTrigger - { - #region Fields - - private readonly Thread thread = null; - private readonly EventWaitHandle timerEvent = new ManualResetEvent(false); - private readonly EventWaitHandle wakeupEvent = new ManualResetEvent(false); - private bool shouldCancel = false; - private readonly int waitTime = 0; - - #endregion - - #region cTor - - public DelayedTrigger(int waitTimeMs) - { - this.waitTime = waitTimeMs; - this.thread = new Thread(new ThreadStart(worker)); - this.thread.IsBackground = true; - this.thread.Start(); - } - - #endregion - - #region Delegates - - public delegate void SignalEventHandler(object sender, EventArgs e); - - #endregion - - #region Events - - public event SignalEventHandler Signal; - - #endregion - - #region Public methods - - public void Trigger() - { - this.timerEvent.Set(); - this.wakeupEvent.Set(); - } - - public void TriggerImmediate() - { - OnSignal(); - } - - public void Stop() - { - this.shouldCancel = true; - this.wakeupEvent.Set(); - } - - #endregion - - #region Private Methods - - private void worker() - { - while (!this.shouldCancel) - { - this.wakeupEvent.WaitOne(); - if (this.shouldCancel) - { - return; - } - this.wakeupEvent.Reset(); - - while (!this.shouldCancel) - { - bool signaled = this.timerEvent.WaitOne(this.waitTime, true); - this.timerEvent.Reset(); - if (!signaled) - { - break; - } - } - // timeout with no new Trigger -> send event - if (!this.shouldCancel) - { - OnSignal(); - } - } - } - - #endregion - - protected void OnSignal() - { - if (Signal != null) - { - Signal(this, new EventArgs()); - } - } - } -} \ No newline at end of file diff --git a/src/LogExpert/Classes/Filter/Filter.cs b/src/LogExpert/Classes/Filter/Filter.cs index 2528eb5c..c65ddef8 100644 --- a/src/LogExpert/Classes/Filter/Filter.cs +++ b/src/LogExpert/Classes/Filter/Filter.cs @@ -10,7 +10,7 @@ namespace LogExpert.Classes.Filter { internal delegate void FilterFx(FilterParams filterParams, List filterResultLines, List lastFilterResultLines, List filterHitList); - public class Filter + internal class Filter { #region Fields diff --git a/src/LogExpert/Classes/Filter/FilterPipe.cs b/src/LogExpert/Classes/Filter/FilterPipe.cs index 61b093c0..3d679795 100644 --- a/src/LogExpert/Classes/Filter/FilterPipe.cs +++ b/src/LogExpert/Classes/Filter/FilterPipe.cs @@ -7,7 +7,7 @@ namespace LogExpert.Classes.Filter { - public class FilterPipe + internal class FilterPipe { #region Fields diff --git a/src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs b/src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs index b33e46f3..2abb7c4c 100644 --- a/src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs +++ b/src/LogExpert/Classes/ILogLineColumnizerCallback/ColumnizerCallback.cs @@ -3,7 +3,7 @@ namespace LogExpert.Classes.ILogLineColumnizerCallback { - public class ColumnizerCallback : LogExpert.ILogLineColumnizerCallback, IAutoLogLineColumnizerCallback + internal class ColumnizerCallback : LogExpert.ILogLineColumnizerCallback, IAutoLogLineColumnizerCallback { #region Fields @@ -56,7 +56,7 @@ public ILogLine GetLogLine(int lineNum) public IList GetRegisteredColumnizers() { - return PluginRegistry.GetInstance().RegisteredColumnizers; + return PluginRegistry.Instance.RegisteredColumnizers; } public int GetLineCount() diff --git a/src/LogExpert/Classes/ILogLineColumnizerCallback/LogExpertCallback.cs b/src/LogExpert/Classes/ILogLineColumnizerCallback/LogExpertCallback.cs index 8f55c35e..20a8c89d 100644 --- a/src/LogExpert/Classes/ILogLineColumnizerCallback/LogExpertCallback.cs +++ b/src/LogExpert/Classes/ILogLineColumnizerCallback/LogExpertCallback.cs @@ -3,7 +3,7 @@ namespace LogExpert.Classes.ILogLineColumnizerCallback { - public class LogExpertCallback : ColumnizerCallback, ILogExpertCallback + internal class LogExpertCallback : ColumnizerCallback, ILogExpertCallback { #region cTor diff --git a/src/LogExpert/Classes/Log/LogFileInfo.cs b/src/LogExpert/Classes/Log/LogFileInfo.cs index 882dd6dc..31bd9bc8 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/LogfileReader.cs b/src/LogExpert/Classes/Log/LogfileReader.cs index edffb493..521edf06 100644 --- a/src/LogExpert/Classes/Log/LogfileReader.cs +++ b/src/LogExpert/Classes/Log/LogfileReader.cs @@ -849,7 +849,7 @@ private void CloseFiles() private ILogFileInfo GetLogFileInfo(string fileNameOrUri) { - IFileSystemPlugin fs = PluginRegistry.GetInstance().FindFileSystemForUri(fileNameOrUri) ?? throw new LogFileException("No file system plugin found for " + fileNameOrUri); + IFileSystemPlugin fs = PluginRegistry.Instance.FindFileSystemForUri(fileNameOrUri) ?? throw new LogFileException("No file system plugin found for " + fileNameOrUri); ILogFileInfo logFileInfo = fs.GetLogfileInfo(fileNameOrUri); return logFileInfo ?? throw new LogFileException("Cannot find " + fileNameOrUri); } diff --git a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs index e30b5ea9..68e46989 100644 --- a/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs +++ b/src/LogExpert/Classes/Log/PositionAwareStreamReaderBase.cs @@ -1,7 +1,9 @@ -using System; +using LogExpert.Config; +using LogExpert.Entities; + +using System; using System.IO; using System.Text; -using LogExpert.Entities; namespace LogExpert.Classes.Log { @@ -35,7 +37,7 @@ protected PositionAwareStreamReaderBase(Stream stream, EncodingOptions encodingO _posIncPrecomputed = GetPosIncPrecomputed(usedEncoding); _reader = new StreamReader(_stream, usedEncoding, true); - + Position = 0; } @@ -54,7 +56,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 +74,7 @@ public sealed override long Position public sealed override bool IsBufferComplete => true; - protected static int MaxLineLen => MAX_LINE_LEN; + protected static int MaxLineLen => ConfigManager.Settings.Preferences.MaxLineLength; #endregion @@ -128,9 +130,7 @@ protected virtual void ResetReader() protected StreamReader GetStreamReader() { - if (IsDisposed) throw new ObjectDisposedException(ToString()); - - return _reader; + return IsDisposed ? throw new ObjectDisposedException(ToString()) : _reader; } protected void MovePosition(int offset) @@ -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/Log/RolloverFilenameHandler.cs b/src/LogExpert/Classes/Log/RolloverFilenameHandler.cs index 4d4c01c3..00553c35 100644 --- a/src/LogExpert/Classes/Log/RolloverFilenameHandler.cs +++ b/src/LogExpert/Classes/Log/RolloverFilenameHandler.cs @@ -99,7 +99,7 @@ public LinkedList GetNameList() private bool FileExists(string filePath) { - IFileSystemPlugin fs = PluginRegistry.GetInstance().FindFileSystemForUri(filePath); + IFileSystemPlugin fs = PluginRegistry.Instance.FindFileSystemForUri(filePath); ILogFileInfo info = fs.GetLogfileInfo(filePath); return info.FileExists; } diff --git a/src/LogExpert/Classes/LogExpertProxy.cs b/src/LogExpert/Classes/LogExpertProxy.cs index 960a4b72..9109a803 100644 --- a/src/LogExpert/Classes/LogExpertProxy.cs +++ b/src/LogExpert/Classes/LogExpertProxy.cs @@ -127,7 +127,7 @@ public void WindowClosed(LogTabWindow logWin) if (_windowList.Count == 0) { _logger.Info("Last LogTabWindow was closed"); - PluginRegistry.GetInstance().CleanupPlugins(); + PluginRegistry.Instance.CleanupPlugins(); OnLastWindowClosed(); } else diff --git a/src/LogExpert/Classes/PaintHelper.cs b/src/LogExpert/Classes/PaintHelper.cs index ae921e9e..043f921a 100644 --- a/src/LogExpert/Classes/PaintHelper.cs +++ b/src/LogExpert/Classes/PaintHelper.cs @@ -26,7 +26,7 @@ internal class PaintHelper #region Properties - private static Preferences Preferences => ConfigManager.Settings.preferences; + private static Preferences Preferences => ConfigManager.Settings.Preferences; #endregion diff --git a/src/LogExpert/Classes/PluginRegistry.cs b/src/LogExpert/Classes/PluginRegistry.cs index ec2a7099..31cad60e 100644 --- a/src/LogExpert/Classes/PluginRegistry.cs +++ b/src/LogExpert/Classes/PluginRegistry.cs @@ -2,7 +2,9 @@ using LogExpert.Config; using LogExpert.Entities; using LogExpert.Extensions; + using NLog; + using System; using System.Collections.Generic; using System.IO; @@ -24,19 +26,16 @@ public class PluginRegistry #region Fields private static readonly ILogger _logger = LogManager.GetCurrentClassLogger(); - - private static readonly object _lockObject = new(); - private static PluginRegistry _instance; + private static readonly Lazy _instance = new(() => new PluginRegistry()); private readonly IFileSystemCallback _fileSystemCallback = new FileSystemCallback(); private readonly IList _pluginList = new List(); - private readonly IDictionary _registeredKeywordsDict = new Dictionary(); #endregion #region cTor - + // Private constructor to prevent instantiation private PluginRegistry() { LoadPlugins(); @@ -46,6 +45,8 @@ private PluginRegistry() #region Properties + public static PluginRegistry Instance => _instance.Value; + public IList RegisteredColumnizers { get; private set; } public IList RegisteredContextMenuPlugins { get; } = new List(); @@ -57,20 +58,6 @@ private PluginRegistry() #endregion #region Public methods - - public static PluginRegistry GetInstance() - { - lock (_lockObject) - { - if (_instance == null) - { - _instance = new PluginRegistry(); - } - - return _instance; - } - } - #endregion #region Internals @@ -81,7 +68,7 @@ internal void LoadPlugins() RegisteredColumnizers = [ - //TODO: Remove this plugins and load them as any other plugin + //TODO: Remove these plugins and load them as any other plugin new DefaultLogfileColumnizer(), new TimestampColumnizer(), new SquareBracketColumnizer(), @@ -91,55 +78,25 @@ internal void LoadPlugins() string pluginDir = Path.Combine(Application.StartupPath, "plugins"); //TODO: FIXME: This is a hack for the tests to pass. Need to find a better approach - if (!Directory.Exists(pluginDir)) { + if (!Directory.Exists(pluginDir)) + { pluginDir = "."; } - AppDomain currentDomain = AppDomain.CurrentDomain; - currentDomain.AssemblyResolve += ColumnizerResolveEventHandler; - + AppDomain.CurrentDomain.AssemblyResolve += ColumnizerResolveEventHandler; string interfaceName = typeof(ILogLineColumnizer).FullName; - foreach (string dllName in Directory.GetFiles(pluginDir, "*.dll")) + foreach (string dllName in Directory.EnumerateFiles(pluginDir, "*.dll")) { try { - Assembly assembly = Assembly.LoadFrom(dllName); - var types = assembly.GetTypes().Where(t => t.GetInterfaces().Any(i => i.FullName == interfaceName)); - foreach (var type in types) - { - _logger.Info($"Type {type.FullName} in assembly {assembly.FullName} implements {interfaceName}"); - - ConstructorInfo cti = type.GetConstructor(Type.EmptyTypes); - if (cti != null) - { - object o = cti.Invoke([]); - RegisteredColumnizers.Add((ILogLineColumnizer)o); - - if (o is IColumnizerConfigurator configurator) - { - configurator.LoadConfig(ConfigManager.Settings.preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir); - } - - if (o is ILogExpertPlugin plugin) - { - _pluginList.Add(plugin); - plugin.PluginLoaded(); - } - - _logger.Info("Added columnizer {0}", type.Name); - } - } - } - catch (BadImageFormatException e) - { - _logger.Error(e, dllName); - // nothing... could be a DLL which is needed by any plugin + LoadPluginAssembly(dllName, interfaceName); } - catch (FileLoadException e) + catch (Exception ex) when (ex is BadImageFormatException or FileLoadException) { - // can happen when a 32bit-only DLL is loaded on a 64bit system (or vice versa) - _logger.Error(e, dllName); + // Can happen when a 32bit-only DLL is loaded on a 64bit system (or vice versa) + // or could be a not columnizer DLL (e.g. A DLL that is needed by a plugin). + _logger.Error(ex, dllName); } catch (ReflectionTypeLoadException ex) { @@ -151,9 +108,7 @@ internal void LoadPlugins() _logger.Error(loaderException, "Plugin load failed with '{0}'", dllName); } } - _logger.Error(ex, "Loader exception during load of dll '{0}'", dllName); - throw; } catch (Exception ex) @@ -166,10 +121,60 @@ internal void LoadPlugins() _logger.Info("Plugin loading complete."); } + private void LoadPluginAssembly(string dllName, string interfaceName) + { + Assembly assembly = Assembly.LoadFrom(dllName); + var types = assembly.GetTypes(); + + foreach (var type in types) + { + _logger.Info($"Type {type.FullName} in assembly {assembly.FullName} implements {interfaceName}"); + + if (type.GetInterfaces().Any(i => i.FullName == interfaceName)) + { + ConstructorInfo cti = type.GetConstructor(Type.EmptyTypes); + if (cti != null) + { + object instance = cti.Invoke([]); + RegisteredColumnizers.Add((ILogLineColumnizer)instance); + + if (instance is IColumnizerConfigurator configurator) + { + configurator.LoadConfig(ConfigManager.Settings.Preferences.PortableMode ? ConfigManager.PortableModeDir : ConfigManager.ConfigDir); + } + + if (instance is ILogExpertPlugin plugin) + { + _pluginList.Add(plugin); + plugin.PluginLoaded(); + } + + _logger.Info("Added columnizer {0}", type.Name); + } + } + else + { + if (TryAsContextMenu(type)) + { + continue; + } + + if (TryAsKeywordAction(type)) + { + continue; + } + + if (TryAsFileSystem(type)) + { + continue; + } + } + } + } + internal IKeywordAction FindKeywordActionPluginByName(string name) { - IKeywordAction action = null; - _registeredKeywordsDict.TryGetValue(name, out action); + _registeredKeywordsDict.TryGetValue(name, out IKeywordAction action); return action; } @@ -213,7 +218,7 @@ internal IFileSystemPlugin FindFileSystemForUri(string uriString) #endregion #region Private Methods - + //TODO: Can this be delted? private bool TryAsContextMenu(Type type) { IContextMenuEntry me = TryInstantiate(type); @@ -238,6 +243,7 @@ private bool TryAsContextMenu(Type type) return false; } + //TODO: Can this be delted? private bool TryAsKeywordAction(Type type) { IKeywordAction ka = TryInstantiate(type); @@ -263,6 +269,7 @@ private bool TryAsKeywordAction(Type type) return false; } + //TODO: Can this be delted? private bool TryAsFileSystem(Type type) { // file system plugins can have optional constructor with IFileSystemCallback argument @@ -290,7 +297,7 @@ private bool TryAsFileSystem(Type type) return false; } - private T TryInstantiate(Type loadedType) where T : class + private static T TryInstantiate(Type loadedType) where T : class { Type t = typeof(T); Type inter = loadedType.GetInterface(t.Name); @@ -307,7 +314,7 @@ private T TryInstantiate(Type loadedType) where T : class return default(T); } - private T TryInstantiate(Type loadedType, IFileSystemCallback fsCallback) where T : class + private static T TryInstantiate(Type loadedType, IFileSystemCallback fsCallback) where T : class { Type t = typeof(T); Type inter = loadedType.GetInterface(t.Name); @@ -330,21 +337,18 @@ private T TryInstantiate(Type loadedType, IFileSystemCallback fsCallback) whe private static Assembly ColumnizerResolveEventHandler(object sender, ResolveEventArgs args) { - string file = new AssemblyName(args.Name).Name + ".dll"; + string fileName = new AssemblyName(args.Name).Name + ".dll"; + string mainDir = Path.Combine(Application.StartupPath, fileName); + string pluginDir = Path.Combine(Application.StartupPath, "plugins", fileName); - string mainDir = Application.StartupPath + Path.DirectorySeparatorChar; - string pluginDir = mainDir + "plugins\\"; - - FileInfo mainFile = new(mainDir + file); - - FileInfo pluginFile = new(pluginDir + file); - if (mainFile.Exists) + if (File.Exists(mainDir)) { - return Assembly.LoadFrom(mainFile.FullName); + return Assembly.LoadFrom(mainDir); } - else if (pluginFile.Exists) + + if (File.Exists(pluginDir)) { - return Assembly.LoadFrom(pluginFile.FullName); + return Assembly.LoadFrom(pluginDir); } return null; diff --git a/src/LogExpert/Classes/TimeSyncList.cs b/src/LogExpert/Classes/TimeSyncList.cs index bdef4e90..32ae2199 100644 --- a/src/LogExpert/Classes/TimeSyncList.cs +++ b/src/LogExpert/Classes/TimeSyncList.cs @@ -7,7 +7,7 @@ namespace LogExpert.Classes /// /// Holds all windows which are in sync via timestamp /// - public class TimeSyncList + internal class TimeSyncList { #region Fields diff --git a/src/LogExpert/Config/ColorMode.cs b/src/LogExpert/Config/ColorMode.cs index daff9877..3e203602 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 b8b6bafb..96639027 100644 --- a/src/LogExpert/Config/ConfigManager.cs +++ b/src/LogExpert/Config/ConfigManager.cs @@ -166,11 +166,11 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo) } } - settings.preferences ??= new Preferences(); + settings.Preferences ??= new Preferences(); - settings.preferences.toolEntries ??= []; + settings.Preferences.toolEntries ??= []; - settings.preferences.columnizerMaskList ??= []; + settings.Preferences.columnizerMaskList ??= []; settings.fileHistoryList ??= []; @@ -178,24 +178,24 @@ private Settings LoadOrCreateNew(FileSystemInfo 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 ??= []; @@ -224,25 +224,25 @@ private Settings LoadOrCreateNew(FileSystemInfo fileInfo) settings.hilightGroupList.Add(defaultGroup); } - settings.preferences.highlightMaskList ??= []; + 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); @@ -265,7 +265,7 @@ 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)) { @@ -367,11 +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 = 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; + newSettings.Preferences.toolEntries = ownSettings.Preferences.toolEntries; } else { @@ -380,11 +380,11 @@ 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) { @@ -392,7 +392,7 @@ private Settings Import(Settings currentSettings, FileInfo fileInfo, ExportImpor } 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; diff --git a/src/LogExpert/Config/Preferences.cs b/src/LogExpert/Config/Preferences.cs index c0dbc83d..f93647da 100644 --- a/src/LogExpert/Config/Preferences.cs +++ b/src/LogExpert/Config/Preferences.cs @@ -103,6 +103,8 @@ public class Preferences public bool ShowErrorMessageAllowOnlyOneInstances { get; set; } + public int MaxLineLength { get; set; } = 20000; + #endregion } } \ No newline at end of file diff --git a/src/LogExpert/Config/Settings.cs b/src/LogExpert/Config/Settings.cs index 01a10f8e..d21d88a3 100644 --- a/src/LogExpert/Config/Settings.cs +++ b/src/LogExpert/Config/Settings.cs @@ -45,7 +45,7 @@ public class Settings public List lastOpenFilesList = []; - public Preferences preferences = new(); + public Preferences Preferences { get; set; } = new(); public RegexHistory regexHistory = new(); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 3a9eb456..fdac7b84 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -18,7 +18,7 @@ namespace LogExpert.Controls.LogTabWindow { - public partial class LogTabWindow : Form + internal partial class LogTabWindow : Form { #region Fields @@ -46,7 +46,6 @@ public partial class LogTabWindow : Form private readonly EventWaitHandle _statusLineEventHandle = new AutoResetEvent(false); private readonly EventWaitHandle _statusLineEventWakeupHandle = new ManualResetEvent(false); - private readonly object _statusLineLock = new(); private readonly Brush _syncLedBrush; private readonly StringFormat _tabStringFormat = new(); private readonly Brush[] _tailLedBrush = new Brush[3]; @@ -56,8 +55,6 @@ public partial class LogTabWindow : Form private LogWindow.LogWindow _currentLogWindow; private bool _firstBookmarkWindowShow = true; - private StatusLineEventArgs _lastStatusLineEvent; - private Thread _ledThread; //Settings settings; @@ -66,7 +63,6 @@ public partial class LogTabWindow : Form private bool _skipEvents; - private Thread _statusLineThread; private bool _wasMaximized; #endregion @@ -273,22 +269,14 @@ public void ChangeTheme(Control.ControlCollection container) private delegate void FileRespawnedDelegate(LogWindow.LogWindow logWin); - private delegate void GuiStateUpdateWorkerDelegate(GuiStateArgs e); - public delegate void HighlightSettingsChangedEventHandler(object sender, EventArgs e); - private delegate void LoadFileDelegate(string fileName, EncodingOptions encodingOptions); - private delegate void LoadMultiFilesDelegate(string[] fileName, EncodingOptions encodingOptions); - private delegate void ProgressBarEventFx(ProgressEventArgs e); - private delegate void SetColumnizerFx(ILogLineColumnizer columnizer); private delegate void SetTabIconDelegate(LogWindow.LogWindow logWindow, Icon icon); - private delegate void StatusLineEventFx(StatusLineEventArgs e); - #endregion #region Events @@ -307,7 +295,7 @@ 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 HilightGroupList { get; private set; } = []; diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs index c375a056..a8cc552b 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs @@ -18,7 +18,7 @@ namespace LogExpert.Controls.LogTabWindow { - public partial class LogTabWindow + internal partial class LogTabWindow { #region Events handler @@ -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); @@ -64,10 +64,6 @@ private void OnLogTabWindowLoad(object sender, EventArgs e) _ledThread.IsBackground = true; _ledThread.Start(); - _statusLineThread = new Thread(StatusLineThreadFunc); - _statusLineThread.IsBackground = true; - _statusLineThread.Start(); - FillHighlightComboBox(); FillToolLauncherBar(); #if !DEBUG @@ -83,10 +79,9 @@ private void OnLogTabWindowClosing(object sender, CancelEventArgs e) _statusLineEventHandle.Set(); _statusLineEventWakeupHandle.Set(); _ledThread.Join(); - _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) @@ -160,7 +155,7 @@ private void OnSelectFilterToolStripMenuItemClick(object sender, EventArgs e) } CurrentLogWindow.ColumnizerCallbackObject.LineNum = CurrentLogWindow.GetCurrentLineNum(); - FilterSelectorForm form = new(PluginRegistry.GetInstance().RegisteredColumnizers, CurrentLogWindow.CurrentColumnizer, CurrentLogWindow.ColumnizerCallbackObject); + FilterSelectorForm form = new(PluginRegistry.Instance.RegisteredColumnizers, CurrentLogWindow.CurrentColumnizer, CurrentLogWindow.ColumnizerCallbackObject); form.Owner = this; form.TopMost = TopMost; DialogResult res = form.ShowDialog(); @@ -333,7 +328,7 @@ private void OnMultiFileToolStripMenuItemClick(object sender, EventArgs e) private void OnGuiStateUpdate(object sender, GuiStateArgs e) { - BeginInvoke(new GuiStateUpdateWorkerDelegate(GuiStateUpdateWorker), e); + BeginInvoke(GuiStateUpdateWorker, e); } private void OnColumnizerChanged(object sender, ColumnizerEventArgs e) @@ -358,17 +353,12 @@ private void OnBookmarkRemoved(object sender, EventArgs e) private void OnProgressBarUpdate(object sender, ProgressEventArgs e) { - Invoke(new ProgressBarEventFx(ProgressBarUpdateWorker), e); + Invoke(ProgressBarUpdateWorker, e); } private void OnStatusLineEvent(object sender, StatusLineEventArgs e) { - lock (_statusLineLock) - { - _lastStatusLineEvent = e; - _statusLineEventHandle.Set(); - _statusLineEventWakeupHandle.Set(); - } + StatusLineEventWorker(e); } private void OnFollowTailCheckBoxClick(object sender, EventArgs e) @@ -962,7 +952,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 0f336e3f..c3cfac92 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs @@ -22,7 +22,7 @@ namespace LogExpert.Controls.LogTabWindow { - public partial class LogTabWindow + internal partial class LogTabWindow { #region Private Methods @@ -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; } } @@ -264,7 +264,7 @@ private string FindFilenameForSettings(string fileName) if (!string.IsNullOrEmpty(persistenceData.fileName)) { - IFileSystemPlugin fs = PluginRegistry.GetInstance().FindFileSystemForUri(persistenceData.fileName); + IFileSystemPlugin fs = PluginRegistry.Instance.FindFileSystemForUri(persistenceData.fileName); if (fs != null && !fs.GetType().Equals(typeof(LocalFileSystem))) { return persistenceData.fileName; @@ -330,7 +330,7 @@ private void ShowHighlightSettingsDialog() { HighlightDialog dlg = new() { - KeywordActionList = PluginRegistry.GetInstance().RegisteredKeywordActions, + KeywordActionList = PluginRegistry.Instance.RegisteredKeywordActions, Owner = this, TopMost = TopMost, HighlightGroupList = HilightGroupList, @@ -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; @@ -664,60 +664,30 @@ private void ProgressBarUpdateWorker(ProgressEventArgs e) } } - private void StatusLineThreadFunc() + private void StatusLineEventWorker(StatusLineEventArgs e) { - int timeSum = 0; - int waitTime = 30; - while (!_shouldStop) - { - _statusLineEventWakeupHandle.WaitOne(); - _statusLineEventWakeupHandle.Reset(); - if (!_shouldStop) + if (e != null) + { + //_logger.logDebug("StatusLineEvent: text = " + e.StatusText); + labelStatus.Text = e.StatusText; + labelStatus.Size = TextRenderer.MeasureText(labelStatus.Text, labelStatus.Font); + labelLines.Text = $" {e.LineCount} lines"; + labelLines.Size = TextRenderer.MeasureText(labelLines.Text, labelLines.Font); + labelSize.Text = Util.GetFileSizeAsText(e.FileSize); + labelSize.Size = TextRenderer.MeasureText(labelSize.Text, labelSize.Font); + labelCurrentLine.Text = $"Line: {e.CurrentLineNum}"; + labelCurrentLine.Size = TextRenderer.MeasureText(labelCurrentLine.Text, labelCurrentLine.Font); + if (statusStrip.InvokeRequired) { - bool signaled = false; - do - { - //this.statusLineEventHandle.Reset(); - signaled = _statusLineEventHandle.WaitOne(waitTime, true); - timeSum += waitTime; - } while (signaled && timeSum < 900 && !_shouldStop); - - if (!_shouldStop) - { - timeSum = 0; - try - { - StatusLineEventArgs e; - lock (_statusLineLock) - { - e = _lastStatusLineEvent.Clone(); - } - - BeginInvoke(new StatusLineEventFx(StatusLineEventWorker), e); - } - catch (ObjectDisposedException) - { - //TODO needs to be handled or removed - } - } + statusStrip.BeginInvoke(new MethodInvoker(delegate { statusStrip.Refresh(); })); + } + else + { + statusStrip.Refresh(); } } } - private void StatusLineEventWorker(StatusLineEventArgs e) - { - //_logger.logDebug("StatusLineEvent: text = " + e.StatusText); - labelStatus.Text = e.StatusText; - labelStatus.Size = TextRenderer.MeasureText(labelStatus.Text, labelStatus.Font); - labelLines.Text = $" {e.LineCount} lines"; - labelLines.Size = TextRenderer.MeasureText(labelLines.Text, labelLines.Font); - labelSize.Text = Util.GetFileSizeAsText(e.FileSize); - labelSize.Size = TextRenderer.MeasureText(labelSize.Text, labelSize.Font); - labelCurrentLine.Text = $"Line: {e.CurrentLineNum}"; - labelCurrentLine.Size = TextRenderer.MeasureText(labelCurrentLine.Text, labelCurrentLine.Font); - statusStrip.Refresh(); - } - // tailState: 0,1,2 = on/off/off by Trigger // syncMode: 0 = normal (no), 1 = time synced private Icon CreateLedIcon(int level, bool dirty, int tailState, int syncMode) @@ -952,12 +922,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,11 +942,11 @@ 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); + _bookmarkWindow.PreferencesChanged(ConfigManager.Settings.Preferences, false, flags); HilightGroupList = ConfigManager.Settings.hilightGroupList; if ((flags & SettingsFlags.HighlightSettings) == SettingsFlags.HighlightSettings) @@ -990,7 +960,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; } @@ -1001,7 +971,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) @@ -1104,7 +1074,7 @@ private void StartTool(string cmd, string args, bool sysoutPipe, string columniz if (sysoutPipe) { ILogLineColumnizer columnizer = ColumnizerPicker.DecideColumnizerByName(columnizerName, - PluginRegistry.GetInstance().RegisteredColumnizers); + PluginRegistry.Instance.RegisteredColumnizers); _logger.Info("Starting external tool with sysout redirection: {0} {1}", cmd, args); startInfo.UseShellExecute = false; diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs index 90cbc461..ec5d385a 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPublic.cs @@ -16,7 +16,7 @@ namespace LogExpert.Controls.LogTabWindow { - public partial class LogTabWindow + internal partial class LogTabWindow { #region Public methods @@ -116,8 +116,7 @@ public LogWindow.LogWindow AddFileTab(string givenFileName, bool isTempFile, str } // this.BeginInvoke(new LoadFileDelegate(logWindow.LoadFile), new object[] { logFileName, encoding }); - LoadFileDelegate loadFileFx = logWindow.LoadFile; - Task task = Task.Run(() => logWindow.LoadFile(logFileName, encodingOptions)); + Task.Run(() => logWindow.LoadFile(logFileName, encodingOptions)); return logWindow; } @@ -141,7 +140,7 @@ public LogWindow.LogWindow AddMultiFileTab(string[] fileNames) public void LoadFiles(string[] fileNames) { - Invoke(new AddFileTabsDelegate(AddFileTabs), new object[] {fileNames}); + Invoke(new AddFileTabsDelegate(AddFileTabs), [fileNames]); } public void OpenSearchDialog() @@ -170,7 +169,7 @@ public ILogLineColumnizer GetColumnizerHistoryEntry(string fileName) ColumnizerHistoryEntry entry = FindColumnizerHistoryEntry(fileName); if (entry != null) { - foreach (ILogLineColumnizer columnizer in PluginRegistry.GetInstance().RegisteredColumnizers) + foreach (ILogLineColumnizer columnizer in PluginRegistry.Instance.RegisteredColumnizers) { if (columnizer.GetName().Equals(entry.ColumnizerName)) { @@ -234,7 +233,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) { @@ -242,7 +241,7 @@ public ILogLineColumnizer FindColumnizerByFileMask(string fileName) { if (Regex.IsMatch(fileName, entry.mask)) { - ILogLineColumnizer columnizer = ColumnizerPicker.FindColumnizerByName(entry.columnizerName, PluginRegistry.GetInstance().RegisteredColumnizers); + ILogLineColumnizer columnizer = ColumnizerPicker.FindColumnizerByName(entry.columnizerName, PluginRegistry.Instance.RegisteredColumnizers); return columnizer; } } @@ -259,7 +258,7 @@ public ILogLineColumnizer FindColumnizerByFileMask(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) { diff --git a/src/LogExpert/Controls/LogWindow/LogWindow.cs b/src/LogExpert/Controls/LogWindow/LogWindow.cs index 8e726979..7cb5c3ca 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindow.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindow.cs @@ -25,7 +25,7 @@ namespace LogExpert.Controls.LogWindow { - public partial class LogWindow : DockContent, ILogPaintContext, ILogView + internal partial class LogWindow : DockContent, ILogPaintContext, ILogView { #region Fields @@ -68,10 +68,8 @@ public partial class LogWindow : DockContent, ILogPaintContext, ILogView private readonly ProgressEventArgs _progressEventArgs = new(); private readonly object _reloadLock = new(); private readonly Image _searchButtonImage; - private readonly DelayedTrigger _selectionChangedTrigger = new(200); private readonly StatusLineEventArgs _statusEventArgs = new(); - private readonly DelayedTrigger _statusLineTrigger = new(200); private readonly object _tempHighlightEntryListLock = new(); private readonly Task _timeShiftSyncTask; @@ -180,7 +178,7 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF tableLayoutPanel1.ColumnStyles[0].Width = 100; _parentLogTabWin.HighlightSettingsChanged += OnParentHighlightSettingsChanged; - SetColumnizer(PluginRegistry.GetInstance().RegisteredColumnizers[0]); + SetColumnizer(PluginRegistry.Instance.RegisteredColumnizers[0]); _patternArgs.maxMisses = 5; _patternArgs.minWeight = 1; @@ -198,7 +196,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; @@ -262,9 +260,6 @@ public LogWindow(LogTabWindow.LogTabWindow parent, string fileName, bool isTempF ResumeLayout(); - _statusLineTrigger.Signal += OnStatusLineTriggerSignal; - _selectionChangedTrigger.Signal += OnSelectionChangedTriggerSignal; - ChangeTheme(Controls); } @@ -499,7 +494,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; @@ -619,12 +614,6 @@ private void OnButtonSizeChanged(object sender, EventArgs e) // used for external wait fx WaitForLoadFinished() - private delegate void UpdateGridCallback(LogEventArgs e); - - private delegate void UpdateProgressCallback(LoadFileEventArgs e); - - private delegate void LoadingStartedFx(LoadFileEventArgs e); - private delegate void SelectLineFx(int line, bool triggerSyncCall); private Action, List, List> FilterFxAction; diff --git a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs index 4cb1aa51..4892ab3c 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowEventHandlers.cs @@ -21,7 +21,7 @@ namespace LogExpert.Controls.LogWindow { - public partial class LogWindow + internal partial class LogWindow { private void AutoResizeFilterBox() { @@ -32,20 +32,17 @@ private void AutoResizeFilterBox() protected void OnProgressBarUpdate(ProgressEventArgs e) { - ProgressBarEventHandler handler = ProgressBarUpdate; - handler?.Invoke(this, e); + ProgressBarUpdate?.Invoke(this, e); } protected void OnStatusLine(StatusLineEventArgs e) { - StatusLineEventHandler handler = StatusLineEvent; - handler?.Invoke(this, e); + StatusLineEvent?.Invoke(this, e); } protected void OnGuiState(GuiStateArgs e) { - GuiStateEventHandler handler = GuiStateUpdate; - handler?.Invoke(this, e); + GuiStateUpdate?.Invoke(this, e); } protected void OnTailFollowed(EventArgs e) @@ -125,7 +122,7 @@ private void OnLogWindowDisposed(object sender, EventArgs e) private void OnLogFileReaderLoadingStarted(object sender, LoadFileEventArgs e) { - Invoke(new LoadingStartedFx(LoadingStarted), e); + Invoke(LoadingStarted, e); } private void OnLogFileReaderFinishedLoading(object sender, EventArgs e) @@ -214,16 +211,11 @@ private void OnLogFileReaderLoadFile(object sender, LoadFileEventArgs e) //Thread loadThread = new Thread(new ThreadStart(ReloadNewFile)); //loadThread.Start(); _logger.Debug("Reloading invoked."); - return; } - - if (!_isLoading) + else if (_isLoading) { - return; + BeginInvoke(UpdateProgress, e); } - - UpdateProgressCallback callback = UpdateProgress; - BeginInvoke(callback, e); } private void OnFileSizeChanged(object sender, LogEventArgs e) @@ -799,11 +791,11 @@ private void OnDataGridContextMenuStripOpening(object sender, CancelEventArgs e) // Add plugin entries bool isAdded = false; - if (PluginRegistry.GetInstance().RegisteredContextMenuPlugins.Count > 0) + if (PluginRegistry.Instance.RegisteredContextMenuPlugins.Count > 0) { //string line = this.logFileReader.GetLogLine(lineNum); IList lines = GetSelectedContent(); - foreach (IContextMenuEntry entry in PluginRegistry.GetInstance().RegisteredContextMenuPlugins) + foreach (IContextMenuEntry entry in PluginRegistry.Instance.RegisteredContextMenuPlugins) { LogExpertCallback callback = new(this); ContextMenuPluginEventArgs evArgs = new(entry, lines, CurrentColumnizer, callback); @@ -1556,11 +1548,6 @@ private void OnMarkFilterHitsInLogViewToolStripMenuItemClick(object sender, Even AddSearchHitHighlightEntry(p); } - private void OnStatusLineTriggerSignal(object sender, EventArgs e) - { - OnStatusLine(_statusEventArgs); - } - private void OnColumnComboBoxSelectionChangeCommitted(object sender, EventArgs e) { SelectColumn(); diff --git a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs index 4bfaaac2..cfbb7b65 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowPrivate.cs @@ -25,7 +25,7 @@ namespace LogExpert.Controls.LogWindow { - public partial class LogWindow + internal partial class LogWindow { #region Private Methods @@ -642,8 +642,7 @@ private void LogEventWorker() } } - UpdateGridCallback callback = UpdateGrid; - Invoke(callback, [e]); + Invoke(UpdateGrid, [e]); CheckFilterAndHighlight(e); _timeSpreadCalc.SetLineCount(e.LineCount); } @@ -897,7 +896,7 @@ private void LaunchHighlightPlugins(IList matchingList, int lineNu if (entry.IsActionEntry && entry.ActionEntry.PluginName != null) { IKeywordAction plugin = - PluginRegistry.GetInstance().FindKeywordActionPluginByName(entry.ActionEntry.PluginName); + PluginRegistry.Instance.FindKeywordActionPluginByName(entry.ActionEntry.PluginName); if (plugin != null) { ActionPluginExecuteFx fx = plugin.Execute; @@ -1582,7 +1581,6 @@ private void StatusLineFileSize(long size) private int Search(SearchParams searchParams) { - UpdateProgressBarFx progressFx = UpdateProgressBar; if (searchParams.searchText == null) { return -1; @@ -1680,7 +1678,7 @@ private int Search(SearchParams searchParams) { if (!Disposing) { - Invoke(progressFx, [count]); + Invoke(UpdateProgressBar, [count]); } } catch (ObjectDisposedException ex) // can occur when closing the app while searching @@ -1968,7 +1966,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) { @@ -2043,7 +2041,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)); @@ -2579,8 +2577,6 @@ private void UpdateSelectionDisplay() { return; } - - _selectionChangedTrigger.Trigger(); } private void UpdateFilterHistoryFromSettings() @@ -2629,8 +2625,7 @@ private void SendProgressBarUpdate() private void SendStatusLineUpdate() { - //OnStatusLine(this.statusEventArgs); - _statusLineTrigger.Trigger(); + OnStatusLine(_statusEventArgs); } private void ShowAdvancedFilterPanel(bool show) @@ -2793,7 +2788,7 @@ private void FilterRestore(LogWindow newWin, PersistenceData persistenceData) { newWin.WaitForLoadingFinished(); ILogLineColumnizer columnizer = ColumnizerPicker.FindColumnizerByName(persistenceData.columnizerName, - PluginRegistry.GetInstance().RegisteredColumnizers); + PluginRegistry.Instance.RegisteredColumnizers); if (columnizer != null) { SetColumnizerFx fx = newWin.ForceColumnizer; diff --git a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs index 73804a4a..8f8ef767 100644 --- a/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs +++ b/src/LogExpert/Controls/LogWindow/LogWindowsPublic.cs @@ -20,7 +20,7 @@ namespace LogExpert.Controls.LogWindow { - public partial class LogWindow + internal partial class LogWindow { #region Public methods @@ -81,8 +81,10 @@ public void LoadFile(string fileName, EncodingOptions encodingOptions) try { - _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions); - _logFileReader.UseNewReader = !Preferences.useLegacyReader; + _logFileReader = new LogfileReader(fileName, EncodingOptions, IsMultiFile, Preferences.bufferCount, Preferences.linesPerBuffer, _multiFileOptions) + { + UseNewReader = !Preferences.useLegacyReader + }; } catch (LogFileException lfe) { @@ -268,9 +270,6 @@ public void CloseLogWindow() StopTimespreadThread(); StopTimestampSyncThread(); StopLogEventWorkerThread(); - _statusLineTrigger.Stop(); - _selectionChangedTrigger.Stop(); - //StopFilterUpdateWorkerThread(); _shouldCancel = true; if (_logFileReader != null) @@ -321,7 +320,7 @@ public void ForceColumnizerForLoading(ILogLineColumnizer columnizer) public void PreselectColumnizer(string columnizerName) { - ILogLineColumnizer columnizer = ColumnizerPicker.FindColumnizerByName(columnizerName, PluginRegistry.GetInstance().RegisteredColumnizers); + ILogLineColumnizer columnizer = ColumnizerPicker.FindColumnizerByName(columnizerName, PluginRegistry.Instance.RegisteredColumnizers); PreSelectColumnizer(ColumnizerPicker.CloneColumnizer(columnizer)); } @@ -863,7 +862,7 @@ public void ToggleBookmark() if (filterGridView.Focused) { gridView = filterGridView; - if (gridView.CurrentCellAddress == null || gridView.CurrentCellAddress.Y == -1) + if (gridView.CurrentCellAddress.Y == -1) { return; } @@ -873,7 +872,7 @@ public void ToggleBookmark() else { gridView = dataGridView; - if (gridView.CurrentCellAddress == null || gridView.CurrentCellAddress.Y == -1) + if (gridView.CurrentCellAddress.Y == -1) { return; } diff --git a/src/LogExpert/Controls/PatternWindow.cs b/src/LogExpert/Controls/PatternWindow.cs index 52151bcd..d0c3b28d 100644 --- a/src/LogExpert/Controls/PatternWindow.cs +++ b/src/LogExpert/Controls/PatternWindow.cs @@ -7,7 +7,7 @@ namespace LogExpert.Controls { - public partial class PatternWindow : Form + internal partial class PatternWindow : Form { #region Fields diff --git a/src/LogExpert/Dialogs/FilterSelectorForm.cs b/src/LogExpert/Dialogs/FilterSelectorForm.cs index 05297708..9410c479 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/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs index dfb8ed33..3ccc13f5 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs @@ -1,1889 +1,1835 @@ namespace LogExpert.Dialogs { - partial class SettingsDialog - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) + partial class SettingsDialog { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - #region Windows Form Designer generated code + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - /// - /// 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(); + #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(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SettingsDialog)); - 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 = 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(); // // tabControlSettings // - 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; + 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; // // tabPageViewSettings // - 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; + 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(482, 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(217, 15); + labelMaximumLineLength.TabIndex = 14; + labelMaximumLineLength.Text = "Maximum Line Length (restart required)"; // // upDownMaximumFilterEntriesDisplayed // - 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}); + 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 }); // // labelMaximumFilterEntriesDisplayed // - 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"; + 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(179, 15); + labelMaximumFilterEntriesDisplayed.TabIndex = 12; + labelMaximumFilterEntriesDisplayed.Text = "Maximum filter entries displayed"; // // upDownMaximumFilterEntries // - 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}); + 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 }); // // labelMaximumFilterEntries // - 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"; + 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(126, 15); + labelMaximumFilterEntries.TabIndex = 10; + labelMaximumFilterEntries.Text = "Maximum filter entries"; // // labelDefaultEncoding // - 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"; + 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"; // // comboBoxEncoding // - 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."); + 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."); // // groupBoxMisc // - 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"; + 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; // // cpDownColumnWidth // - 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}); + 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 }); // // checkBoxColumnSize // - 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); + 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; // // buttonTailColor // - 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); + 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; // // checkBoxTailState // - 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; + 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; // // checkBoxOpenLastFiles // - 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; + 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; // // checkBoxSingleInstance // - 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; + 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; // // checkBoxAskCloseTabs // - 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; + 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; // // groupBoxDefaults // - 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"; + 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"; // // checkBoxDarkMode // - 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; + 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; // // checkBoxFollowTail // - 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; + 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; // // checkBoxColumnFinder // - 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; + 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; // // checkBoxSyncFilter // - 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; + 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; // // checkBoxFilterTail // - 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; + 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; // // groupBoxFont // - 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"; + 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"; // // buttonChangeFont // - 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); + 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; // // labelFont // - 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; + 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; // // tabPageTimeStampFeatures // - 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; + 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; // // groupBoxTimeSpreadDisplay // - 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"; + 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"; // // groupBoxDisplayMode // - 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"; + 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"; // // radioButtonLineView // - 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; + 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; // // radioButtonTimeView // - 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; + 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(79, 19); + radioButtonTimeView.TabIndex = 10; + radioButtonTimeView.TabStop = true; + radioButtonTimeView.Text = "Time view"; + radioButtonTimeView.UseVisualStyleBackColor = true; // // checkBoxReverseAlpha // - 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; + 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; // // buttonTimespreadColor // - 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); + 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; // // checkBoxTimeSpread // - 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; + 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; // // groupBoxTimeStampNavigationControl // - 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"; + 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"; // // checkBoxTimestamp // - 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; + 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; // // groupBoxMouseDragDefaults // - 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"; + 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"; // // radioButtonVerticalMouseDragInverted // - 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; + 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; // // radioButtonHorizMouseDrag // - 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; + 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; // // radioButtonVerticalMouseDrag // - 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; + 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; // // tabPageExternalTools // - 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; + 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; // // labelToolsDescription // - 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."; + 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."; // // buttonToolDelete // - 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); + 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; // // buttonToolAdd // - 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); + 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; // // buttonToolDown // - 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); + 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; // // buttonToolUp // - 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); + 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; // // listBoxTools // - 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); + 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; // // groupBoxToolSettings // - 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"; + 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"; // // labelWorkingDir // - 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:"; + 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:"; // // buttonWorkingDir // - 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); + 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; // // textBoxWorkingDir // - 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; + 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; // // buttonIcon // - 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); + 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; // // labelToolName // - 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:"; + 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:"; // // labelToolColumnizerForOutput // - 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:"; + 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:"; // // comboBoxColumnizer // - 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; + 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; // // textBoxToolName // - 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; + 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; // // checkBoxSysout // - 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); + 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; // // buttonArguments // - 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); + 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; // // labelTool // - 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:"; + 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:"; // // buttonTool // - 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); + 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; // // textBoxTool // - 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; + 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; // // labelArguments // - 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:"; + 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:"; // // textBoxArguments // - 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; + 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; // // tabPageColumnizers // - 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; + 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; // // checkBoxAutoPick // - 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; + 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; // // checkBoxMaskPrio // - 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; + 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; // // buttonDelete // - 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); + 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; // // dataGridViewColumnizer // - 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); + 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; // // columnFileMask // - this.columnFileMask.HeaderText = "File name mask (RegEx)"; - this.columnFileMask.MinimumWidth = 40; - this.columnFileMask.Name = "columnFileMask"; + columnFileMask.HeaderText = "File name mask (RegEx)"; + columnFileMask.MinimumWidth = 40; + columnFileMask.Name = "columnFileMask"; // // columnColumnizer // - this.columnColumnizer.HeaderText = "Columnizer"; - this.columnColumnizer.MinimumWidth = 230; - this.columnColumnizer.Name = "columnColumnizer"; + columnColumnizer.HeaderText = "Columnizer"; + columnColumnizer.MinimumWidth = 230; + columnColumnizer.Name = "columnColumnizer"; // // tabPageHighlightMask // - 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; + 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; // // dataGridViewHighlightMask // - 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; + 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; // // columnFileName // - this.columnFileName.HeaderText = "File name mask (RegEx)"; - this.columnFileName.MinimumWidth = 40; - this.columnFileName.Name = "columnFileName"; + columnFileName.HeaderText = "File name mask (RegEx)"; + columnFileName.MinimumWidth = 40; + columnFileName.Name = "columnFileName"; // // columnHighlightGroup // - this.columnHighlightGroup.HeaderText = "Highlight group"; - this.columnHighlightGroup.MinimumWidth = 50; - this.columnHighlightGroup.Name = "columnHighlightGroup"; + columnHighlightGroup.HeaderText = "Highlight group"; + columnHighlightGroup.MinimumWidth = 50; + columnHighlightGroup.Name = "columnHighlightGroup"; // // tabPageMultiFile // - 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; + 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; // // groupBoxDefaultFileNamePattern // - 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"; + 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"; // // labelMaxDays // - 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:"; + 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(59, 15); + labelMaxDays.TabIndex = 3; + labelMaxDays.Text = "Max days:"; // // labelPattern // - 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:"; + 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:"; // // upDownMultifileDays // - 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}); + 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 }); // // textBoxMultifilePattern // - 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); + 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; // // labelHintMultiFile // - 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."; + 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."; // // labelNoteMultiFile // - 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"); + 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"); // // groupBoxWhenOpeningMultiFile // - 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..."; + 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..."; // // radioButtonAskWhatToDo // - 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; + 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; // // radioButtonTreatAllFilesAsOneMultifile // - 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; + 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(182, 19); + radioButtonTreatAllFilesAsOneMultifile.TabIndex = 1; + radioButtonTreatAllFilesAsOneMultifile.TabStop = true; + radioButtonTreatAllFilesAsOneMultifile.Text = "Treat all files as one 'MultiFile'"; + radioButtonTreatAllFilesAsOneMultifile.UseVisualStyleBackColor = true; // // radioButtonLoadEveryFileIntoSeperatedTab // - 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; + 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; // // tabPagePlugins // - 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; + 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; // // groupBoxPlugins // - 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"; + 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"; // // listBoxPlugin // - 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); + 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; // // groupBoxSettings // - 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"; + 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"; // // panelPlugin // - 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; + 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; // // buttonConfigPlugin // - 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); + 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; // // tabPageSessions // - 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; + 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; // // checkBoxPortableMode // - 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); + 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; // // checkBoxSaveFilter // - 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; + 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; // // groupBoxPersistantFileLocation // - 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"; + 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"; // // labelSessionSaveOwnDir // - 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"; + 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"; // // buttonSessionSaveDir // - 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); + 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; // // radioButtonSessionSaveOwn // - 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; + 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; // // radioButtonsessionSaveDocuments // - 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; + 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(160, 19); + radioButtonsessionSaveDocuments.TabIndex = 1; + radioButtonsessionSaveDocuments.TabStop = true; + radioButtonsessionSaveDocuments.Text = "MyDocuments/LogExpert"; + radioButtonsessionSaveDocuments.UseVisualStyleBackColor = true; // // radioButtonSessionSameDir // - 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; + 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; // // radioButtonSessionApplicationStartupDir // - 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; + 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; // // checkBoxSaveSessions // - 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; + 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(241, 19); + checkBoxSaveSessions.TabIndex = 0; + checkBoxSaveSessions.Text = "Automatically save persistence files (.lxp)"; + checkBoxSaveSessions.UseVisualStyleBackColor = true; // // tabPageMemory // - 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; + 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; // // groupBoxCPUAndStuff // - 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"; + 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"; // // checkBoxLegacyReader // - 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; + 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; // // checkBoxMultiThread // - 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; + 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; // // labelFilePollingInterval // - 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):"; + 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):"; // // upDownPollingInterval // - 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}); + 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 }); // // groupBoxLineBufferUsage // - 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"; + 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"; // // labelInfo // - 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"; + 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(219, 15); + labelInfo.TabIndex = 4; + labelInfo.Text = "Changes will take effect on next file load"; // // labelNumberOfBlocks // - 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"; + 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"; // // upDownLinesPerBlock // - 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); + 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[] { 5000000, 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[] { 50000, 0, 0, 0 }); + upDownLinesPerBlock.ValueChanged += OnNumericUpDown1ValueChanged; // // upDownBlockCount // - 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}); + 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 }); // // labelLinesPerBlock // - 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"; + 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"; // // buttonCancel // - 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); + 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; // // buttonOk // - 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); + 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; // // helpProvider // - this.helpProvider.HelpNamespace = "LogExpert.chm"; + helpProvider.HelpNamespace = "LogExpert.chm"; // // buttonExport // - 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); + 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; // // buttonImport // - 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); + 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; // // dataGridViewTextBoxColumn1 // - this.dataGridViewTextBoxColumn1.HeaderText = "File name mask (RegEx)"; - this.dataGridViewTextBoxColumn1.MinimumWidth = 40; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.Width = 99; + dataGridViewTextBoxColumn1.HeaderText = "File name mask (RegEx)"; + dataGridViewTextBoxColumn1.MinimumWidth = 40; + dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + dataGridViewTextBoxColumn1.Width = 99; // // dataGridViewTextBoxColumn2 // - 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; + dataGridViewTextBoxColumn2.HeaderText = "File name mask (RegEx)"; + dataGridViewTextBoxColumn2.MinimumWidth = 40; + dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + dataGridViewTextBoxColumn2.Width = 259; // // SettingsDialog // - 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); - - } + 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); + } - #endregion + #endregion - private System.Windows.Forms.TabControl tabControlSettings; - private System.Windows.Forms.TabPage tabPageViewSettings; - private System.Windows.Forms.Label labelFont; - private System.Windows.Forms.TabPage tabPageTimeStampFeatures; - private System.Windows.Forms.GroupBox groupBoxFont; - private System.Windows.Forms.Button buttonChangeFont; - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Button buttonOk; - private System.Windows.Forms.CheckBox checkBoxFilterTail; - private System.Windows.Forms.CheckBox checkBoxFollowTail; - private System.Windows.Forms.CheckBox checkBoxSyncFilter; - private System.Windows.Forms.GroupBox groupBoxDefaults; - private System.Windows.Forms.CheckBox checkBoxTimestamp; - private System.Windows.Forms.GroupBox groupBoxMouseDragDefaults; - private System.Windows.Forms.RadioButton radioButtonHorizMouseDrag; - private System.Windows.Forms.RadioButton radioButtonVerticalMouseDrag; - private System.Windows.Forms.RadioButton radioButtonVerticalMouseDragInverted; - private System.Windows.Forms.TabPage tabPageExternalTools; - private System.Windows.Forms.GroupBox groupBoxToolSettings; - private System.Windows.Forms.TextBox textBoxArguments; - private System.Windows.Forms.Button buttonTool; - private System.Windows.Forms.TextBox textBoxTool; - private System.Windows.Forms.Label labelArguments; - private System.Windows.Forms.Label labelTool; - private System.Windows.Forms.Button buttonArguments; - private System.Windows.Forms.TabPage tabPageColumnizers; - private System.Windows.Forms.DataGridView dataGridViewColumnizer; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.Button buttonDelete; - private System.Windows.Forms.DataGridViewTextBoxColumn columnFileMask; - private System.Windows.Forms.DataGridViewComboBoxColumn columnColumnizer; - private System.Windows.Forms.CheckBox checkBoxSysout; - private System.Windows.Forms.CheckBox checkBoxMaskPrio; - private System.Windows.Forms.GroupBox groupBoxMisc; - private System.Windows.Forms.CheckBox checkBoxAskCloseTabs; - private System.Windows.Forms.TabPage tabPageMultiFile; - private System.Windows.Forms.GroupBox groupBoxWhenOpeningMultiFile; - private System.Windows.Forms.RadioButton radioButtonAskWhatToDo; - private System.Windows.Forms.RadioButton radioButtonTreatAllFilesAsOneMultifile; - private System.Windows.Forms.RadioButton radioButtonLoadEveryFileIntoSeperatedTab; - private System.Windows.Forms.Label labelNoteMultiFile; - private System.Windows.Forms.Label labelHintMultiFile; - private System.Windows.Forms.HelpProvider helpProvider; - private System.Windows.Forms.CheckBox checkBoxSingleInstance; - private System.Windows.Forms.ComboBox comboBoxColumnizer; - private System.Windows.Forms.CheckBox checkBoxOpenLastFiles; - private System.Windows.Forms.CheckBox checkBoxTailState; - private System.Windows.Forms.Button buttonTailColor; - private System.Windows.Forms.NumericUpDown cpDownColumnWidth; - private System.Windows.Forms.CheckBox checkBoxColumnSize; - private System.Windows.Forms.CheckBox checkBoxTimeSpread; - private System.Windows.Forms.GroupBox groupBoxTimeSpreadDisplay; - private System.Windows.Forms.GroupBox groupBoxTimeStampNavigationControl; - private System.Windows.Forms.Button buttonTimespreadColor; - private System.Windows.Forms.CheckBox checkBoxReverseAlpha; - private System.Windows.Forms.GroupBox groupBoxDisplayMode; - private System.Windows.Forms.RadioButton radioButtonLineView; - private System.Windows.Forms.RadioButton radioButtonTimeView; - private System.Windows.Forms.TabPage tabPagePlugins; - private System.Windows.Forms.ListBox listBoxPlugin; - private System.Windows.Forms.Panel panelPlugin; - private System.Windows.Forms.GroupBox groupBoxPlugins; - private System.Windows.Forms.GroupBox groupBoxSettings; - private System.Windows.Forms.Button buttonConfigPlugin; - private System.Windows.Forms.TabPage tabPageSessions; - private System.Windows.Forms.GroupBox groupBoxPersistantFileLocation; - private System.Windows.Forms.RadioButton radioButtonsessionSaveDocuments; - private System.Windows.Forms.RadioButton radioButtonSessionSameDir; - private System.Windows.Forms.CheckBox checkBoxSaveSessions; - private System.Windows.Forms.RadioButton radioButtonSessionSaveOwn; - private System.Windows.Forms.Label labelSessionSaveOwnDir; - private System.Windows.Forms.Button buttonSessionSaveDir; - private System.Windows.Forms.CheckBox checkBoxSaveFilter; - private System.Windows.Forms.TabPage tabPageMemory; - private System.Windows.Forms.Label labelNumberOfBlocks; - private System.Windows.Forms.NumericUpDown upDownBlockCount; - private System.Windows.Forms.NumericUpDown upDownLinesPerBlock; - private System.Windows.Forms.Label labelLinesPerBlock; - private System.Windows.Forms.GroupBox groupBoxLineBufferUsage; - private System.Windows.Forms.Label labelInfo; - private System.Windows.Forms.TabPage tabPageHighlightMask; - private System.Windows.Forms.DataGridView dataGridViewHighlightMask; - private System.Windows.Forms.DataGridViewTextBoxColumn columnFileName; - private System.Windows.Forms.DataGridViewComboBoxColumn columnHighlightGroup; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.CheckBox checkBoxMultiThread; - private System.Windows.Forms.Label labelFilePollingInterval; - private System.Windows.Forms.NumericUpDown upDownPollingInterval; - private System.Windows.Forms.GroupBox groupBoxCPUAndStuff; - private System.Windows.Forms.Label labelToolColumnizerForOutput; - private System.Windows.Forms.Label labelToolName; - private System.Windows.Forms.CheckedListBox listBoxTools; - private System.Windows.Forms.TextBox textBoxToolName; - private System.Windows.Forms.Button buttonToolDelete; - private System.Windows.Forms.Button buttonToolAdd; - private System.Windows.Forms.Button buttonToolDown; - private System.Windows.Forms.Button buttonToolUp; - private System.Windows.Forms.Label labelToolsDescription; - private System.Windows.Forms.Button buttonIcon; - private System.Windows.Forms.Label labelWorkingDir; - private System.Windows.Forms.Button buttonWorkingDir; - private System.Windows.Forms.TextBox textBoxWorkingDir; - private System.Windows.Forms.GroupBox groupBoxDefaultFileNamePattern; - private System.Windows.Forms.Label labelMaxDays; - private System.Windows.Forms.Label labelPattern; - private System.Windows.Forms.NumericUpDown upDownMultifileDays; - private System.Windows.Forms.TextBox textBoxMultifilePattern; - private System.Windows.Forms.Label labelDefaultEncoding; - private System.Windows.Forms.ComboBox comboBoxEncoding; - private System.Windows.Forms.ToolTip toolTip; - private System.Windows.Forms.CheckBox checkBoxColumnFinder; - private System.Windows.Forms.Button buttonExport; - private System.Windows.Forms.Button buttonImport; - private System.Windows.Forms.CheckBox checkBoxLegacyReader; + private System.Windows.Forms.TabControl tabControlSettings; + private System.Windows.Forms.TabPage tabPageViewSettings; + private System.Windows.Forms.Label labelFont; + private System.Windows.Forms.TabPage tabPageTimeStampFeatures; + private System.Windows.Forms.GroupBox groupBoxFont; + private System.Windows.Forms.Button buttonChangeFont; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonOk; + private System.Windows.Forms.CheckBox checkBoxFilterTail; + private System.Windows.Forms.CheckBox checkBoxFollowTail; + private System.Windows.Forms.CheckBox checkBoxSyncFilter; + private System.Windows.Forms.GroupBox groupBoxDefaults; + private System.Windows.Forms.CheckBox checkBoxTimestamp; + private System.Windows.Forms.GroupBox groupBoxMouseDragDefaults; + private System.Windows.Forms.RadioButton radioButtonHorizMouseDrag; + private System.Windows.Forms.RadioButton radioButtonVerticalMouseDrag; + private System.Windows.Forms.RadioButton radioButtonVerticalMouseDragInverted; + private System.Windows.Forms.TabPage tabPageExternalTools; + private System.Windows.Forms.GroupBox groupBoxToolSettings; + private System.Windows.Forms.TextBox textBoxArguments; + private System.Windows.Forms.Button buttonTool; + private System.Windows.Forms.TextBox textBoxTool; + private System.Windows.Forms.Label labelArguments; + private System.Windows.Forms.Label labelTool; + private System.Windows.Forms.Button buttonArguments; + private System.Windows.Forms.TabPage tabPageColumnizers; + private System.Windows.Forms.DataGridView dataGridViewColumnizer; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.Button buttonDelete; + private System.Windows.Forms.DataGridViewTextBoxColumn columnFileMask; + private System.Windows.Forms.DataGridViewComboBoxColumn columnColumnizer; + private System.Windows.Forms.CheckBox checkBoxSysout; + private System.Windows.Forms.CheckBox checkBoxMaskPrio; + private System.Windows.Forms.GroupBox groupBoxMisc; + private System.Windows.Forms.CheckBox checkBoxAskCloseTabs; + private System.Windows.Forms.TabPage tabPageMultiFile; + private System.Windows.Forms.GroupBox groupBoxWhenOpeningMultiFile; + private System.Windows.Forms.RadioButton radioButtonAskWhatToDo; + private System.Windows.Forms.RadioButton radioButtonTreatAllFilesAsOneMultifile; + private System.Windows.Forms.RadioButton radioButtonLoadEveryFileIntoSeperatedTab; + private System.Windows.Forms.Label labelNoteMultiFile; + private System.Windows.Forms.Label labelHintMultiFile; + private System.Windows.Forms.HelpProvider helpProvider; + private System.Windows.Forms.CheckBox checkBoxSingleInstance; + private System.Windows.Forms.ComboBox comboBoxColumnizer; + private System.Windows.Forms.CheckBox checkBoxOpenLastFiles; + private System.Windows.Forms.CheckBox checkBoxTailState; + private System.Windows.Forms.Button buttonTailColor; + private System.Windows.Forms.NumericUpDown cpDownColumnWidth; + private System.Windows.Forms.CheckBox checkBoxColumnSize; + private System.Windows.Forms.CheckBox checkBoxTimeSpread; + private System.Windows.Forms.GroupBox groupBoxTimeSpreadDisplay; + private System.Windows.Forms.GroupBox groupBoxTimeStampNavigationControl; + private System.Windows.Forms.Button buttonTimespreadColor; + private System.Windows.Forms.CheckBox checkBoxReverseAlpha; + private System.Windows.Forms.GroupBox groupBoxDisplayMode; + private System.Windows.Forms.RadioButton radioButtonLineView; + private System.Windows.Forms.RadioButton radioButtonTimeView; + private System.Windows.Forms.TabPage tabPagePlugins; + private System.Windows.Forms.ListBox listBoxPlugin; + private System.Windows.Forms.Panel panelPlugin; + private System.Windows.Forms.GroupBox groupBoxPlugins; + private System.Windows.Forms.GroupBox groupBoxSettings; + private System.Windows.Forms.Button buttonConfigPlugin; + private System.Windows.Forms.TabPage tabPageSessions; + private System.Windows.Forms.GroupBox groupBoxPersistantFileLocation; + private System.Windows.Forms.RadioButton radioButtonsessionSaveDocuments; + private System.Windows.Forms.RadioButton radioButtonSessionSameDir; + private System.Windows.Forms.CheckBox checkBoxSaveSessions; + private System.Windows.Forms.RadioButton radioButtonSessionSaveOwn; + private System.Windows.Forms.Label labelSessionSaveOwnDir; + private System.Windows.Forms.Button buttonSessionSaveDir; + private System.Windows.Forms.CheckBox checkBoxSaveFilter; + private System.Windows.Forms.TabPage tabPageMemory; + private System.Windows.Forms.Label labelNumberOfBlocks; + private System.Windows.Forms.NumericUpDown upDownBlockCount; + private System.Windows.Forms.NumericUpDown upDownLinesPerBlock; + private System.Windows.Forms.Label labelLinesPerBlock; + private System.Windows.Forms.GroupBox groupBoxLineBufferUsage; + private System.Windows.Forms.Label labelInfo; + private System.Windows.Forms.TabPage tabPageHighlightMask; + private System.Windows.Forms.DataGridView dataGridViewHighlightMask; + private System.Windows.Forms.DataGridViewTextBoxColumn columnFileName; + private System.Windows.Forms.DataGridViewComboBoxColumn columnHighlightGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.CheckBox checkBoxMultiThread; + private System.Windows.Forms.Label labelFilePollingInterval; + private System.Windows.Forms.NumericUpDown upDownPollingInterval; + private System.Windows.Forms.GroupBox groupBoxCPUAndStuff; + private System.Windows.Forms.Label labelToolColumnizerForOutput; + private System.Windows.Forms.Label labelToolName; + private System.Windows.Forms.CheckedListBox listBoxTools; + private System.Windows.Forms.TextBox textBoxToolName; + private System.Windows.Forms.Button buttonToolDelete; + private System.Windows.Forms.Button buttonToolAdd; + private System.Windows.Forms.Button buttonToolDown; + private System.Windows.Forms.Button buttonToolUp; + private System.Windows.Forms.Label labelToolsDescription; + private System.Windows.Forms.Button buttonIcon; + private System.Windows.Forms.Label labelWorkingDir; + private System.Windows.Forms.Button buttonWorkingDir; + private System.Windows.Forms.TextBox textBoxWorkingDir; + private System.Windows.Forms.GroupBox groupBoxDefaultFileNamePattern; + private System.Windows.Forms.Label labelMaxDays; + private System.Windows.Forms.Label labelPattern; + private System.Windows.Forms.NumericUpDown upDownMultifileDays; + private System.Windows.Forms.TextBox textBoxMultifilePattern; + private System.Windows.Forms.Label labelDefaultEncoding; + private System.Windows.Forms.ComboBox comboBoxEncoding; + private System.Windows.Forms.ToolTip toolTip; + private System.Windows.Forms.CheckBox checkBoxColumnFinder; + private System.Windows.Forms.Button buttonExport; + private System.Windows.Forms.Button buttonImport; + private System.Windows.Forms.CheckBox checkBoxLegacyReader; private System.Windows.Forms.Label labelMaximumFilterEntries; private System.Windows.Forms.NumericUpDown upDownMaximumFilterEntries; private System.Windows.Forms.NumericUpDown upDownMaximumFilterEntriesDisplayed; @@ -1893,5 +1839,8 @@ 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 3d886f1c..e96346e9 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.cs @@ -14,7 +14,7 @@ namespace LogExpert.Dialogs { - public partial class SettingsDialog : Form + internal partial class SettingsDialog : Form { #region Fields @@ -142,6 +142,8 @@ private void FillDialog() radioButtonSessionApplicationStartupDir.Checked = true; } + upDownMaximumLineLength.Value = Preferences.MaxLineLength; + upDownMaximumFilterEntriesDisplayed.Value = Preferences.maximumFilterEntriesDisplayed; upDownMaximumFilterEntries.Value = Preferences.maximumFilterEntries; @@ -273,7 +275,7 @@ private void FillColumnizerForToolsList(ComboBox comboBox, string columnizerName { int selIndex = 0; comboBox.Items.Clear(); - IList columnizers = PluginRegistry.GetInstance().RegisteredColumnizers; + IList columnizers = PluginRegistry.Instance.RegisteredColumnizers; foreach (ILogLineColumnizer columnizer in columnizers) { @@ -299,7 +301,7 @@ private void FillColumnizerList() DataGridViewTextBoxColumn textColumn = (DataGridViewTextBoxColumn)dataGridViewColumnizer.Columns[0]; - IList columnizers = PluginRegistry.GetInstance().RegisteredColumnizers; + IList columnizers = PluginRegistry.Instance.RegisteredColumnizers; foreach (ILogLineColumnizer columnizer in columnizers) { @@ -322,7 +324,7 @@ private void FillColumnizerList() row.Cells.Add(cell); row.Cells[0].Value = maskEntry.mask; ILogLineColumnizer columnizer = ColumnizerPicker.DecideColumnizerByName(maskEntry.columnizerName, - PluginRegistry.GetInstance().RegisteredColumnizers); + PluginRegistry.Instance.RegisteredColumnizers); row.Cells[1].Value = columnizer.GetName(); dataGridViewColumnizer.Rows.Add(row); @@ -420,7 +422,7 @@ private void FillPluginList() { listBoxPlugin.Items.Clear(); - foreach (IContextMenuEntry entry in PluginRegistry.GetInstance().RegisteredContextMenuPlugins) + foreach (IContextMenuEntry entry in PluginRegistry.Instance.RegisteredContextMenuPlugins) { listBoxPlugin.Items.Add(entry); if (entry is ILogExpertPluginConfigurator configurator) @@ -429,7 +431,7 @@ private void FillPluginList() } } - foreach (IKeywordAction entry in PluginRegistry.GetInstance().RegisteredKeywordActions) + foreach (IKeywordAction entry in PluginRegistry.Instance.RegisteredKeywordActions) { listBoxPlugin.Items.Add(entry); if (entry is ILogExpertPluginConfigurator configurator) @@ -438,7 +440,7 @@ private void FillPluginList() } } - foreach (IFileSystemPlugin entry in PluginRegistry.GetInstance().RegisteredFileSystemPlugins) + foreach (IFileSystemPlugin entry in PluginRegistry.Instance.RegisteredFileSystemPlugins) { listBoxPlugin.Items.Add(entry); if (entry is ILogExpertPluginConfigurator configurator) @@ -454,7 +456,7 @@ private void SavePluginSettings() { _selectedPlugin?.HideConfigForm(); - foreach (IContextMenuEntry entry in PluginRegistry.GetInstance().RegisteredContextMenuPlugins) + foreach (IContextMenuEntry entry in PluginRegistry.Instance.RegisteredContextMenuPlugins) { if (entry is ILogExpertPluginConfigurator configurator) { @@ -462,7 +464,7 @@ private void SavePluginSettings() } } - foreach (IKeywordAction entry in PluginRegistry.GetInstance().RegisteredKeywordActions) + foreach (IKeywordAction entry in PluginRegistry.Instance.RegisteredKeywordActions) { if (entry is ILogExpertPluginConfigurator configurator) { @@ -1022,7 +1024,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 9426b76c..2c2d8d82 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.resx +++ b/src/LogExpert/Dialogs/SettingsDialog.resx @@ -1,17 +1,17 @@ - diff --git a/src/LogExpert/Dialogs/ToolArgsDialog.cs b/src/LogExpert/Dialogs/ToolArgsDialog.cs index 0ecd6a62..e69f0375 100644 --- a/src/LogExpert/Dialogs/ToolArgsDialog.cs +++ b/src/LogExpert/Dialogs/ToolArgsDialog.cs @@ -11,7 +11,7 @@ namespace LogExpert.Dialogs { - public partial class ToolArgsDialog : Form + internal partial class ToolArgsDialog : Form { #region Fields diff --git a/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs b/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs index b08ba025..b73c2719 100644 --- a/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs +++ b/src/LogExpert/Entities/EventArgs/CurrentHighlightGroupChangedEventArgs.cs @@ -2,7 +2,7 @@ namespace LogExpert.Entities.EventArgs { - public class CurrentHighlightGroupChangedEventArgs + internal class CurrentHighlightGroupChangedEventArgs { #region Fields diff --git a/src/LogExpert/Entities/EventArgs/FilterListChangedEventArgs.cs b/src/LogExpert/Entities/EventArgs/FilterListChangedEventArgs.cs index 484280cf..af23273b 100644 --- a/src/LogExpert/Entities/EventArgs/FilterListChangedEventArgs.cs +++ b/src/LogExpert/Entities/EventArgs/FilterListChangedEventArgs.cs @@ -2,7 +2,7 @@ namespace LogExpert.Entities.EventArgs { - public class FilterListChangedEventArgs + internal class FilterListChangedEventArgs { #region Fields diff --git a/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs b/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs index 7c97770d..8cfe3dfe 100644 --- a/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs +++ b/src/LogExpert/Entities/EventArgs/LoadFileEventArgs.cs @@ -1,38 +1,4 @@ -//using System.Linq; - -namespace LogExpert.Entities.EventArgs +namespace LogExpert.Entities.EventArgs { - public class LoadFileEventArgs - { - #region Fields - - #endregion - - #region cTor - - public LoadFileEventArgs(string fileName, long pos, bool finished, long fileSize, bool newFile) - { - this.FileName = fileName; - this.ReadPos = pos; - this.Finished = finished; - this.FileSize = fileSize; - this.NewFile = newFile; - } - - #endregion - - #region Properties - - public long ReadPos { get; } - - public bool Finished { get; } - - public long FileSize { get; } - - public bool NewFile { get; } - - public string FileName { get; } - - #endregion - } + public record LoadFileEventArgs(string FileName, long ReadPos, bool Finished, long FileSize, bool NewFile); } \ No newline at end of file diff --git a/src/LogExpert/Entities/WindowFileEntry.cs b/src/LogExpert/Entities/WindowFileEntry.cs index d39a142b..604adbec 100644 --- a/src/LogExpert/Entities/WindowFileEntry.cs +++ b/src/LogExpert/Entities/WindowFileEntry.cs @@ -5,7 +5,7 @@ namespace LogExpert.Entities /// /// Represents a log file and its window. Used as a kind of handle for menus or list of open files. /// - public class WindowFileEntry + internal class WindowFileEntry { #region Fields diff --git a/src/LogExpert/Interface/ILogExpertProxy.cs b/src/LogExpert/Interface/ILogExpertProxy.cs index db6ca8bb..e9e0554f 100644 --- a/src/LogExpert/Interface/ILogExpertProxy.cs +++ b/src/LogExpert/Interface/ILogExpertProxy.cs @@ -3,7 +3,7 @@ namespace LogExpert.Interface { - public interface ILogExpertProxy + internal interface ILogExpertProxy { #region Public methods diff --git a/src/LogExpert/LogExpert.csproj b/src/LogExpert/LogExpert.csproj index 51fa80f5..c4be38e4 100644 --- a/src/LogExpert/LogExpert.csproj +++ b/src/LogExpert/LogExpert.csproj @@ -8,6 +8,7 @@ true true $(SolutionDir)..\bin\Docs\LogExpert.xml + false true Auto true @@ -16,8 +17,8 @@ $(SolutionDir)..\bin\$(Configuration) true PerMonitorV2 - true - CS1591;CA1416; + true + CS1591; False diff --git a/src/LogExpert/Program.cs b/src/LogExpert/Program.cs index 5713627e..5f7c6abb 100644 --- a/src/LogExpert/Program.cs +++ b/src/LogExpert/Program.cs @@ -150,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 } }); } @@ -176,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); } diff --git a/src/LogExpert/Properties/Resources.resx b/src/LogExpert/Properties/Resources.resx index 58db6575..2085cd03 100644 --- a/src/LogExpert/Properties/Resources.resx +++ b/src/LogExpert/Properties/Resources.resx @@ -131,122 +131,122 @@ ..\Resources\LogLover.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\icon1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icon1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\icon2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Icon2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\logexpert-icon.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\LogExpert-Icon.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\log_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Log_Icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\log_icon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Log_Icon_small.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\resources\PNG\48\bookmark_bubbles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\bookmark_bubbles.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmark_Bubbles - ..\resources\PNG\48\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Add - ..\resources\PNG\48\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ArrowDown - ..\resources\PNG\48\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ArrowLeft - ..\resources\PNG\48\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ArrowRight - ..\resources\PNG\48\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ArrowUp - ..\resources\PNG\48\Bookmark_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Bookmark_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmark_add - ..\resources\PNG\48\Bookmark_added.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Bookmark_added.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmark_added - ..\resources\PNG\48\Bookmark_manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Bookmark_manager.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmark_manager - ..\resources\PNG\48\Bookmark_remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Bookmark_remove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmark_remove - ..\resources\PNG\48\Bookmarks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Bookmarks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Bookmarks - ..\resources\PNG\48\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Delete - ..\resources\PNG\48\Exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Exit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Exit - ..\resources\PNG\48\Favorite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Favorite.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Favorite - ..\resources\PNG\48\File_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\File_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a File_open - ..\resources\PNG\48\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Filter - ..\resources\PNG\48\Folder_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Folder_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Folder_open - ..\resources\PNG\48\Restart_alt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Restart_alt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Restart_alt - ..\resources\PNG\48\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Search - ..\resources\PNG\48\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Settings - ..\resources\PNG\48\Star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Star.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Star - ..\resources\PNG\48\Arrow_menu_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Arrow_menu_close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Arrow_menu_close - ..\resources\PNG\48\Arrow_menu_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Arrow_menu_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Arrow_menu_open - ..\resources\PNG\48\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Close - ..\resources\PNG\48\Deceased.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Deceased.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Deceased - ..\resources\PNG\48\Check_circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\PNG\48\Check_circle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Check_circle \ No newline at end of file diff --git a/src/LogexpertgRPCService/LogexpertgRPCService.csproj b/src/LogexpertgRPCService/LogexpertgRPCService.csproj index 80389635..a5d0b2bf 100644 --- a/src/LogexpertgRPCService/LogexpertgRPCService.csproj +++ b/src/LogexpertgRPCService/LogexpertgRPCService.csproj @@ -2,6 +2,7 @@ net8.0 enable + false enable diff --git a/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs b/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs index 7c3315e4..6728420d 100644 --- a/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs +++ b/src/RegexColumnizer.UnitTests/RegexColumnizerTests.cs @@ -1,9 +1,9 @@ using LogExpert; - using Moq; - using NUnit.Framework; +using System.Runtime.Versioning; +[assembly: SupportedOSPlatform("windows")] namespace RegexColumnizer.UnitTests { [TestFixture] diff --git a/src/RegexColumnizer/RegexColumnizer.cs b/src/RegexColumnizer/RegexColumnizer.cs index 6cdaf3f0..89143937 100644 --- a/src/RegexColumnizer/RegexColumnizer.cs +++ b/src/RegexColumnizer/RegexColumnizer.cs @@ -2,10 +2,12 @@ using System; using System.IO; using System.Linq; +using System.Runtime.Versioning; using System.Text.RegularExpressions; using System.Windows.Forms; using System.Xml.Serialization; +[assembly: SupportedOSPlatform("windows")] namespace RegexColumnizer { public abstract class BaseRegexColumnizer : ILogLineColumnizer, IColumnizerConfigurator @@ -122,16 +124,16 @@ public void PushValue(ILogLineColumnizerCallback callback, int column, string va public void Configure(ILogLineColumnizerCallback callback, string configDir) { - RegexColumnizerConfigDialog d = new RegexColumnizerConfigDialog {Config = Config}; - if (d.ShowDialog() == DialogResult.OK) + RegexColumnizerConfigDialog dialog = new RegexColumnizerConfigDialog {Config = Config}; + if (dialog.ShowDialog() == DialogResult.OK) { var configFile = GetConfigFile(configDir); using (var w = new FileStream(configFile, FileMode.Create)) { - xml.Serialize(w, d.Config); + xml.Serialize(w, dialog.Config); } - Init(d.Config); + Init(dialog.Config); } } diff --git a/src/RegexColumnizer/RegexColumnizer.csproj b/src/RegexColumnizer/RegexColumnizer.csproj index 318d2269..22af73ea 100644 --- a/src/RegexColumnizer/RegexColumnizer.csproj +++ b/src/RegexColumnizer/RegexColumnizer.csproj @@ -5,10 +5,10 @@ Library false true + false true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/RegexColumnizer/RegexColumnizerConfigDialog.Designer.cs b/src/RegexColumnizer/RegexColumnizerConfigDialog.Designer.cs index 9e02a094..42a27daa 100644 --- a/src/RegexColumnizer/RegexColumnizerConfigDialog.Designer.cs +++ b/src/RegexColumnizer/RegexColumnizerConfigDialog.Designer.cs @@ -64,7 +64,7 @@ private void InitializeComponent() this.btnOk.TabIndex = 1; this.btnOk.Text = "Ok"; this.btnOk.UseVisualStyleBackColor = true; - this.btnOk.Click += new System.EventHandler(this.btnOk_Click); + this.btnOk.Click += new System.EventHandler(this.OnBtnOkClick); // // lblRegEx // @@ -93,7 +93,7 @@ private void InitializeComponent() this.tbCheck.TabIndex = 4; this.tbCheck.Text = "Check"; this.tbCheck.UseVisualStyleBackColor = true; - this.tbCheck.Click += new System.EventHandler(this.tbCheck_Click); + this.tbCheck.Click += new System.EventHandler(this.OnButtonCheckClick); // // tbTestLine // diff --git a/src/RegexColumnizer/RegexColumnizerConfigDialog.cs b/src/RegexColumnizer/RegexColumnizerConfigDialog.cs index 2d436aa3..b44cf02f 100644 --- a/src/RegexColumnizer/RegexColumnizerConfigDialog.cs +++ b/src/RegexColumnizer/RegexColumnizerConfigDialog.cs @@ -1,75 +1,82 @@ using System; using System.Data; +using System.Drawing; using System.Linq; using System.Text.RegularExpressions; using System.Windows.Forms; namespace RegexColumnizer { - public partial class RegexColumnizerConfigDialog : Form - { - public RegexColumnizerConfigDialog() - { - InitializeComponent(); - } + public partial class RegexColumnizerConfigDialog : Form + { + public RegexColumnizerConfigDialog() + { + SuspendLayout(); + AutoScaleDimensions = new SizeF(96F, 96F); + AutoScaleMode = AutoScaleMode.Dpi; - public RegexColumnizerConfig Config { get; set; } + InitializeComponent(); + ResumeLayout(); + } + + public RegexColumnizerConfig Config { get; set; } - private void btnOk_Click(object sender, EventArgs e) - { - if (Check()) - { - Config.Expression = tbExpression.Text; + private void OnBtnOkClick(object sender, EventArgs e) + { + if (Check()) + { + Config.Expression = tbExpression.Text; Config.Name = tbName.Text; } - } + } - private void RegexColumnizerConfigDialog_Load(object sender, EventArgs e) - { - tbExpression.Text = Config.Expression; + private void RegexColumnizerConfigDialog_Load(object sender, EventArgs e) + { + tbExpression.Text = Config.Expression; tbName.Text = Config.Name; } - private void tbCheck_Click(object sender, EventArgs e) - { - Check(); - } + private void OnButtonCheckClick(object sender, EventArgs e) + { + Check(); + } + + private bool Check() + { + DataTable table = new(); - private bool Check() - { - DataTable table = new DataTable(); - try - { - Regex regex = new Regex(tbExpression.Text); - var groupNames = regex.GetGroupNames(); - int offset = groupNames.Length > 1 ? 1 : 0; - for (int i = offset; i < groupNames.Length; i++) - { - table.Columns.Add(groupNames[i]); - } + try + { + Regex regex = new(tbExpression.Text); + var groupNames = regex.GetGroupNames(); + int offset = groupNames.Length > 1 ? 1 : 0; - if (!string.IsNullOrEmpty(tbTestLine.Text)) - { - Match match = regex.Match(tbTestLine.Text); - var row = table.NewRow(); - var values = match.Groups.OfType().Skip(offset).Select(group => group.Value).Cast().ToArray(); - row.ItemArray = values; - table.Rows.Add(row); - } + for (int i = offset; i < groupNames.Length; i++) + { + table.Columns.Add(groupNames[i]); + } - return true; - } - catch (Exception ex) - { - MessageBox.Show($@"Invalid Regex !{Environment.NewLine}{ex.Message}", @"Regex Columnizer Configuration", - MessageBoxButtons.OK, MessageBoxIcon.Error); - return false; - } - finally - { - dataGridView1.DataSource = table; - } - } - } + if (!string.IsNullOrEmpty(tbTestLine.Text)) + { + Match match = regex.Match(tbTestLine.Text); + var row = table.NewRow(); + var values = match.Groups.OfType().Skip(offset).Select(group => group.Value).Cast().ToArray(); + row.ItemArray = values; + table.Rows.Add(row); + } + + return true; + } + catch (Exception ex) + { + MessageBox.Show($@"Invalid Regex !{Environment.NewLine}{ex.Message}", @"Regex Columnizer Configuration", MessageBoxButtons.OK, MessageBoxIcon.Error); + return false; + } + finally + { + dataGridView1.DataSource = table; + } + } + } } diff --git a/src/SDK/Columnizer/Columnizer/ExampleColumnizer.csproj b/src/SDK/Columnizer/Columnizer/ExampleColumnizer.csproj index e18960f3..6299cee4 100644 --- a/src/SDK/Columnizer/Columnizer/ExampleColumnizer.csproj +++ b/src/SDK/Columnizer/Columnizer/ExampleColumnizer.csproj @@ -10,6 +10,7 @@ Properties ExampleColumnizer ExampleColumnizer + false v2.0 512 diff --git a/src/SDK/ContextMenu/ContextMenu/ContextMenu.csproj b/src/SDK/ContextMenu/ContextMenu/ContextMenu.csproj index 2d3a1b46..a5692fd2 100644 --- a/src/SDK/ContextMenu/ContextMenu/ContextMenu.csproj +++ b/src/SDK/ContextMenu/ContextMenu/ContextMenu.csproj @@ -10,6 +10,7 @@ Properties ContextMenu ContextMenu + false v2.0 512 diff --git a/src/SDK/CsvColumnizer/CsvColumnizer.csproj b/src/SDK/CsvColumnizer/CsvColumnizer.csproj index cc3504cf..5ac52361 100644 --- a/src/SDK/CsvColumnizer/CsvColumnizer.csproj +++ b/src/SDK/CsvColumnizer/CsvColumnizer.csproj @@ -7,6 +7,7 @@ 2.0 {2563526E-4566-40CB-AA27-587B904FD25B} Library + false Properties CsvColumnizer CsvColumnizer diff --git a/src/SDK/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj b/src/SDK/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj index e4138ed2..3707b501 100644 --- a/src/SDK/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj +++ b/src/SDK/Log4jXmlColumnizer/Log4jXmlColumnizer.csproj @@ -7,6 +7,7 @@ 2.0 {C41A517B-7502-4B17-9119-55D5716FAD65} Library + false Properties Log4jXmlColumnizer Log4jXmlColumnizer diff --git a/src/SftpFileSystemx64/ConfigDialog.cs b/src/SftpFileSystemx64/ConfigDialog.cs index 6b570325..78f7f5cc 100644 --- a/src/SftpFileSystemx64/ConfigDialog.cs +++ b/src/SftpFileSystemx64/ConfigDialog.cs @@ -1,6 +1,8 @@ using System; +using System.Runtime.Versioning; using System.Windows.Forms; +[assembly: SupportedOSPlatform("windows")] namespace SftpFileSystem { public partial class ConfigDialog : Form diff --git a/src/SftpFileSystemx64/SftpFileSystem.cs b/src/SftpFileSystemx64/SftpFileSystem.cs index 459b3e02..e53c0e17 100644 --- a/src/SftpFileSystemx64/SftpFileSystem.cs +++ b/src/SftpFileSystemx64/SftpFileSystem.cs @@ -135,15 +135,15 @@ public void SaveConfig(string configDir) } } - public void ShowConfigDialog(Form owner) + public void ShowConfigDialog(object owner) { throw new NotImplementedException(); } - public void ShowConfigForm(Panel parentPanel) + public void ShowConfigForm(object parentPanel) { _configDialog = new ConfigDialog(ConfigData); - _configDialog.Parent = parentPanel; + _configDialog.Parent = (Panel)parentPanel; _configDialog.Show(); } diff --git a/src/SftpFileSystemx64/SftpFileSystemx64.csproj b/src/SftpFileSystemx64/SftpFileSystemx64.csproj index 3cd2c2f6..b9080834 100644 --- a/src/SftpFileSystemx64/SftpFileSystemx64.csproj +++ b/src/SftpFileSystemx64/SftpFileSystemx64.csproj @@ -5,12 +5,12 @@ Library SftpFileSystem SftpFileSystem + false false true true false $(SolutionDir)..\bin\$(Configuration)\plugins - CA1416; False diff --git a/src/SftpFileSystemx86/SftpFileSystemx86.csproj b/src/SftpFileSystemx86/SftpFileSystemx86.csproj index f70e3d23..339e9ea5 100644 --- a/src/SftpFileSystemx86/SftpFileSystemx86.csproj +++ b/src/SftpFileSystemx86/SftpFileSystemx86.csproj @@ -7,11 +7,11 @@ SftpFileSystem false true + false true SftpFileSystemx86 false $(SolutionDir)..\bin\$(Configuration)\pluginsx86 - CA1416; False diff --git a/src/Solution Items/AssemblyVersion.cs b/src/Solution Items/AssemblyVersion.cs index 500f3f8c..c7b9e075 100644 --- a/src/Solution Items/AssemblyVersion.cs +++ b/src/Solution Items/AssemblyVersion.cs @@ -5,8 +5,8 @@ [assembly: AssemblyProduct("LogExpert")] [assembly: AssemblyCopyright("Original work Copyright (c) 2008-2011 Hagen Raab\r\nModified work Copyright (c) 2025 Zarunbal|Hirogen and many others")] -[assembly: AssemblyVersion("1.11.2")] -[assembly: AssemblyFileVersion("1.11.2")] -[assembly: AssemblyInformationalVersion("1.11.2")] +[assembly: AssemblyVersion("1.12.0")] +[assembly: AssemblyFileVersion("1.12.0")] +[assembly: AssemblyInformationalVersion("1.12.0")] [assembly: ComVisible(false)] diff --git a/src/WinFormsUI/Docking/Resources.resx b/src/WinFormsUI/Docking/Resources.resx index bd5a0772..3032913d 100644 --- a/src/WinFormsUI/Docking/Resources.resx +++ b/src/WinFormsUI/Docking/Resources.resx @@ -125,13 +125,13 @@ Resources\DockIndicator_PaneDiamond_Bottom.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\DockIndicator_PaneDiamond_Fill.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\Dockindicator_PaneDiamond_Fill.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\DockIndicator_PaneDiamond_HotSpot.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\DockIndicator_PaneDiamond_Hotspot.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Resources\DockIndicator_PaneDiamond_HotSpotIndex.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Resources\DockIndicator_PaneDiamond_HotspotIndex.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a Resources\DockIndicator_PaneDiamond_Left.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/src/WinFormsUI/WinFormsUI.csproj b/src/WinFormsUI/WinFormsUI.csproj index 7380312e..664ada6d 100644 --- a/src/WinFormsUI/WinFormsUI.csproj +++ b/src/WinFormsUI/WinFormsUI.csproj @@ -9,6 +9,7 @@ ..\Solution Items\Key.snk SAK SAK + false SAK SAK publish\