From 429db1cc584758b5a667145899f690a7bba38807 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 21 Jun 2022 21:57:38 +0200 Subject: [PATCH 1/3] fixing different encoding names --- .../Controls/LogTabWindow/LogTabWindow.cs | 9 +- .../LogTabWindow/LogTabWindow.designer.cs | 224 ++++--- .../Controls/LogTabWindow/LogTabWindow.resx | 6 +- .../LogTabWindow/LogTabWindowPrivate.cs | 28 +- .../Dialogs/SettingsDialog.Designer.cs | 619 +++++++++++------- src/LogExpert/Dialogs/SettingsDialog.cs | 18 +- 6 files changed, 519 insertions(+), 385 deletions(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 020ac67b..144bb20b 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Drawing; using System.Reflection; +using System.Text; using System.Threading; using System.Windows.Forms; using LogExpert.Config; @@ -118,7 +119,13 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum host.BackColor = Color.FromKnownColor(KnownColor.Transparent); int index = buttonToolStrip.Items.IndexOfKey("toolStripButtonTail"); - + + toolStripEncodingASCIIItem.Text = Encoding.ASCII.HeaderName; + toolStripEncodingANSIItem.Text = Encoding.Default.HeaderName; + toolStripEncodingISO88591Item.Text = Encoding.GetEncoding("iso-8859-1").HeaderName; + toolStripEncodingUTF8Item.Text = Encoding.UTF8.HeaderName; + toolStripEncodingUTF16Item.Text = Encoding.Unicode.HeaderName; + if (index != -1) { buttonToolStrip.Items.RemoveAt(index); diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 49b97e7d..47eacc90 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -32,21 +32,21 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LogTabWindow)); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.linesLabel = new System.Windows.Forms.ToolStripStatusLabel(); @@ -83,12 +83,12 @@ private void InitializeComponent() this.showBookmarkListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.columnFinderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.encodingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aSCIIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aNSIToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.iSO88591ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.uTF8ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.uTF16ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingASCIIItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingANSIItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingISO88591Item = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingUTF8Item = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripEncodingUTF16Item = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); this.timeshiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.timeshiftMenuTextBox = new System.Windows.Forms.ToolStripTextBox(); @@ -234,7 +234,6 @@ private void InitializeComponent() this.mainMenuStrip.AllowMerge = false; this.mainMenuStrip.BackColor = System.Drawing.SystemColors.ControlLight; this.mainMenuStrip.Dock = System.Windows.Forms.DockStyle.None; - this.mainMenuStrip.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2); this.mainMenuStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.mainMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem, @@ -405,7 +404,7 @@ private void InitializeComponent() this.bookmarksToolStripMenuItem, this.columnFinderToolStripMenuItem, this.toolStripSeparator2, - this.encodingToolStripMenuItem, + this.toolStripEncodingMenuItem, this.toolStripSeparator4, this.timeshiftToolStripMenuItem, this.timeshiftMenuTextBox, @@ -500,54 +499,54 @@ private void InitializeComponent() this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(267, 6); // - // encodingToolStripMenuItem + // toolStripEncodingMenuItem // - this.encodingToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.aSCIIToolStripMenuItem, - this.aNSIToolStripMenuItem, - this.iSO88591ToolStripMenuItem, - this.uTF8ToolStripMenuItem, - this.uTF16ToolStripMenuItem}); - this.encodingToolStripMenuItem.Name = "encodingToolStripMenuItem"; - this.encodingToolStripMenuItem.Size = new System.Drawing.Size(270, 34); - this.encodingToolStripMenuItem.Text = "Encoding"; + this.toolStripEncodingMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripEncodingASCIIItem, + this.toolStripEncodingANSIItem, + this.toolStripEncodingISO88591Item, + this.toolStripEncodingUTF8Item, + this.toolStripEncodingUTF16Item}); + this.toolStripEncodingMenuItem.Name = "toolStripEncodingMenuItem"; + this.toolStripEncodingMenuItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingMenuItem.Text = "Encoding"; // - // aSCIIToolStripMenuItem + // toolStripEncodingASCIIItem // - this.aSCIIToolStripMenuItem.Name = "aSCIIToolStripMenuItem"; - this.aSCIIToolStripMenuItem.Size = new System.Drawing.Size(207, 34); - this.aSCIIToolStripMenuItem.Tag = ""; - this.aSCIIToolStripMenuItem.Text = "ASCII"; - this.aSCIIToolStripMenuItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); + this.toolStripEncodingASCIIItem.Name = "toolStripEncodingASCIIItem"; + this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingASCIIItem.Tag = ""; + this.toolStripEncodingASCIIItem.Text = "ASCII"; + this.toolStripEncodingASCIIItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); // - // aNSIToolStripMenuItem + // toolStripEncodingANSIItem // - this.aNSIToolStripMenuItem.Name = "aNSIToolStripMenuItem"; - this.aNSIToolStripMenuItem.Size = new System.Drawing.Size(207, 34); - this.aNSIToolStripMenuItem.Tag = ""; - this.aNSIToolStripMenuItem.Text = "ANSI"; - this.aNSIToolStripMenuItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); + this.toolStripEncodingANSIItem.Name = "toolStripEncodingANSIItem"; + this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingANSIItem.Tag = ""; + this.toolStripEncodingANSIItem.Text = "ANSI"; + this.toolStripEncodingANSIItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); // - // iSO88591ToolStripMenuItem + // toolStripEncodingISO88591Item // - this.iSO88591ToolStripMenuItem.Name = "iSO88591ToolStripMenuItem"; - this.iSO88591ToolStripMenuItem.Size = new System.Drawing.Size(207, 34); - this.iSO88591ToolStripMenuItem.Text = "ISO-8859-1"; - this.iSO88591ToolStripMenuItem.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); + this.toolStripEncodingISO88591Item.Name = "toolStripEncodingISO88591Item"; + this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingISO88591Item.Text = "ISO-8859-1"; + this.toolStripEncodingISO88591Item.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); // - // uTF8ToolStripMenuItem + // toolStripEncodingUTF8Item // - this.uTF8ToolStripMenuItem.Name = "uTF8ToolStripMenuItem"; - this.uTF8ToolStripMenuItem.Size = new System.Drawing.Size(207, 34); - this.uTF8ToolStripMenuItem.Text = "UTF8"; - this.uTF8ToolStripMenuItem.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); + this.toolStripEncodingUTF8Item.Name = "toolStripEncodingUTF8Item"; + this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingUTF8Item.Text = "UTF8"; + this.toolStripEncodingUTF8Item.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); // - // uTF16ToolStripMenuItem + // toolStripEncodingUTF16Item // - this.uTF16ToolStripMenuItem.Name = "uTF16ToolStripMenuItem"; - this.uTF16ToolStripMenuItem.Size = new System.Drawing.Size(207, 34); - this.uTF16ToolStripMenuItem.Text = "Unicode"; - this.uTF16ToolStripMenuItem.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); + this.toolStripEncodingUTF16Item.Name = "toolStripEncodingUTF16Item"; + this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingUTF16Item.Text = "Unicode"; + this.toolStripEncodingUTF16Item.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); // // toolStripSeparator4 // @@ -567,7 +566,6 @@ private void InitializeComponent() // this.timeshiftMenuTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.timeshiftMenuTextBox.Enabled = false; - this.timeshiftMenuTextBox.Font = new System.Drawing.Font("Segoe UI", 9F); this.timeshiftMenuTextBox.Name = "timeshiftMenuTextBox"; this.timeshiftMenuTextBox.Size = new System.Drawing.Size(100, 31); this.timeshiftMenuTextBox.Text = "+00:00:00.000"; @@ -906,52 +904,52 @@ private void InitializeComponent() this.dockPanel.Name = "dockPanel"; this.dockPanel.ShowDocumentIcon = true; this.dockPanel.Size = new System.Drawing.Size(1443, 712); - dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin1.DockStripGradient = dockPanelGradient1; - tabGradient1.EndColor = System.Drawing.SystemColors.Control; - tabGradient1.StartColor = System.Drawing.SystemColors.Control; - tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin1.TabGradient = tabGradient1; - autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); - dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; - tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.ActiveTabGradient = tabGradient2; - dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; - tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient1.InactiveTabGradient = tabGradient3; - dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; - dockPaneStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); - tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; - tabGradient5.EndColor = System.Drawing.SystemColors.Control; - tabGradient5.StartColor = System.Drawing.SystemColors.Control; - tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; - dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; - tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption; - tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText; - dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; - tabGradient7.EndColor = System.Drawing.Color.Transparent; - tabGradient7.StartColor = System.Drawing.Color.Transparent; - tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; - dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; - dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; - this.dockPanel.Skin = dockPanelSkin1; + dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin2.DockStripGradient = dockPanelGradient4; + tabGradient8.EndColor = System.Drawing.SystemColors.Control; + tabGradient8.StartColor = System.Drawing.SystemColors.Control; + tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin2.TabGradient = tabGradient8; + autoHideStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F); + dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; + tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient2.ActiveTabGradient = tabGradient9; + dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; + tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient2.InactiveTabGradient = tabGradient10; + dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; + dockPaneStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F); + tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; + tabGradient12.EndColor = System.Drawing.SystemColors.Control; + tabGradient12.StartColor = System.Drawing.SystemColors.Control; + tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; + dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; + tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption; + tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText; + dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; + tabGradient14.EndColor = System.Drawing.Color.Transparent; + tabGradient14.StartColor = System.Drawing.Color.Transparent; + tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; + dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; + dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; + this.dockPanel.Skin = dockPanelSkin2; this.dockPanel.TabIndex = 14; this.dockPanel.ActiveContentChanged += new System.EventHandler(this.OnDockPanelActiveContentChanged); // @@ -1317,11 +1315,11 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem toggleBookmarkToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem jumpToNextToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem jumpToPrevToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem encodingToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem aSCIIToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem aNSIToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem uTF8ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem uTF16ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripEncodingMenuItem; + private System.Windows.Forms.ToolStripMenuItem toolStripEncodingASCIIItem; + private System.Windows.Forms.ToolStripMenuItem toolStripEncodingANSIItem; + private System.Windows.Forms.ToolStripMenuItem toolStripEncodingUTF8Item; + private System.Windows.Forms.ToolStripMenuItem toolStripEncodingUTF16Item; private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; private System.Windows.Forms.ToolStripMenuItem reloadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem columnizerToolStripMenuItem; @@ -1387,7 +1385,7 @@ private void InitializeComponent() private ToolStripMenuItem disableWordHighlightModeToolStripMenuItem; private ToolStripMenuItem multifileMaskToolStripMenuItem; private ToolStripMenuItem multiFileEnabledStripMenuItem; - private ToolStripMenuItem iSO88591ToolStripMenuItem; + private ToolStripMenuItem toolStripEncodingISO88591Item; private ToolStripSeparator toolStripSeparator19; private ToolStripMenuItem lockInstanceToolStripMenuItem; private ToolStripMenuItem newFromClipboardToolStripMenuItem; diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx index dec5097a..d61d7034 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx @@ -126,6 +126,9 @@ 417, 17 + + 522, 17 + @@ -152,9 +155,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 522, 17 - 248, 17 diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs index f89d7f5b..abc77ff4 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs @@ -122,13 +122,11 @@ private void FillDefaultEncodingFromSettings(EncodingOptions encodingOptions) { 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; } } @@ -909,11 +907,11 @@ private Icon GetIcon(int diff, LogWindowData data) private void RefreshEncodingMenuBar(Encoding encoding) { - aSCIIToolStripMenuItem.Checked = false; - aNSIToolStripMenuItem.Checked = false; - uTF8ToolStripMenuItem.Checked = false; - uTF16ToolStripMenuItem.Checked = false; - iSO88591ToolStripMenuItem.Checked = false; + toolStripEncodingASCIIItem.Checked = false; + toolStripEncodingANSIItem.Checked = false; + toolStripEncodingUTF8Item.Checked = false; + toolStripEncodingUTF16Item.Checked = false; + toolStripEncodingISO88591Item.Checked = false; if (encoding == null) { @@ -922,26 +920,26 @@ private void RefreshEncodingMenuBar(Encoding encoding) if (encoding is ASCIIEncoding) { - aSCIIToolStripMenuItem.Checked = true; + toolStripEncodingASCIIItem.Checked = true; } else if (encoding.Equals(Encoding.Default)) { - aNSIToolStripMenuItem.Checked = true; + toolStripEncodingANSIItem.Checked = true; } else if (encoding is UTF8Encoding) { - uTF8ToolStripMenuItem.Checked = true; + toolStripEncodingUTF8Item.Checked = true; } else if (encoding is UnicodeEncoding) { - uTF16ToolStripMenuItem.Checked = true; + toolStripEncodingUTF16Item.Checked = true; } else if (encoding.Equals(Encoding.GetEncoding("iso-8859-1"))) { - iSO88591ToolStripMenuItem.Checked = true; + toolStripEncodingISO88591Item.Checked = true; } - aNSIToolStripMenuItem.Text = Encoding.Default.HeaderName; + toolStripEncodingANSIItem.Text = Encoding.Default.HeaderName; } private void OpenSettings(int tabToOpen) diff --git a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs index 13a5b147..178da80c 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.Designer.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.Designer.cs @@ -37,7 +37,7 @@ private void InitializeComponent() this.upDownMaximumFilterEntries = new System.Windows.Forms.NumericUpDown(); this.labelMaximumFilterEntries = new System.Windows.Forms.Label(); this.labelDefaultEncoding = new System.Windows.Forms.Label(); - this.encodingComboBox = new System.Windows.Forms.ComboBox(); + 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(); @@ -198,10 +198,11 @@ private void InitializeComponent() 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(1, 2); + 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(633, 304); + this.tabControlSettings.Size = new System.Drawing.Size(950, 468); this.tabControlSettings.TabIndex = 0; // // tabPageViewSettings @@ -211,21 +212,23 @@ private void InitializeComponent() this.tabPageViewSettings.Controls.Add(this.upDownMaximumFilterEntries); this.tabPageViewSettings.Controls.Add(this.labelMaximumFilterEntries); this.tabPageViewSettings.Controls.Add(this.labelDefaultEncoding); - this.tabPageViewSettings.Controls.Add(this.encodingComboBox); + 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, 22); + 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(3); - this.tabPageViewSettings.Size = new System.Drawing.Size(625, 278); + this.tabPageViewSettings.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageViewSettings.Size = new System.Drawing.Size(942, 435); this.tabPageViewSettings.TabIndex = 0; this.tabPageViewSettings.Text = "View settings"; this.tabPageViewSettings.UseVisualStyleBackColor = true; // // upDownMaximumFilterEntriesDisplayed // - this.upDownMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(508, 74); + 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, @@ -237,7 +240,7 @@ private void InitializeComponent() 0, 0}); this.upDownMaximumFilterEntriesDisplayed.Name = "upDownMaximumFilterEntriesDisplayed"; - this.upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(53, 20); + this.upDownMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(80, 26); this.upDownMaximumFilterEntriesDisplayed.TabIndex = 13; this.upDownMaximumFilterEntriesDisplayed.Value = new decimal(new int[] { 20, @@ -248,22 +251,24 @@ private void InitializeComponent() // labelMaximumFilterEntriesDisplayed // this.labelMaximumFilterEntriesDisplayed.AutoSize = true; - this.labelMaximumFilterEntriesDisplayed.Location = new System.Drawing.Point(308, 76); + 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(154, 13); + this.labelMaximumFilterEntriesDisplayed.Size = new System.Drawing.Size(232, 20); this.labelMaximumFilterEntriesDisplayed.TabIndex = 12; this.labelMaximumFilterEntriesDisplayed.Text = "Maximum filter entries displayed"; // // upDownMaximumFilterEntries // - this.upDownMaximumFilterEntries.Location = new System.Drawing.Point(508, 46); + 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(53, 20); + this.upDownMaximumFilterEntries.Size = new System.Drawing.Size(80, 26); this.upDownMaximumFilterEntries.TabIndex = 11; this.upDownMaximumFilterEntries.Value = new decimal(new int[] { 30, @@ -274,30 +279,33 @@ private void InitializeComponent() // labelMaximumFilterEntries // this.labelMaximumFilterEntries.AutoSize = true; - this.labelMaximumFilterEntries.Location = new System.Drawing.Point(308, 48); + 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(107, 13); + this.labelMaximumFilterEntries.Size = new System.Drawing.Size(162, 20); this.labelMaximumFilterEntries.TabIndex = 10; this.labelMaximumFilterEntries.Text = "Maximum filter entries"; // // labelDefaultEncoding // this.labelDefaultEncoding.AutoSize = true; - this.labelDefaultEncoding.Location = new System.Drawing.Point(308, 22); + 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(88, 13); + this.labelDefaultEncoding.Size = new System.Drawing.Size(130, 20); this.labelDefaultEncoding.TabIndex = 9; this.labelDefaultEncoding.Text = "Default encoding"; // - // encodingComboBox + // comboBoxEncoding // - this.encodingComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.encodingComboBox.FormattingEnabled = true; - this.encodingComboBox.Location = new System.Drawing.Point(459, 19); - this.encodingComboBox.Name = "encodingComboBox"; - this.encodingComboBox.Size = new System.Drawing.Size(102, 21); - this.encodingComboBox.TabIndex = 8; - this.toolTip.SetToolTip(this.encodingComboBox, "Encoding to be used when no BOM header and no persistence data is available."); + this.comboBoxEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxEncoding.FormattingEnabled = true; + this.comboBoxEncoding.Location = new System.Drawing.Point(688, 29); + this.comboBoxEncoding.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.comboBoxEncoding.Name = "comboBoxEncoding"; + this.comboBoxEncoding.Size = new System.Drawing.Size(151, 28); + this.comboBoxEncoding.TabIndex = 8; + this.toolTip.SetToolTip(this.comboBoxEncoding, "Encoding to be used when no BOM header and no persistence data is available."); // // groupBoxMisc // @@ -308,16 +316,19 @@ private void InitializeComponent() 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(305, 111); + 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.Size = new System.Drawing.Size(256, 147); + this.groupBoxMisc.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxMisc.Size = new System.Drawing.Size(384, 226); this.groupBoxMisc.TabIndex = 7; this.groupBoxMisc.TabStop = false; this.groupBoxMisc.Text = "Misc"; // // cpDownColumnWidth // - this.cpDownColumnWidth.Location = new System.Drawing.Point(154, 113); + this.cpDownColumnWidth.Location = new System.Drawing.Point(231, 174); + this.cpDownColumnWidth.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cpDownColumnWidth.Maximum = new decimal(new int[] { 9000, 0, @@ -329,7 +340,7 @@ private void InitializeComponent() 0, 0}); this.cpDownColumnWidth.Name = "cpDownColumnWidth"; - this.cpDownColumnWidth.Size = new System.Drawing.Size(56, 20); + this.cpDownColumnWidth.Size = new System.Drawing.Size(84, 26); this.cpDownColumnWidth.TabIndex = 6; this.cpDownColumnWidth.Value = new decimal(new int[] { 2000, @@ -340,9 +351,10 @@ private void InitializeComponent() // checkBoxColumnSize // this.checkBoxColumnSize.AutoSize = true; - this.checkBoxColumnSize.Location = new System.Drawing.Point(6, 115); + 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(126, 17); + this.checkBoxColumnSize.Size = new System.Drawing.Size(185, 24); this.checkBoxColumnSize.TabIndex = 5; this.checkBoxColumnSize.Text = "Set last column width"; this.checkBoxColumnSize.UseVisualStyleBackColor = true; @@ -350,9 +362,10 @@ private void InitializeComponent() // // buttonTailColor // - this.buttonTailColor.Location = new System.Drawing.Point(154, 87); + this.buttonTailColor.Location = new System.Drawing.Point(231, 134); + this.buttonTailColor.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.buttonTailColor.Name = "buttonTailColor"; - this.buttonTailColor.Size = new System.Drawing.Size(56, 21); + this.buttonTailColor.Size = new System.Drawing.Size(84, 32); this.buttonTailColor.TabIndex = 4; this.buttonTailColor.Text = "Color..."; this.buttonTailColor.UseVisualStyleBackColor = true; @@ -361,9 +374,10 @@ private void InitializeComponent() // checkBoxTailState // this.checkBoxTailState.AutoSize = true; - this.checkBoxTailState.Location = new System.Drawing.Point(6, 91); + 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(133, 17); + 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; @@ -371,9 +385,10 @@ private void InitializeComponent() // checkBoxOpenLastFiles // this.checkBoxOpenLastFiles.AutoSize = true; - this.checkBoxOpenLastFiles.Location = new System.Drawing.Point(6, 67); + 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(133, 17); + 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; @@ -381,9 +396,10 @@ private void InitializeComponent() // checkBoxSingleInstance // this.checkBoxSingleInstance.AutoSize = true; - this.checkBoxSingleInstance.Location = new System.Drawing.Point(6, 43); + 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(121, 17); + this.checkBoxSingleInstance.Size = new System.Drawing.Size(173, 24); this.checkBoxSingleInstance.TabIndex = 1; this.checkBoxSingleInstance.Text = "Allow only 1 window"; this.checkBoxSingleInstance.UseVisualStyleBackColor = true; @@ -391,9 +407,10 @@ private void InitializeComponent() // checkBoxAskCloseTabs // this.checkBoxAskCloseTabs.AutoSize = true; - this.checkBoxAskCloseTabs.Location = new System.Drawing.Point(6, 19); + 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(136, 17); + this.checkBoxAskCloseTabs.Size = new System.Drawing.Size(200, 24); this.checkBoxAskCloseTabs.TabIndex = 0; this.checkBoxAskCloseTabs.Text = "Ask before closing tabs"; this.checkBoxAskCloseTabs.UseVisualStyleBackColor = true; @@ -404,9 +421,11 @@ private void InitializeComponent() 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(7, 111); + 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.Size = new System.Drawing.Size(274, 147); + 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"; @@ -414,9 +433,10 @@ private void InitializeComponent() // checkBoxFollowTail // this.checkBoxFollowTail.AutoSize = true; - this.checkBoxFollowTail.Location = new System.Drawing.Point(6, 19); + 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(113, 17); + this.checkBoxFollowTail.Size = new System.Drawing.Size(165, 24); this.checkBoxFollowTail.TabIndex = 3; this.checkBoxFollowTail.Text = "Follow tail enabled"; this.checkBoxFollowTail.UseVisualStyleBackColor = true; @@ -424,9 +444,10 @@ private void InitializeComponent() // checkBoxColumnFinder // this.checkBoxColumnFinder.AutoSize = true; - this.checkBoxColumnFinder.Location = new System.Drawing.Point(6, 91); + 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(119, 17); + this.checkBoxColumnFinder.Size = new System.Drawing.Size(174, 24); this.checkBoxColumnFinder.TabIndex = 5; this.checkBoxColumnFinder.Text = "Show column finder"; this.checkBoxColumnFinder.UseVisualStyleBackColor = true; @@ -434,9 +455,10 @@ private void InitializeComponent() // checkBoxSyncFilter // this.checkBoxSyncFilter.AutoSize = true; - this.checkBoxSyncFilter.Location = new System.Drawing.Point(6, 67); + 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(128, 17); + this.checkBoxSyncFilter.Size = new System.Drawing.Size(188, 24); this.checkBoxSyncFilter.TabIndex = 5; this.checkBoxSyncFilter.Text = "Sync filter list enabled"; this.checkBoxSyncFilter.UseVisualStyleBackColor = true; @@ -444,9 +466,10 @@ private void InitializeComponent() // checkBoxFilterTail // this.checkBoxFilterTail.AutoSize = true; - this.checkBoxFilterTail.Location = new System.Drawing.Point(6, 43); + 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(105, 17); + this.checkBoxFilterTail.Size = new System.Drawing.Size(155, 24); this.checkBoxFilterTail.TabIndex = 4; this.checkBoxFilterTail.Text = "Filter tail enabled"; this.checkBoxFilterTail.UseVisualStyleBackColor = true; @@ -455,18 +478,21 @@ private void InitializeComponent() // this.groupBoxFont.Controls.Add(this.buttonChangeFont); this.groupBoxFont.Controls.Add(this.labelFont); - this.groupBoxFont.Location = new System.Drawing.Point(7, 6); + 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.Size = new System.Drawing.Size(272, 83); + this.groupBoxFont.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.groupBoxFont.Size = new System.Drawing.Size(408, 128); this.groupBoxFont.TabIndex = 1; this.groupBoxFont.TabStop = false; this.groupBoxFont.Text = "Font"; // // buttonChangeFont // - this.buttonChangeFont.Location = new System.Drawing.Point(6, 50); + 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(75, 23); + this.buttonChangeFont.Size = new System.Drawing.Size(112, 35); this.buttonChangeFont.TabIndex = 1; this.buttonChangeFont.Text = "Change..."; this.buttonChangeFont.UseVisualStyleBackColor = true; @@ -474,9 +500,10 @@ private void InitializeComponent() // // labelFont // - this.labelFont.Location = new System.Drawing.Point(6, 16); + 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(208, 31); + this.labelFont.Size = new System.Drawing.Size(312, 48); this.labelFont.TabIndex = 0; this.labelFont.Text = "Font"; this.labelFont.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -485,10 +512,11 @@ private void InitializeComponent() // this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeSpreadDisplay); this.tabPageTimeStampFeatures.Controls.Add(this.groupBoxTimeStampNavigationControl); - this.tabPageTimeStampFeatures.Location = new System.Drawing.Point(4, 22); + 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(3); - this.tabPageTimeStampFeatures.Size = new System.Drawing.Size(625, 278); + 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; @@ -499,9 +527,11 @@ private void InitializeComponent() 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(327, 16); + 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.Size = new System.Drawing.Size(200, 160); + 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"; @@ -510,9 +540,11 @@ private void InitializeComponent() // this.groupBoxDisplayMode.Controls.Add(this.radioButtonLineView); this.groupBoxDisplayMode.Controls.Add(this.radioButtonTimeView); - this.groupBoxDisplayMode.Location = new System.Drawing.Point(15, 71); + 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.Size = new System.Drawing.Size(125, 77); + 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"; @@ -520,9 +552,10 @@ private void InitializeComponent() // radioButtonLineView // this.radioButtonLineView.AutoSize = true; - this.radioButtonLineView.Location = new System.Drawing.Point(6, 42); + 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(70, 17); + this.radioButtonLineView.Size = new System.Drawing.Size(98, 24); this.radioButtonLineView.TabIndex = 9; this.radioButtonLineView.TabStop = true; this.radioButtonLineView.Text = "Line view"; @@ -531,9 +564,10 @@ private void InitializeComponent() // radioButtonTimeView // this.radioButtonTimeView.AutoSize = true; - this.radioButtonTimeView.Location = new System.Drawing.Point(6, 19); + 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(73, 17); + this.radioButtonTimeView.Size = new System.Drawing.Size(102, 24); this.radioButtonTimeView.TabIndex = 10; this.radioButtonTimeView.TabStop = true; this.radioButtonTimeView.Text = "Time view"; @@ -542,18 +576,20 @@ private void InitializeComponent() // checkBoxReverseAlpha // this.checkBoxReverseAlpha.AutoSize = true; - this.checkBoxReverseAlpha.Location = new System.Drawing.Point(15, 48); + 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(95, 17); + this.checkBoxReverseAlpha.Size = new System.Drawing.Size(137, 24); this.checkBoxReverseAlpha.TabIndex = 8; this.checkBoxReverseAlpha.Text = "Reverse alpha"; this.checkBoxReverseAlpha.UseVisualStyleBackColor = true; // // buttonTimespreadColor // - this.buttonTimespreadColor.Location = new System.Drawing.Point(138, 21); + 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(56, 21); + this.buttonTimespreadColor.Size = new System.Drawing.Size(84, 32); this.buttonTimespreadColor.TabIndex = 7; this.buttonTimespreadColor.Text = "Color..."; this.buttonTimespreadColor.UseVisualStyleBackColor = true; @@ -562,9 +598,10 @@ private void InitializeComponent() // checkBoxTimeSpread // this.checkBoxTimeSpread.AutoSize = true; - this.checkBoxTimeSpread.Location = new System.Drawing.Point(15, 24); + 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(110, 17); + this.checkBoxTimeSpread.Size = new System.Drawing.Size(162, 24); this.checkBoxTimeSpread.TabIndex = 6; this.checkBoxTimeSpread.Text = "Show time spread"; this.checkBoxTimeSpread.UseVisualStyleBackColor = true; @@ -573,9 +610,11 @@ private void InitializeComponent() // this.groupBoxTimeStampNavigationControl.Controls.Add(this.checkBoxTimestamp); this.groupBoxTimeStampNavigationControl.Controls.Add(this.groupBoxMouseDragDefaults); - this.groupBoxTimeStampNavigationControl.Location = new System.Drawing.Point(7, 16); + 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.Size = new System.Drawing.Size(300, 160); + 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"; @@ -583,9 +622,10 @@ private void InitializeComponent() // checkBoxTimestamp // this.checkBoxTimestamp.AutoSize = true; - this.checkBoxTimestamp.Location = new System.Drawing.Point(18, 24); + 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(266, 17); + 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; @@ -595,9 +635,11 @@ private void InitializeComponent() 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(18, 52); + 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.Size = new System.Drawing.Size(124, 96); + 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"; @@ -605,9 +647,10 @@ private void InitializeComponent() // radioButtonVerticalMouseDragInverted // this.radioButtonVerticalMouseDragInverted.AutoSize = true; - this.radioButtonVerticalMouseDragInverted.Location = new System.Drawing.Point(6, 66); + 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(102, 17); + this.radioButtonVerticalMouseDragInverted.Size = new System.Drawing.Size(149, 24); this.radioButtonVerticalMouseDragInverted.TabIndex = 6; this.radioButtonVerticalMouseDragInverted.TabStop = true; this.radioButtonVerticalMouseDragInverted.Text = "Vertical Inverted"; @@ -616,9 +659,10 @@ private void InitializeComponent() // radioButtonHorizMouseDrag // this.radioButtonHorizMouseDrag.AutoSize = true; - this.radioButtonHorizMouseDrag.Location = new System.Drawing.Point(6, 19); + 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(72, 17); + this.radioButtonHorizMouseDrag.Size = new System.Drawing.Size(106, 24); this.radioButtonHorizMouseDrag.TabIndex = 5; this.radioButtonHorizMouseDrag.TabStop = true; this.radioButtonHorizMouseDrag.Text = "Horizontal"; @@ -627,9 +671,10 @@ private void InitializeComponent() // radioButtonVerticalMouseDrag // this.radioButtonVerticalMouseDrag.AutoSize = true; - this.radioButtonVerticalMouseDrag.Location = new System.Drawing.Point(6, 42); + 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(60, 17); + this.radioButtonVerticalMouseDrag.Size = new System.Drawing.Size(87, 24); this.radioButtonVerticalMouseDrag.TabIndex = 4; this.radioButtonVerticalMouseDrag.TabStop = true; this.radioButtonVerticalMouseDrag.Text = "Vertical"; @@ -644,28 +689,31 @@ private void InitializeComponent() 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, 22); + 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(3); - this.tabPageExternalTools.Size = new System.Drawing.Size(625, 278); + this.tabPageExternalTools.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.tabPageExternalTools.Size = new System.Drawing.Size(942, 435); this.tabPageExternalTools.TabIndex = 2; this.tabPageExternalTools.Text = "External Tools"; this.tabPageExternalTools.UseVisualStyleBackColor = true; // // labelToolsDescription // - this.labelToolsDescription.Location = new System.Drawing.Point(364, 66); + 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(251, 52); + this.labelToolsDescription.Size = new System.Drawing.Size(376, 80); this.labelToolsDescription.TabIndex = 6; this.labelToolsDescription.Text = "You can configure as many tools as you want. \r\nChecked tools will appear in the i" + "con bar. All other tools are available in the tools menu."; // // buttonToolDelete // - this.buttonToolDelete.Location = new System.Drawing.Point(367, 9); + 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(75, 23); + this.buttonToolDelete.Size = new System.Drawing.Size(112, 35); this.buttonToolDelete.TabIndex = 2; this.buttonToolDelete.Text = "Remove"; this.buttonToolDelete.UseVisualStyleBackColor = true; @@ -673,9 +721,10 @@ private void InitializeComponent() // // buttonToolAdd // - this.buttonToolAdd.Location = new System.Drawing.Point(286, 9); + 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(75, 23); + this.buttonToolAdd.Size = new System.Drawing.Size(112, 35); this.buttonToolAdd.TabIndex = 1; this.buttonToolAdd.Text = "Add new"; this.buttonToolAdd.UseVisualStyleBackColor = true; @@ -683,9 +732,10 @@ private void InitializeComponent() // // buttonToolDown // - this.buttonToolDown.Location = new System.Drawing.Point(286, 95); + 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(43, 23); + this.buttonToolDown.Size = new System.Drawing.Size(64, 35); this.buttonToolDown.TabIndex = 4; this.buttonToolDown.Text = "Down"; this.buttonToolDown.UseVisualStyleBackColor = true; @@ -693,9 +743,10 @@ private void InitializeComponent() // // buttonToolUp // - this.buttonToolUp.Location = new System.Drawing.Point(286, 66); + 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(43, 23); + this.buttonToolUp.Size = new System.Drawing.Size(64, 35); this.buttonToolUp.TabIndex = 3; this.buttonToolUp.Text = "Up"; this.buttonToolUp.UseVisualStyleBackColor = true; @@ -704,9 +755,10 @@ private void InitializeComponent() // listBoxTools // this.listBoxTools.FormattingEnabled = true; - this.listBoxTools.Location = new System.Drawing.Point(7, 9); + 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(272, 109); + this.listBoxTools.Size = new System.Drawing.Size(406, 165); this.listBoxTools.TabIndex = 0; this.listBoxTools.SelectedIndexChanged += new System.EventHandler(this.toolListBox_SelectedIndexChanged); // @@ -727,9 +779,11 @@ private void InitializeComponent() 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(7, 124); + 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.Size = new System.Drawing.Size(608, 148); + 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"; @@ -737,17 +791,19 @@ private void InitializeComponent() // labelWorkingDir // this.labelWorkingDir.AutoSize = true; - this.labelWorkingDir.Location = new System.Drawing.Point(316, 56); + 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(64, 13); + this.labelWorkingDir.Size = new System.Drawing.Size(92, 20); this.labelWorkingDir.TabIndex = 11; this.labelWorkingDir.Text = "Working dir:"; // // buttonWorkingDir // - this.buttonWorkingDir.Location = new System.Drawing.Point(571, 52); + 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(30, 20); + this.buttonWorkingDir.Size = new System.Drawing.Size(45, 31); this.buttonWorkingDir.TabIndex = 10; this.buttonWorkingDir.Text = "..."; this.buttonWorkingDir.UseVisualStyleBackColor = true; @@ -755,17 +811,19 @@ private void InitializeComponent() // // textBoxWorkingDir // - this.textBoxWorkingDir.Location = new System.Drawing.Point(384, 53); + 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(181, 20); + this.textBoxWorkingDir.Size = new System.Drawing.Size(270, 26); this.textBoxWorkingDir.TabIndex = 9; // // buttonIcon // this.buttonIcon.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.buttonIcon.Location = new System.Drawing.Point(279, 17); + 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(75, 23); + 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; @@ -775,42 +833,47 @@ private void InitializeComponent() // labelToolName // this.labelToolName.AutoSize = true; - this.labelToolName.Location = new System.Drawing.Point(6, 22); + 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(38, 13); + this.labelToolName.Size = new System.Drawing.Size(55, 20); this.labelToolName.TabIndex = 8; this.labelToolName.Text = "Name:"; // // labelToolColumnizerForOutput // this.labelToolColumnizerForOutput.AutoSize = true; - this.labelToolColumnizerForOutput.Location = new System.Drawing.Point(269, 120); + 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(109, 13); + this.labelToolColumnizerForOutput.Size = new System.Drawing.Size(165, 20); this.labelToolColumnizerForOutput.TabIndex = 6; this.labelToolColumnizerForOutput.Text = "Columnizer for output:"; // // comboBoxColumnizer // this.comboBoxColumnizer.FormattingEnabled = true; - this.comboBoxColumnizer.Location = new System.Drawing.Point(384, 117); + 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(181, 21); + this.comboBoxColumnizer.Size = new System.Drawing.Size(270, 28); this.comboBoxColumnizer.TabIndex = 7; // // textBoxToolName // - this.textBoxToolName.Location = new System.Drawing.Point(72, 19); + 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(200, 20); + this.textBoxToolName.Size = new System.Drawing.Size(298, 26); this.textBoxToolName.TabIndex = 0; // // checkBoxSysout // this.checkBoxSysout.AutoSize = true; - this.checkBoxSysout.Location = new System.Drawing.Point(72, 119); + 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(110, 17); + this.checkBoxSysout.Size = new System.Drawing.Size(161, 24); this.checkBoxSysout.TabIndex = 6; this.checkBoxSysout.Text = "Pipe sysout to tab"; this.checkBoxSysout.UseVisualStyleBackColor = true; @@ -818,9 +881,10 @@ private void InitializeComponent() // // buttonArguments // - this.buttonArguments.Location = new System.Drawing.Point(571, 83); + 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(31, 21); + this.buttonArguments.Size = new System.Drawing.Size(46, 32); this.buttonArguments.TabIndex = 5; this.buttonArguments.Text = "..."; this.buttonArguments.UseVisualStyleBackColor = true; @@ -829,17 +893,19 @@ private void InitializeComponent() // labelTool // this.labelTool.AutoSize = true; - this.labelTool.Location = new System.Drawing.Point(6, 56); + 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(49, 13); + this.labelTool.Size = new System.Drawing.Size(73, 20); this.labelTool.TabIndex = 4; this.labelTool.Text = "Program:"; // // buttonTool // - this.buttonTool.Location = new System.Drawing.Point(279, 51); + 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(30, 20); + this.buttonTool.Size = new System.Drawing.Size(45, 31); this.buttonTool.TabIndex = 3; this.buttonTool.Text = "..."; this.buttonTool.UseVisualStyleBackColor = true; @@ -847,25 +913,28 @@ private void InitializeComponent() // // textBoxTool // - this.textBoxTool.Location = new System.Drawing.Point(72, 52); + 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(200, 20); + this.textBoxTool.Size = new System.Drawing.Size(298, 26); this.textBoxTool.TabIndex = 2; // // labelArguments // this.labelArguments.AutoSize = true; - this.labelArguments.Location = new System.Drawing.Point(6, 87); + 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(60, 13); + this.labelArguments.Size = new System.Drawing.Size(91, 20); this.labelArguments.TabIndex = 1; this.labelArguments.Text = "Arguments:"; // // textBoxArguments // - this.textBoxArguments.Location = new System.Drawing.Point(72, 84); + 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(493, 20); + this.textBoxArguments.Size = new System.Drawing.Size(738, 26); this.textBoxArguments.TabIndex = 4; // // tabPageColumnizers @@ -874,10 +943,11 @@ private void InitializeComponent() 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, 22); + 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(3); - this.tabPageColumnizers.Size = new System.Drawing.Size(625, 278); + 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; @@ -887,9 +957,10 @@ private void InitializeComponent() this.checkBoxAutoPick.AutoSize = true; this.checkBoxAutoPick.Checked = true; this.checkBoxAutoPick.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBoxAutoPick.Location = new System.Drawing.Point(353, 251); + 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(170, 17); + 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; @@ -897,18 +968,20 @@ private void InitializeComponent() // checkBoxMaskPrio // this.checkBoxMaskPrio.AutoSize = true; - this.checkBoxMaskPrio.Location = new System.Drawing.Point(142, 252); + 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(171, 17); + this.checkBoxMaskPrio.Size = new System.Drawing.Size(253, 24); this.checkBoxMaskPrio.TabIndex = 4; this.checkBoxMaskPrio.Text = "Mask has priority before history"; this.checkBoxMaskPrio.UseVisualStyleBackColor = true; // // buttonDelete // - this.buttonDelete.Location = new System.Drawing.Point(8, 247); + 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(75, 23); + this.buttonDelete.Size = new System.Drawing.Size(112, 35); this.buttonDelete.TabIndex = 3; this.buttonDelete.Text = "Delete"; this.buttonDelete.UseVisualStyleBackColor = true; @@ -925,9 +998,11 @@ private void InitializeComponent() 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(3, 3); + 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.Size = new System.Drawing.Size(619, 237); + 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.columnizerDataGridView_RowsAdded); // @@ -946,10 +1021,11 @@ private void InitializeComponent() // tabPageHighlightMask // this.tabPageHighlightMask.Controls.Add(this.dataGridViewHighlightMask); - this.tabPageHighlightMask.Location = new System.Drawing.Point(4, 22); + 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(3); - this.tabPageHighlightMask.Size = new System.Drawing.Size(625, 278); + 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; @@ -962,9 +1038,11 @@ private void InitializeComponent() this.columnFileName, this.columnHighlightGroup}); this.dataGridViewHighlightMask.Dock = System.Windows.Forms.DockStyle.Fill; - this.dataGridViewHighlightMask.Location = new System.Drawing.Point(3, 3); + 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.Size = new System.Drawing.Size(619, 272); + this.dataGridViewHighlightMask.RowHeadersWidth = 62; + this.dataGridViewHighlightMask.Size = new System.Drawing.Size(934, 425); this.dataGridViewHighlightMask.TabIndex = 0; // // columnFileName @@ -985,10 +1063,11 @@ private void InitializeComponent() 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, 22); + 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(3); - this.tabPageMultiFile.Size = new System.Drawing.Size(625, 278); + 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; @@ -999,9 +1078,11 @@ private void InitializeComponent() 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(243, 18); + 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.Size = new System.Drawing.Size(291, 100); + 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"; @@ -1009,24 +1090,27 @@ private void InitializeComponent() // labelMaxDays // this.labelMaxDays.AutoSize = true; - this.labelMaxDays.Location = new System.Drawing.Point(7, 49); + 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(55, 13); + this.labelMaxDays.Size = new System.Drawing.Size(79, 20); this.labelMaxDays.TabIndex = 3; this.labelMaxDays.Text = "Max days:"; // // labelPattern // this.labelPattern.AutoSize = true; - this.labelPattern.Location = new System.Drawing.Point(7, 24); + 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(44, 13); + this.labelPattern.Size = new System.Drawing.Size(65, 20); this.labelPattern.TabIndex = 2; this.labelPattern.Text = "Pattern:"; // // upDownMultifileDays // - this.upDownMultifileDays.Location = new System.Drawing.Point(68, 47); + 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, @@ -1034,7 +1118,7 @@ private void InitializeComponent() 0}); this.upDownMultifileDays.Name = "upDownMultifileDays"; this.helpProvider.SetShowHelp(this.upDownMultifileDays, false); - this.upDownMultifileDays.Size = new System.Drawing.Size(61, 20); + this.upDownMultifileDays.Size = new System.Drawing.Size(92, 26); this.upDownMultifileDays.TabIndex = 1; this.upDownMultifileDays.Value = new decimal(new int[] { 1, @@ -1044,26 +1128,29 @@ private void InitializeComponent() // // textBoxMultifilePattern // - this.textBoxMultifilePattern.Location = new System.Drawing.Point(68, 21); + 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(187, 20); + this.textBoxMultifilePattern.Size = new System.Drawing.Size(278, 26); this.textBoxMultifilePattern.TabIndex = 0; this.textBoxMultifilePattern.TextChanged += new System.EventHandler(this.OnMultiFilePatternTextChanged); // // labelHintMultiFile // - this.labelHintMultiFile.Location = new System.Drawing.Point(4, 132); + 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(203, 72); + this.labelHintMultiFile.Size = new System.Drawing.Size(304, 111); this.labelHintMultiFile.TabIndex = 2; this.labelHintMultiFile.Text = "Hint: Pressing the Shift key while dropping files onto LogExpert will switch the " + "behaviour from single to multi and vice versa."; // // labelNoteMultiFile // - this.labelNoteMultiFile.Location = new System.Drawing.Point(4, 204); + 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(470, 53); + this.labelNoteMultiFile.Size = new System.Drawing.Size(705, 82); this.labelNoteMultiFile.TabIndex = 1; this.labelNoteMultiFile.Text = resources.GetString("labelNoteMultiFile.Text"); // @@ -1072,9 +1159,11 @@ private void InitializeComponent() 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(7, 18); + 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.Size = new System.Drawing.Size(200, 100); + 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..."; @@ -1082,9 +1171,10 @@ private void InitializeComponent() // radioButtonAskWhatToDo // this.radioButtonAskWhatToDo.AutoSize = true; - this.radioButtonAskWhatToDo.Location = new System.Drawing.Point(7, 68); + 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(96, 17); + this.radioButtonAskWhatToDo.Size = new System.Drawing.Size(139, 24); this.radioButtonAskWhatToDo.TabIndex = 2; this.radioButtonAskWhatToDo.TabStop = true; this.radioButtonAskWhatToDo.Text = "Ask what to do"; @@ -1093,9 +1183,10 @@ private void InitializeComponent() // radioButtonTreatAllFilesAsOneMultifile // this.radioButtonTreatAllFilesAsOneMultifile.AutoSize = true; - this.radioButtonTreatAllFilesAsOneMultifile.Location = new System.Drawing.Point(7, 44); + 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(164, 17); + 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\'"; @@ -1104,9 +1195,10 @@ private void InitializeComponent() // radioButtonLoadEveryFileIntoSeperatedTab // this.radioButtonLoadEveryFileIntoSeperatedTab.AutoSize = true; - this.radioButtonLoadEveryFileIntoSeperatedTab.Location = new System.Drawing.Point(7, 20); + 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(185, 17); + 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"; @@ -1116,10 +1208,11 @@ private void InitializeComponent() // this.tabPagePlugins.Controls.Add(this.groupBoxPlugins); this.tabPagePlugins.Controls.Add(this.groupBoxSettings); - this.tabPagePlugins.Location = new System.Drawing.Point(4, 22); + 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(3); - this.tabPagePlugins.Size = new System.Drawing.Size(625, 278); + 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; @@ -1130,9 +1223,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxPlugins.Controls.Add(this.listBoxPlugin); - this.groupBoxPlugins.Location = new System.Drawing.Point(7, 15); + 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.Size = new System.Drawing.Size(228, 257); + 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"; @@ -1144,9 +1239,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.listBoxPlugin.DisplayMember = "Text"; this.listBoxPlugin.FormattingEnabled = true; - this.listBoxPlugin.Location = new System.Drawing.Point(6, 19); + 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(216, 225); + this.listBoxPlugin.Size = new System.Drawing.Size(322, 344); this.listBoxPlugin.TabIndex = 0; this.listBoxPlugin.ValueMember = "Text"; this.listBoxPlugin.SelectedIndexChanged += new System.EventHandler(this.pluginListBox_SelectedIndexChanged); @@ -1157,9 +1254,11 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.groupBoxSettings.Controls.Add(this.panelPlugin); - this.groupBoxSettings.Location = new System.Drawing.Point(241, 15); + 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.Size = new System.Drawing.Size(378, 257); + 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"; @@ -1171,16 +1270,18 @@ private void InitializeComponent() | System.Windows.Forms.AnchorStyles.Right))); this.panelPlugin.AutoScroll = true; this.panelPlugin.Controls.Add(this.buttonConfigPlugin); - this.panelPlugin.Location = new System.Drawing.Point(6, 19); + 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(366, 232); + this.panelPlugin.Size = new System.Drawing.Size(549, 357); this.panelPlugin.TabIndex = 1; // // buttonConfigPlugin // - this.buttonConfigPlugin.Location = new System.Drawing.Point(109, 106); + 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(113, 23); + this.buttonConfigPlugin.Size = new System.Drawing.Size(170, 35); this.buttonConfigPlugin.TabIndex = 0; this.buttonConfigPlugin.Text = "Configure..."; this.buttonConfigPlugin.UseVisualStyleBackColor = true; @@ -1191,10 +1292,11 @@ private void InitializeComponent() 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, 22); + 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(3); - this.tabPageSessions.Size = new System.Drawing.Size(625, 278); + 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; @@ -1202,9 +1304,10 @@ private void InitializeComponent() // checkBoxSaveFilter // this.checkBoxSaveFilter.AutoSize = true; - this.checkBoxSaveFilter.Location = new System.Drawing.Point(23, 48); + 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(198, 17); + 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; @@ -1217,9 +1320,11 @@ private void InitializeComponent() this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionSaveOwn); this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonsessionSaveDocuments); this.groupBoxPersistantFileLocation.Controls.Add(this.radioButtonSessionSameDir); - this.groupBoxPersistantFileLocation.Location = new System.Drawing.Point(23, 87); + 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.Size = new System.Drawing.Size(274, 137); + 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"; @@ -1227,9 +1332,10 @@ private void InitializeComponent() // checkBoxPortableMode // this.checkBoxPortableMode.AutoSize = true; - this.checkBoxPortableMode.Location = new System.Drawing.Point(7, 112); + this.checkBoxPortableMode.Location = new System.Drawing.Point(10, 172); + this.checkBoxPortableMode.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.checkBoxPortableMode.Name = "checkBoxPortableMode"; - this.checkBoxPortableMode.Size = new System.Drawing.Size(137, 17); + 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" + @@ -1239,17 +1345,19 @@ private void InitializeComponent() // // labelSessionSaveOwnDir // - this.labelSessionSaveOwnDir.Location = new System.Drawing.Point(26, 92); + 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(168, 20); + this.labelSessionSaveOwnDir.Size = new System.Drawing.Size(252, 31); this.labelSessionSaveOwnDir.TabIndex = 4; this.labelSessionSaveOwnDir.Text = "sessionSaveOwnDirLabel"; // // buttonSessionSaveDir // - this.buttonSessionSaveDir.Location = new System.Drawing.Point(238, 66); + 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(30, 20); + this.buttonSessionSaveDir.Size = new System.Drawing.Size(45, 31); this.buttonSessionSaveDir.TabIndex = 3; this.buttonSessionSaveDir.Text = "..."; this.buttonSessionSaveDir.UseVisualStyleBackColor = true; @@ -1258,9 +1366,10 @@ private void InitializeComponent() // radioButtonSessionSaveOwn // this.radioButtonSessionSaveOwn.AutoSize = true; - this.radioButtonSessionSaveOwn.Location = new System.Drawing.Point(7, 68); + 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(90, 17); + this.radioButtonSessionSaveOwn.Size = new System.Drawing.Size(130, 24); this.radioButtonSessionSaveOwn.TabIndex = 2; this.radioButtonSessionSaveOwn.TabStop = true; this.radioButtonSessionSaveOwn.Text = "Own directory"; @@ -1269,9 +1378,10 @@ private void InitializeComponent() // radioButtonsessionSaveDocuments // this.radioButtonsessionSaveDocuments.AutoSize = true; - this.radioButtonsessionSaveDocuments.Location = new System.Drawing.Point(7, 44); + 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(146, 17); + this.radioButtonsessionSaveDocuments.Size = new System.Drawing.Size(213, 24); this.radioButtonsessionSaveDocuments.TabIndex = 1; this.radioButtonsessionSaveDocuments.TabStop = true; this.radioButtonsessionSaveDocuments.Text = "MyDocuments/LogExpert"; @@ -1280,9 +1390,10 @@ private void InitializeComponent() // radioButtonSessionSameDir // this.radioButtonSessionSameDir.AutoSize = true; - this.radioButtonSessionSameDir.Location = new System.Drawing.Point(7, 20); + 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(142, 17); + 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"; @@ -1291,9 +1402,10 @@ private void InitializeComponent() // checkBoxSaveSessions // this.checkBoxSaveSessions.AutoSize = true; - this.checkBoxSaveSessions.Location = new System.Drawing.Point(23, 25); + 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(217, 17); + 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; @@ -1302,10 +1414,11 @@ private void InitializeComponent() // this.tabPageMemory.Controls.Add(this.groupBoxCPUAndStuff); this.tabPageMemory.Controls.Add(this.groupBoxLineBufferUsage); - this.tabPageMemory.Location = new System.Drawing.Point(4, 22); + 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(3); - this.tabPageMemory.Size = new System.Drawing.Size(625, 278); + 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; @@ -1316,9 +1429,11 @@ private void InitializeComponent() 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(272, 19); + 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.Size = new System.Drawing.Size(200, 128); + 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"; @@ -1326,9 +1441,10 @@ private void InitializeComponent() // checkBoxLegacyReader // this.checkBoxLegacyReader.AutoSize = true; - this.checkBoxLegacyReader.Location = new System.Drawing.Point(9, 90); + 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(167, 17); + 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"); @@ -1337,9 +1453,10 @@ private void InitializeComponent() // checkBoxMultiThread // this.checkBoxMultiThread.AutoSize = true; - this.checkBoxMultiThread.Location = new System.Drawing.Point(9, 67); + 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(115, 17); + this.checkBoxMultiThread.Size = new System.Drawing.Size(170, 24); this.checkBoxMultiThread.TabIndex = 5; this.checkBoxMultiThread.Text = "Multi threaded filter"; this.checkBoxMultiThread.UseVisualStyleBackColor = true; @@ -1347,15 +1464,17 @@ private void InitializeComponent() // labelFilePollingInterval // this.labelFilePollingInterval.AutoSize = true; - this.labelFilePollingInterval.Location = new System.Drawing.Point(6, 34); + 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(118, 13); + this.labelFilePollingInterval.Size = new System.Drawing.Size(176, 20); this.labelFilePollingInterval.TabIndex = 7; this.labelFilePollingInterval.Text = "File polling interval (ms):"; // // upDownPollingInterval // - this.upDownPollingInterval.Location = new System.Drawing.Point(127, 32); + 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, @@ -1367,7 +1486,7 @@ private void InitializeComponent() 0, 0}); this.upDownPollingInterval.Name = "upDownPollingInterval"; - this.upDownPollingInterval.Size = new System.Drawing.Size(57, 20); + this.upDownPollingInterval.Size = new System.Drawing.Size(86, 26); this.upDownPollingInterval.TabIndex = 6; this.upDownPollingInterval.Value = new decimal(new int[] { 20, @@ -1382,9 +1501,11 @@ private void InitializeComponent() 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(7, 19); + 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.Size = new System.Drawing.Size(217, 128); + 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"; @@ -1392,24 +1513,27 @@ private void InitializeComponent() // labelInfo // this.labelInfo.AutoSize = true; - this.labelInfo.Location = new System.Drawing.Point(6, 94); + 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(197, 13); + this.labelInfo.Size = new System.Drawing.Size(291, 20); this.labelInfo.TabIndex = 4; this.labelInfo.Text = "Changes will take effect on next file load"; // // labelNumberOfBlocks // this.labelNumberOfBlocks.AutoSize = true; - this.labelNumberOfBlocks.Location = new System.Drawing.Point(6, 34); + 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(90, 13); + this.labelNumberOfBlocks.Size = new System.Drawing.Size(132, 20); this.labelNumberOfBlocks.TabIndex = 1; this.labelNumberOfBlocks.Text = "Number of blocks"; // // upDownLinesPerBlock // - this.upDownLinesPerBlock.Location = new System.Drawing.Point(140, 66); + 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, @@ -1421,7 +1545,7 @@ private void InitializeComponent() 0, 0}); this.upDownLinesPerBlock.Name = "upDownLinesPerBlock"; - this.upDownLinesPerBlock.Size = new System.Drawing.Size(63, 20); + this.upDownLinesPerBlock.Size = new System.Drawing.Size(94, 26); this.upDownLinesPerBlock.TabIndex = 3; this.upDownLinesPerBlock.Value = new decimal(new int[] { 500, @@ -1432,7 +1556,8 @@ private void InitializeComponent() // // upDownBlockCount // - this.upDownBlockCount.Location = new System.Drawing.Point(140, 32); + 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, @@ -1444,7 +1569,7 @@ private void InitializeComponent() 0, 0}); this.upDownBlockCount.Name = "upDownBlockCount"; - this.upDownBlockCount.Size = new System.Drawing.Size(63, 20); + this.upDownBlockCount.Size = new System.Drawing.Size(94, 26); this.upDownBlockCount.TabIndex = 0; this.upDownBlockCount.Value = new decimal(new int[] { 100, @@ -1455,18 +1580,20 @@ private void InitializeComponent() // labelLinesPerBlock // this.labelLinesPerBlock.AutoSize = true; - this.labelLinesPerBlock.Location = new System.Drawing.Point(6, 68); + 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(63, 13); + this.labelLinesPerBlock.Size = new System.Drawing.Size(88, 20); this.labelLinesPerBlock.TabIndex = 2; this.labelLinesPerBlock.Text = "Lines/block"; // // buttonCancel // this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.buttonCancel.Location = new System.Drawing.Point(545, 331); + 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(75, 23); + this.buttonCancel.Size = new System.Drawing.Size(112, 35); this.buttonCancel.TabIndex = 1; this.buttonCancel.Text = "Cancel"; this.buttonCancel.UseVisualStyleBackColor = true; @@ -1475,9 +1602,10 @@ private void InitializeComponent() // buttonOk // this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK; - this.buttonOk.Location = new System.Drawing.Point(464, 331); + 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(75, 23); + this.buttonOk.Size = new System.Drawing.Size(112, 35); this.buttonOk.TabIndex = 0; this.buttonOk.Text = "OK"; this.buttonOk.UseVisualStyleBackColor = true; @@ -1489,9 +1617,10 @@ private void InitializeComponent() // // buttonExport // - this.buttonExport.Location = new System.Drawing.Point(13, 331); + 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(75, 23); + this.buttonExport.Size = new System.Drawing.Size(112, 35); this.buttonExport.TabIndex = 2; this.buttonExport.Text = "Export..."; this.buttonExport.UseVisualStyleBackColor = true; @@ -1499,9 +1628,10 @@ private void InitializeComponent() // // buttonImport // - this.buttonImport.Location = new System.Drawing.Point(95, 331); + 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(75, 23); + this.buttonImport.Size = new System.Drawing.Size(112, 35); this.buttonImport.TabIndex = 3; this.buttonImport.Text = "Import..."; this.buttonImport.UseVisualStyleBackColor = true; @@ -1524,10 +1654,10 @@ private void InitializeComponent() // SettingsDialog // this.AcceptButton = this.buttonOk; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.buttonCancel; - this.ClientSize = new System.Drawing.Size(637, 366); + this.ClientSize = new System.Drawing.Size(956, 563); this.Controls.Add(this.buttonImport); this.Controls.Add(this.buttonExport); this.Controls.Add(this.buttonOk); @@ -1537,6 +1667,7 @@ private void InitializeComponent() 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"; @@ -1708,7 +1839,7 @@ private void InitializeComponent() private System.Windows.Forms.NumericUpDown upDownMultifileDays; private System.Windows.Forms.TextBox textBoxMultifilePattern; private System.Windows.Forms.Label labelDefaultEncoding; - private System.Windows.Forms.ComboBox encodingComboBox; + private System.Windows.Forms.ComboBox comboBoxEncoding; private System.Windows.Forms.ToolTip toolTip; private System.Windows.Forms.CheckBox checkBoxColumnFinder; private System.Windows.Forms.Button buttonExport; diff --git a/src/LogExpert/Dialogs/SettingsDialog.cs b/src/LogExpert/Dialogs/SettingsDialog.cs index b2560edd..4eebbd82 100644 --- a/src/LogExpert/Dialogs/SettingsDialog.cs +++ b/src/LogExpert/Dialogs/SettingsDialog.cs @@ -147,7 +147,7 @@ private void FillDialog() FillMultifileSettings(); FillEncodingList(); - encodingComboBox.SelectedItem = Encoding.GetEncoding(Preferences.defaultEncoding); + comboBoxEncoding.SelectedItem = Encoding.GetEncoding(Preferences.defaultEncoding); checkBoxMaskPrio.Checked = Preferences.maskPrio; checkBoxAutoPick.Checked = Preferences.autoPick; checkBoxAskCloseTabs.Checked = Preferences.askForClose; @@ -545,15 +545,15 @@ private void DisplayCurrentIcon() private void FillEncodingList() { - encodingComboBox.Items.Clear(); + comboBoxEncoding.Items.Clear(); - encodingComboBox.Items.Add(Encoding.ASCII); - encodingComboBox.Items.Add(Encoding.Default); - encodingComboBox.Items.Add(Encoding.GetEncoding("iso-8859-1")); - encodingComboBox.Items.Add(Encoding.UTF8); - encodingComboBox.Items.Add(Encoding.Unicode); + comboBoxEncoding.Items.Add(Encoding.ASCII); + comboBoxEncoding.Items.Add(Encoding.Default); + comboBoxEncoding.Items.Add(Encoding.GetEncoding("iso-8859-1")); + comboBoxEncoding.Items.Add(Encoding.UTF8); + comboBoxEncoding.Items.Add(Encoding.Unicode); - encodingComboBox.ValueMember = "HeaderName"; + comboBoxEncoding.ValueMember = "HeaderName"; } #endregion @@ -637,7 +637,7 @@ private void okButton_Click(object sender, EventArgs e) Preferences.linesPerBuffer = (int) upDownLinesPerBlock.Value; Preferences.pollingInterval = (int) upDownPollingInterval.Value; Preferences.multiThreadFilter = checkBoxMultiThread.Checked; - Preferences.defaultEncoding = encodingComboBox.SelectedItem != null ? (encodingComboBox.SelectedItem as Encoding).HeaderName : Encoding.Default.HeaderName; + Preferences.defaultEncoding = comboBoxEncoding.SelectedItem != null ? (comboBoxEncoding.SelectedItem as Encoding).HeaderName : Encoding.Default.HeaderName; Preferences.showColumnFinder = checkBoxColumnFinder.Checked; Preferences.useLegacyReader = checkBoxLegacyReader.Checked; From 8b3c3ecbffd2c25d17b68905ad570a61ca99afd0 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 21 Jun 2022 22:03:53 +0200 Subject: [PATCH 2/3] update small changes --- .../Controls/LogTabWindow/LogTabWindow.cs | 4 +- .../LogTabWindow/LogTabWindow.designer.cs | 298 +++++++++--------- .../Controls/LogTabWindow/LogTabWindow.resx | 6 +- .../LogTabWindow/LogTabWindowEventHandlers.cs | 2 +- .../LogTabWindow/LogTabWindowPrivate.cs | 4 +- 5 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs index 144bb20b..6a6842ed 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.cs @@ -113,7 +113,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum _tabStringFormat.LineAlignment = StringAlignment.Center; _tabStringFormat.Alignment = StringAlignment.Near; - ToolStripControlHost host = new ToolStripControlHost(followTailCheckBox); + ToolStripControlHost host = new ToolStripControlHost(checkBoxFollowTail); host.Padding = new Padding(20, 0, 0, 0); host.BackColor = Color.FromKnownColor(KnownColor.Transparent); @@ -132,7 +132,7 @@ public LogTabWindow(string[] fileNames, int instanceNumber, bool showInstanceNum buttonToolStrip.Items.Insert(index, host); } - dateTimeDragControl.Visible = false; + dragControlDateTime.Visible = false; loadProgessBar.Visible = false; // get a reference to the current assembly diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs index 47eacc90..f8018f4b 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.designer.cs @@ -32,28 +32,28 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin2 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient8 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient9 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient5 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient10 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient11 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient12 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient6 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient13 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient14 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(LogTabWindow)); this.statusStrip = new System.Windows.Forms.StatusStrip(); - this.linesLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.sizeLabel = new System.Windows.Forms.ToolStripStatusLabel(); - this.currentLineLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.labelLines = new System.Windows.Forms.ToolStripStatusLabel(); + this.labelSize = new System.Windows.Forms.ToolStripStatusLabel(); + this.labelCurrentLine = new System.Windows.Forms.ToolStripStatusLabel(); this.loadProgessBar = new System.Windows.Forms.ToolStripProgressBar(); - this.statusLabel = new System.Windows.Forms.ToolStripStatusLabel(); + this.labelStatus = new System.Windows.Forms.ToolStripStatusLabel(); this.mainMenuStrip = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -143,10 +143,10 @@ private void InitializeComponent() this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripButtonTail = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator(); - this.highlightGroupsComboBox = new System.Windows.Forms.ToolStripComboBox(); + this.groupsComboBoxHighlightGroups = new System.Windows.Forms.ToolStripComboBox(); this.externalToolsToolStrip = new System.Windows.Forms.ToolStrip(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); - this.followTailCheckBox = new System.Windows.Forms.CheckBox(); + this.checkBoxFollowTail = new System.Windows.Forms.CheckBox(); this.tabContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.closeThisTabToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeOtherTabsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -157,7 +157,7 @@ private void InitializeComponent() this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator(); this.copyPathToClipboardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.findInExplorerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dateTimeDragControl = new LogExpert.Dialogs.DateTimeDragControl(); + this.dragControlDateTime = new LogExpert.Dialogs.DateTimeDragControl(); this.statusStrip.SuspendLayout(); this.mainMenuStrip.SuspendLayout(); this.toolStripContainer.ContentPanel.SuspendLayout(); @@ -172,11 +172,11 @@ private void InitializeComponent() this.statusStrip.AutoSize = false; this.statusStrip.ImageScalingSize = new System.Drawing.Size(24, 24); this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.linesLabel, - this.sizeLabel, - this.currentLineLabel, + this.labelLines, + this.labelSize, + this.labelCurrentLine, this.loadProgessBar, - this.statusLabel}); + this.labelStatus}); this.statusStrip.Location = new System.Drawing.Point(0, 779); this.statusStrip.Name = "statusStrip"; this.statusStrip.Padding = new System.Windows.Forms.Padding(2, 0, 21, 0); @@ -185,49 +185,49 @@ private void InitializeComponent() this.statusStrip.TabIndex = 5; this.statusStrip.Text = "statusStrip1"; // - // linesLabel + // labelLines // - this.linesLabel.AutoSize = false; - this.linesLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) + this.labelLines.AutoSize = false; + this.labelLines.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.linesLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; - this.linesLabel.Name = "linesLabel"; - this.linesLabel.Size = new System.Drawing.Size(90, 28); - this.linesLabel.Text = "0"; + this.labelLines.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; + this.labelLines.Name = "labelLines"; + this.labelLines.Size = new System.Drawing.Size(90, 28); + this.labelLines.Text = "0"; // - // sizeLabel + // labelSize // - this.sizeLabel.AutoSize = false; - this.sizeLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) + this.labelSize.AutoSize = false; + this.labelSize.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.sizeLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; - this.sizeLabel.Name = "sizeLabel"; - this.sizeLabel.Size = new System.Drawing.Size(90, 28); - this.sizeLabel.Text = "0"; + this.labelSize.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; + this.labelSize.Name = "labelSize"; + this.labelSize.Size = new System.Drawing.Size(90, 28); + this.labelSize.Text = "0"; // - // currentLineLabel + // labelCurrentLine // - this.currentLineLabel.AutoSize = false; - this.currentLineLabel.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) + this.labelCurrentLine.AutoSize = false; + this.labelCurrentLine.BorderSides = ((System.Windows.Forms.ToolStripStatusLabelBorderSides)((((System.Windows.Forms.ToolStripStatusLabelBorderSides.Left | System.Windows.Forms.ToolStripStatusLabelBorderSides.Top) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) | System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom))); - this.currentLineLabel.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; - this.currentLineLabel.Name = "currentLineLabel"; - this.currentLineLabel.Size = new System.Drawing.Size(90, 28); - this.currentLineLabel.Text = "L:"; + this.labelCurrentLine.BorderStyle = System.Windows.Forms.Border3DStyle.SunkenOuter; + this.labelCurrentLine.Name = "labelCurrentLine"; + this.labelCurrentLine.Size = new System.Drawing.Size(90, 28); + this.labelCurrentLine.Text = "L:"; // // loadProgessBar // this.loadProgessBar.Name = "loadProgessBar"; this.loadProgessBar.Size = new System.Drawing.Size(75, 27); // - // statusLabel + // labelStatus // - this.statusLabel.Name = "statusLabel"; - this.statusLabel.Size = new System.Drawing.Size(60, 28); - this.statusLabel.Text = "Ready"; + this.labelStatus.Name = "labelStatus"; + this.labelStatus.Size = new System.Drawing.Size(60, 28); + this.labelStatus.Text = "Ready"; // // mainMenuStrip // @@ -514,7 +514,7 @@ private void InitializeComponent() // toolStripEncodingASCIIItem // this.toolStripEncodingASCIIItem.Name = "toolStripEncodingASCIIItem"; - this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingASCIIItem.Size = new System.Drawing.Size(207, 34); this.toolStripEncodingASCIIItem.Tag = ""; this.toolStripEncodingASCIIItem.Text = "ASCII"; this.toolStripEncodingASCIIItem.Click += new System.EventHandler(this.OnASCIIToolStripMenuItemClick); @@ -522,7 +522,7 @@ private void InitializeComponent() // toolStripEncodingANSIItem // this.toolStripEncodingANSIItem.Name = "toolStripEncodingANSIItem"; - this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingANSIItem.Size = new System.Drawing.Size(207, 34); this.toolStripEncodingANSIItem.Tag = ""; this.toolStripEncodingANSIItem.Text = "ANSI"; this.toolStripEncodingANSIItem.Click += new System.EventHandler(this.OnANSIToolStripMenuItemClick); @@ -530,21 +530,21 @@ private void InitializeComponent() // toolStripEncodingISO88591Item // this.toolStripEncodingISO88591Item.Name = "toolStripEncodingISO88591Item"; - this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingISO88591Item.Size = new System.Drawing.Size(207, 34); this.toolStripEncodingISO88591Item.Text = "ISO-8859-1"; this.toolStripEncodingISO88591Item.Click += new System.EventHandler(this.OnISO88591ToolStripMenuItemClick); // // toolStripEncodingUTF8Item // this.toolStripEncodingUTF8Item.Name = "toolStripEncodingUTF8Item"; - this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingUTF8Item.Size = new System.Drawing.Size(207, 34); this.toolStripEncodingUTF8Item.Text = "UTF8"; this.toolStripEncodingUTF8Item.Click += new System.EventHandler(this.OnUTF8ToolStripMenuItemClick); // // toolStripEncodingUTF16Item // this.toolStripEncodingUTF16Item.Name = "toolStripEncodingUTF16Item"; - this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(270, 34); + this.toolStripEncodingUTF16Item.Size = new System.Drawing.Size(207, 34); this.toolStripEncodingUTF16Item.Text = "Unicode"; this.toolStripEncodingUTF16Item.Click += new System.EventHandler(this.OnUTF16ToolStripMenuItemClick); // @@ -904,52 +904,52 @@ private void InitializeComponent() this.dockPanel.Name = "dockPanel"; this.dockPanel.ShowDocumentIcon = true; this.dockPanel.Size = new System.Drawing.Size(1443, 712); - dockPanelGradient4.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient4.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin2.DockStripGradient = dockPanelGradient4; - tabGradient8.EndColor = System.Drawing.SystemColors.Control; - tabGradient8.StartColor = System.Drawing.SystemColors.Control; - tabGradient8.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin2.TabGradient = tabGradient8; - autoHideStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F); - dockPanelSkin2.AutoHideStripSkin = autoHideStripSkin2; - tabGradient9.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient9.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.ActiveTabGradient = tabGradient9; - dockPanelGradient5.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient5.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient2.DockStripGradient = dockPanelGradient5; - tabGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient10.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient2.InactiveTabGradient = tabGradient10; - dockPaneStripSkin2.DocumentGradient = dockPaneStripGradient2; - dockPaneStripSkin2.TextFont = new System.Drawing.Font("Segoe UI", 9F); - tabGradient11.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient11.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient11.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient11.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient2.ActiveCaptionGradient = tabGradient11; - tabGradient12.EndColor = System.Drawing.SystemColors.Control; - tabGradient12.StartColor = System.Drawing.SystemColors.Control; - tabGradient12.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient2.ActiveTabGradient = tabGradient12; - dockPanelGradient6.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient6.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient2.DockStripGradient = dockPanelGradient6; - tabGradient13.EndColor = System.Drawing.SystemColors.InactiveCaption; - tabGradient13.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient13.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient13.TextColor = System.Drawing.SystemColors.InactiveCaptionText; - dockPaneStripToolWindowGradient2.InactiveCaptionGradient = tabGradient13; - tabGradient14.EndColor = System.Drawing.Color.Transparent; - tabGradient14.StartColor = System.Drawing.Color.Transparent; - tabGradient14.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient2.InactiveTabGradient = tabGradient14; - dockPaneStripSkin2.ToolWindowGradient = dockPaneStripToolWindowGradient2; - dockPanelSkin2.DockPaneStripSkin = dockPaneStripSkin2; - this.dockPanel.Skin = dockPanelSkin2; + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + autoHideStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + dockPaneStripSkin1.TextFont = new System.Drawing.Font("Segoe UI", 9F); + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.InactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.InactiveCaptionText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 14; this.dockPanel.ActiveContentChanged += new System.EventHandler(this.OnDockPanelActiveContentChanged); // @@ -973,7 +973,7 @@ private void InitializeComponent() this.toolStripSeparator15, this.toolStripButtonTail, this.toolStripSeparator17, - this.highlightGroupsComboBox}); + this.groupsComboBoxHighlightGroups}); this.buttonToolStrip.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; this.buttonToolStrip.Location = new System.Drawing.Point(4, 0); this.buttonToolStrip.Name = "buttonToolStrip"; @@ -1098,18 +1098,18 @@ private void InitializeComponent() this.toolStripSeparator17.Name = "toolStripSeparator17"; this.toolStripSeparator17.Size = new System.Drawing.Size(6, 23); // - // highlightGroupsComboBox + // groupsComboBoxHighlightGroups // - this.highlightGroupsComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.highlightGroupsComboBox.DropDownWidth = 250; - this.highlightGroupsComboBox.FlatStyle = System.Windows.Forms.FlatStyle.Standard; - this.highlightGroupsComboBox.Name = "highlightGroupsComboBox"; - this.highlightGroupsComboBox.Size = new System.Drawing.Size(150, 33); - this.highlightGroupsComboBox.ToolTipText = "Select the current highlight settings for the log file (right-click to open highl" + + this.groupsComboBoxHighlightGroups.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.groupsComboBoxHighlightGroups.DropDownWidth = 250; + this.groupsComboBoxHighlightGroups.FlatStyle = System.Windows.Forms.FlatStyle.Standard; + this.groupsComboBoxHighlightGroups.Name = "groupsComboBoxHighlightGroups"; + this.groupsComboBoxHighlightGroups.Size = new System.Drawing.Size(150, 33); + this.groupsComboBoxHighlightGroups.ToolTipText = "Select the current highlight settings for the log file (right-click to open highl" + "ight settings)"; - this.highlightGroupsComboBox.DropDownClosed += new System.EventHandler(this.OnHighlightGroupsComboBoxDropDownClosed); - this.highlightGroupsComboBox.SelectedIndexChanged += new System.EventHandler(this.OnHighlightGroupsComboBoxSelectedIndexChanged); - this.highlightGroupsComboBox.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnHighlightGroupsComboBoxMouseUp); + this.groupsComboBoxHighlightGroups.DropDownClosed += new System.EventHandler(this.OnHighlightGroupsComboBoxDropDownClosed); + this.groupsComboBoxHighlightGroups.SelectedIndexChanged += new System.EventHandler(this.OnHighlightGroupsComboBoxSelectedIndexChanged); + this.groupsComboBoxHighlightGroups.MouseUp += new System.Windows.Forms.MouseEventHandler(this.OnHighlightGroupsComboBoxMouseUp); // // externalToolsToolStrip // @@ -1129,17 +1129,17 @@ private void InitializeComponent() this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Size = new System.Drawing.Size(6, 25); // - // followTailCheckBox + // checkBoxFollowTail // - this.followTailCheckBox.AutoSize = true; - this.followTailCheckBox.Location = new System.Drawing.Point(596, 788); - this.followTailCheckBox.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); - this.followTailCheckBox.Name = "followTailCheckBox"; - this.followTailCheckBox.Size = new System.Drawing.Size(104, 24); - this.followTailCheckBox.TabIndex = 14; - this.followTailCheckBox.Text = "Follow tail"; - this.followTailCheckBox.UseVisualStyleBackColor = true; - this.followTailCheckBox.Click += new System.EventHandler(this.OnFollowTailCheckBoxClick); + this.checkBoxFollowTail.AutoSize = true; + this.checkBoxFollowTail.Location = new System.Drawing.Point(596, 788); + this.checkBoxFollowTail.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.checkBoxFollowTail.Name = "checkBoxFollowTail"; + this.checkBoxFollowTail.Size = new System.Drawing.Size(104, 24); + this.checkBoxFollowTail.TabIndex = 14; + this.checkBoxFollowTail.Text = "Follow tail"; + this.checkBoxFollowTail.UseVisualStyleBackColor = true; + this.checkBoxFollowTail.Click += new System.EventHandler(this.OnFollowTailCheckBoxClick); // // tabContextMenuStrip // @@ -1222,23 +1222,23 @@ private void InitializeComponent() this.findInExplorerToolStripMenuItem.ToolTipText = "Opens an Explorer window and selects the log file"; this.findInExplorerToolStripMenuItem.Click += new System.EventHandler(this.OnFindInExplorerToolStripMenuItemClick); // - // dateTimeDragControl - // - this.dateTimeDragControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.dateTimeDragControl.BackColor = System.Drawing.SystemColors.Control; - this.dateTimeDragControl.DateTime = new System.DateTime(((long)(0))); - this.dateTimeDragControl.DragOrientation = LogExpert.Dialogs.DateTimeDragControl.DragOrientations.Vertical; - this.dateTimeDragControl.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.dateTimeDragControl.HoverColor = System.Drawing.Color.LightGray; - this.dateTimeDragControl.Location = new System.Drawing.Point(916, 782); - this.dateTimeDragControl.Margin = new System.Windows.Forms.Padding(0); - this.dateTimeDragControl.MaxDateTime = new System.DateTime(9999, 12, 31, 23, 59, 59, 999); - this.dateTimeDragControl.MinDateTime = new System.DateTime(((long)(0))); - this.dateTimeDragControl.Name = "dateTimeDragControl"; - this.dateTimeDragControl.Size = new System.Drawing.Size(282, 31); - this.dateTimeDragControl.TabIndex = 14; - this.dateTimeDragControl.ValueChanged += new LogExpert.Dialogs.DateTimeDragControl.ValueChangedEventHandler(this.OnDateTimeDragControlValueChanged); - this.dateTimeDragControl.ValueDragged += new LogExpert.Dialogs.DateTimeDragControl.ValueDraggedEventHandler(this.OnDateTimeDragControlValueDragged); + // dragControlDateTime + // + this.dragControlDateTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.dragControlDateTime.BackColor = System.Drawing.SystemColors.Control; + this.dragControlDateTime.DateTime = new System.DateTime(((long)(0))); + this.dragControlDateTime.DragOrientation = LogExpert.Dialogs.DateTimeDragControl.DragOrientations.Vertical; + this.dragControlDateTime.Font = new System.Drawing.Font("Courier New", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.dragControlDateTime.HoverColor = System.Drawing.Color.LightGray; + this.dragControlDateTime.Location = new System.Drawing.Point(916, 782); + this.dragControlDateTime.Margin = new System.Windows.Forms.Padding(0); + this.dragControlDateTime.MaxDateTime = new System.DateTime(9999, 12, 31, 23, 59, 59, 999); + this.dragControlDateTime.MinDateTime = new System.DateTime(((long)(0))); + this.dragControlDateTime.Name = "dragControlDateTime"; + this.dragControlDateTime.Size = new System.Drawing.Size(282, 31); + this.dragControlDateTime.TabIndex = 14; + this.dragControlDateTime.ValueChanged += new LogExpert.Dialogs.DateTimeDragControl.ValueChangedEventHandler(this.OnDateTimeDragControlValueChanged); + this.dragControlDateTime.ValueDragged += new LogExpert.Dialogs.DateTimeDragControl.ValueDraggedEventHandler(this.OnDateTimeDragControlValueDragged); // // LogTabWindow // @@ -1246,8 +1246,8 @@ private void InitializeComponent() this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1443, 814); - this.Controls.Add(this.followTailCheckBox); - this.Controls.Add(this.dateTimeDragControl); + this.Controls.Add(this.checkBoxFollowTail); + this.Controls.Add(this.dragControlDateTime); this.Controls.Add(this.toolStripContainer); this.Controls.Add(this.statusStrip); this.DoubleBuffered = true; @@ -1284,15 +1284,15 @@ private void InitializeComponent() #endregion private System.Windows.Forms.StatusStrip statusStrip; - private System.Windows.Forms.ToolStripStatusLabel linesLabel; - private System.Windows.Forms.ToolStripStatusLabel sizeLabel; + private System.Windows.Forms.ToolStripStatusLabel labelLines; + private System.Windows.Forms.ToolStripStatusLabel labelSize; private System.Windows.Forms.MenuStrip mainMenuStrip; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem viewNavigateToolStripMenuItem; - private System.Windows.Forms.ToolStripStatusLabel currentLineLabel; + private System.Windows.Forms.ToolStripStatusLabel labelCurrentLine; private System.Windows.Forms.ToolStripProgressBar loadProgessBar; - private System.Windows.Forms.ToolStripStatusLabel statusLabel; + private System.Windows.Forms.ToolStripStatusLabel labelStatus; private System.Windows.Forms.ToolStripMenuItem openToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem; @@ -1324,7 +1324,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem reloadToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem columnizerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; - private DateTimeDragControl dateTimeDragControl; + private DateTimeDragControl dragControlDateTime; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripMenuItem showBookmarkListToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripSeparator8; @@ -1341,7 +1341,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripButton toolStripButtonDown; private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private CheckBox host; - private CheckBox followTailCheckBox; + private CheckBox checkBoxFollowTail; private ToolStripButton toolStripButtonTail; private ToolStripMenuItem showHelpToolStripMenuItem; private ToolStripSeparator toolStripSeparator5; @@ -1363,7 +1363,7 @@ private void InitializeComponent() private ToolStripMenuItem findInExplorerToolStripMenuItem; private ToolStripMenuItem exportBookmarksToolStripMenuItem; private ToolStripSeparator toolStripSeparator17; - private ToolStripComboBox highlightGroupsComboBox; + private ToolStripComboBox groupsComboBoxHighlightGroups; private ToolStripMenuItem debugToolStripMenuItem; private ToolStripMenuItem dumpLogBufferInfoToolStripMenuItem; private ToolStripMenuItem dumpBufferDiagnosticToolStripMenuItem; diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx index d61d7034..dec5097a 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindow.resx @@ -126,9 +126,6 @@ 417, 17 - - 522, 17 - @@ -155,6 +152,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 522, 17 + 248, 17 diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs index 4978ba00..f81fbfb3 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs @@ -371,7 +371,7 @@ private void OnStatusLineEvent(object sender, StatusLineEventArgs e) private void OnFollowTailCheckBoxClick(object sender, EventArgs e) { - CurrentLogWindow?.FollowTailChanged(followTailCheckBox.Checked, false); + CurrentLogWindow?.FollowTailChanged(checkBoxFollowTail.Checked, false); } private void OnLogTabWindowKeyDown(object sender, KeyEventArgs e) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs index abc77ff4..416b086b 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs @@ -563,7 +563,7 @@ private void ChangeCurrentLogWindow(LogWindow.LogWindow newLogWindow) Text = titleName; multiFileToolStripMenuItem.Checked = false; multiFileEnabledStripMenuItem.Checked = false; - followTailCheckBox.Checked = false; + checkBoxFollowTail.Checked = false; mainMenuStrip.Enabled = true; timeshiftToolStripMenuItem.Enabled = false; timeshiftToolStripMenuItem.Checked = false; @@ -606,7 +606,7 @@ private void DisconnectBookmarkWindow(LogWindow.LogWindow logWindow) private void GuiStateUpdateWorker(GuiStateArgs e) { _skipEvents = true; - followTailCheckBox.Checked = e.FollowTail; + checkBoxFollowTail.Checked = e.FollowTail; mainMenuStrip.Enabled = e.MenuEnabled; timeshiftToolStripMenuItem.Enabled = e.TimeshiftPossible; timeshiftToolStripMenuItem.Checked = e.TimeshiftEnabled; From b9858444873a05cce7e99a75f5628f094700b1a2 Mon Sep 17 00:00:00 2001 From: Hirogen Date: Tue, 21 Jun 2022 22:08:36 +0200 Subject: [PATCH 3/3] update rename --- .../LogTabWindow/LogTabWindowEventHandlers.cs | 2 +- .../LogTabWindow/LogTabWindowPrivate.cs | 44 +++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs index f81fbfb3..a3d6a48e 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowEventHandlers.cs @@ -589,7 +589,7 @@ private void OnDateTimeDragControlValueDragged(object sender, EventArgs e) private void OnDateTimeDragControlValueChanged(object sender, EventArgs e) { - CurrentLogWindow?.ScrollToTimestamp(dateTimeDragControl.DateTime, true, true); + CurrentLogWindow?.ScrollToTimestamp(dragControlDateTime.DateTime, true, true); } private void OnLogTabWindowDeactivate(object sender, EventArgs e) diff --git a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs index 416b086b..0f42cf61 100644 --- a/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs +++ b/src/LogExpert/Controls/LogTabWindow/LogTabWindowPrivate.cs @@ -331,7 +331,7 @@ private void ShowHighlightSettingsDialog() dlg.Owner = this; dlg.TopMost = TopMost; dlg.HighlightGroupList = HilightGroupList; - dlg.PreSelectedGroupName = highlightGroupsComboBox.Text; + dlg.PreSelectedGroupName = groupsComboBoxHighlightGroups.Text; DialogResult res = dlg.ShowDialog(); @@ -347,14 +347,14 @@ private void ShowHighlightSettingsDialog() private void FillHighlightComboBox() { - string currentGroupName = highlightGroupsComboBox.Text; - highlightGroupsComboBox.Items.Clear(); + string currentGroupName = groupsComboBoxHighlightGroups.Text; + groupsComboBoxHighlightGroups.Items.Clear(); foreach (HilightGroup group in HilightGroupList) { - highlightGroupsComboBox.Items.Add(group.GroupName); + groupsComboBoxHighlightGroups.Items.Add(group.GroupName); if (group.GroupName.Equals(currentGroupName)) { - highlightGroupsComboBox.Text = group.GroupName; + groupsComboBoxHighlightGroups.Text = group.GroupName; } } } @@ -576,7 +576,7 @@ private void ChangeCurrentLogWindow(LogWindow.LogWindow newLogWindow) searchToolStripMenuItem.Enabled = false; filterToolStripMenuItem.Enabled = false; goToLineToolStripMenuItem.Enabled = false; - dateTimeDragControl.Visible = false; + dragControlDateTime.Visible = false; } } @@ -620,21 +620,21 @@ private void GuiStateUpdateWorker(GuiStateArgs e) if (e.TimeshiftPossible && ConfigManager.Settings.preferences.timestampControl) { - dateTimeDragControl.MinDateTime = e.MinTimestamp; - dateTimeDragControl.MaxDateTime = e.MaxTimestamp; - dateTimeDragControl.DateTime = e.Timestamp; - dateTimeDragControl.Visible = true; - dateTimeDragControl.Enabled = true; - dateTimeDragControl.Refresh(); + dragControlDateTime.MinDateTime = e.MinTimestamp; + dragControlDateTime.MaxDateTime = e.MaxTimestamp; + dragControlDateTime.DateTime = e.Timestamp; + dragControlDateTime.Visible = true; + dragControlDateTime.Enabled = true; + dragControlDateTime.Refresh(); } else { - dateTimeDragControl.Visible = false; - dateTimeDragControl.Enabled = false; + dragControlDateTime.Visible = false; + dragControlDateTime.Enabled = false; } toolStripButtonBubbles.Checked = e.ShowBookmarkBubbles; - highlightGroupsComboBox.Text = e.HighlightGroupName; + groupsComboBoxHighlightGroups.Text = e.HighlightGroupName; columnFinderToolStripMenuItem.Checked = e.ColumnFinderVisible; _skipEvents = false; @@ -703,10 +703,10 @@ private void StatusLineThreadFunc() private void StatusLineEventWorker(StatusLineEventArgs e) { //_logger.logDebug("StatusLineEvent: text = " + e.StatusText); - statusLabel.Text = e.StatusText; - linesLabel.Text = "" + e.LineCount + " lines"; - sizeLabel.Text = Util.GetFileSizeAsText(e.FileSize); - currentLineLabel.Text = "" + e.CurrentLineNum; + labelStatus.Text = e.StatusText; + labelLines.Text = "" + e.LineCount + " lines"; + labelSize.Text = Util.GetFileSizeAsText(e.FileSize); + labelCurrentLine.Text = "" + e.CurrentLineNum; statusStrip.Refresh(); } @@ -809,7 +809,7 @@ private void FileNotFound(LogWindow.LogWindow logWin) { LogWindowData data = logWin.Tag as LogWindowData; BeginInvoke(new SetTabIconDelegate(SetTabIcon), logWin, _deadIcon); - dateTimeDragControl.Visible = false; + dragControlDateTime.Visible = false; } private void FileRespawned(LogWindow.LogWindow logWin) @@ -982,7 +982,7 @@ private void ApplySettings(Settings settings, SettingsFlags flags) if ((flags & SettingsFlags.WindowPosition) == SettingsFlags.WindowPosition) { TopMost = alwaysOnTopToolStripMenuItem.Checked = settings.alwaysOnTop; - dateTimeDragControl.DragOrientation = settings.preferences.timestampControlDragOrientation; + dragControlDateTime.DragOrientation = settings.preferences.timestampControlDragOrientation; hideLineColumnToolStripMenuItem.Checked = settings.hideLineColumn; } @@ -1219,7 +1219,7 @@ private void LoadProject(string projectFileName, bool restoreLayout) private void ApplySelectedHighlightGroup() { - string groupName = highlightGroupsComboBox.Text; + string groupName = groupsComboBoxHighlightGroups.Text; CurrentLogWindow?.SetCurrentHighlightGroup(groupName); }