Merge pull request #227 from Hirogen/consistent-encoding

Consistent encoding
zarunbal · Jun 21, 2022 · 310be23 · 310be23
2 parents 5f94ae7 + b985844
commit 310be23
Show file tree

Hide file tree

Showing 6 changed files with 566 additions and 432 deletions.
diff --git 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;
@@ -112,20 +113,26 @@ 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);
 
             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);
                 buttonToolStrip.Items.Insert(index, host);
             }
 
-            dateTimeDragControl.Visible = false;
+            dragControlDateTime.Visible = false;
             loadProgessBar.Visible = false;
 
             // get a reference to the current assembly