Merge branch 'dev' - v2.5

Changes:

Functionality:
- Middle mouse - drag the canvas
- Straight line painting (hold Shift / Ctrl)
- A button to Copy from Test font dialog to then paste into another frame

Bugs fixed:
- Nothing selected after removing a symbol. Potential error throw on "Apply"

.gitignore

@@ -5,6 +5,7 @@
 ## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
 
 examples/tests/32x32/
+examples/tests/PNGout/
 
 # User-specific files
 *.rsuser

McBitFont/About.Designer.cs

@@ -124,7 +124,7 @@
             MinimizeBox = false;
             Name = "About";
             ShowInTaskbar = false;
-            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             Text = "About McBitFont";
             Load += About_Load;
             ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();

McBitFont/CanvasHistory.cs

@@ -1,85 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-
-namespace McBitFont {
-    internal class CanvasHistory {
-        private List<bool[,]> stack;
-        public int Depth { get; set; }
-        public int Index { get; set; }
-        public int Count {
-            get { return stack.Count - 1; }
-        }
-        public int Redos {
-            get {
-                var r = Count - Index - 1;
-
-                return r < 0 ? 0 : r;
-            }
-        }
-        public int Undos {
-            get {
-                return Index + 1;
-            }
-        }
-
-        
-        public CanvasHistory(int depth = 50) {
-            Depth = depth;
-            Index = -1;
-            stack = [];
-        }
-
-        public void Clear() {
-            stack.Clear();
-            Index = -1;
-        }
-
-        public void AddPre(MainForm.FrameMiniature f, bool useIndex = true) {
-            if (Count < 0) stack.Add(new bool[f.width, f.height]);
-            if (Index < Count - 1) {
-                stack.RemoveRange(Index + 1, Count - Index - 1);
-            }
-            bool[,] d = new bool[f.width, f.height];
-            Array.Copy(f.data, d, f.data.Length);
-            stack.Insert(Count, d);
-            if (useIndex) {
-                if (Count > Depth) stack.RemoveAt(0);
-                else Index++;
-            }
-        }
-
-        public void AddPost(MainForm.FrameMiniature f) {
-            var d = stack.ElementAt(Count);
-            Array.Copy(f.data, d, f.data.Length);
-        }
-
-        public void ApplyAdded() {
-            while (Count > Depth) stack.RemoveAt(0);
-            Index = Count - 1;
-        }
-
-        public void Remove(bool useIndex = true) {
-            stack.RemoveAt(Count - 1);
-            if (useIndex) Index--;
-        }
-
-        public void Undo(MainForm.FrameMiniature f) {
-            if (Index < 0) return;
-            var d = stack.ElementAt(Index);
-            Array.Copy(d, f.data, d.Length);
-            Index--;
-        }
-
-        public void Redo(MainForm.FrameMiniature f) {
-            if (Index >= Count - 1) return;
-            Index++;
-            var d = stack.ElementAt(Index + 1);
-            Array.Copy(d, f.data, d.Length);
-        }
-    }
-}

McBitFont/ChangeHistory.cs

@@ -0,0 +1,304 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms;
+using static McBitFont.MainForm;
+
+namespace McBitFont {
+    internal class ChangeHistory {
+        private MainForm mainForm;
+        private List<ChangeEvent> timeline = [];
+        private List<FrameMiniature> canvasChanges = [];
+        private List<List<FrameMiniature>> fontChanges = [];
+        private List<int> selectionChanges = [];
+        private int canvasIndex = 0;
+        private int fontIndex = 0;
+        private int selectionIndex = 0;
+        public int Depth { get; set; }
+        public int Index { get; set; } = -1;
+        public int Count {
+            get { return timeline.Count; }
+        }
+        public int Undos {
+            get { return Index < 0 ? 0 : Index + 1; }
+        }
+        public int Redos {
+            get { return Index < 0 ? Count : Count - Index - 1; }
+        }
+        public bool Doing { get; set; } = false;
+
+        // Constructor
+        public ChangeHistory(MainForm form, int depth = 100) {
+            timeline = [];
+            canvasChanges = [];
+            fontChanges = [];
+            selectionChanges = [];
+            mainForm = form;
+            Depth = depth;
+            ResetIndices();
+            Add();
+            Doing = false;
+        }
+
+
+
+        private void ResetIndices() {
+            Index = -1;
+            canvasIndex = 0;
+            fontIndex = 0;
+            selectionIndex = 0;
+        }
+
+        public enum ChangeType {
+            None   = 0,
+            Canvas = 1,     // Changes made to canvas
+            Font   = 2,     // Symbol width has been changed
+            Selection  = 3  // Selected another frame
+        }
+
+        public class ChangeEvent(ChangeType type, FrameMiniature? canvas = null) {
+            public ChangeType Type { get; set; } = type;
+            public FrameMiniature? Canvas { get; set; } = canvas;
+        }
+
+        public static FrameMiniature CopyFrameSimple(FrameMiniature f) {
+            FrameMiniature newf = new(f.code, f.width, f.height);
+            Array.Copy(f.data, newf.data, f.data.Length);
+            return newf;
+        }
+
+        public void Clear() {
+            timeline.Clear();
+            canvasChanges.Clear();
+            fontChanges.Clear();
+            selectionChanges.Clear();
+            ResetIndices();
+            Add();
+        }
+
+        // Remove from a proper list by change type
+        private bool RemoveByType(ChangeEvent ce, bool first = true) {
+            switch (ce.Type) {
+                case ChangeType.Canvas:
+                    if (canvasChanges.Count <= 1) return false;
+                    if ((first && canvasIndex > 0) || (!first && canvasIndex == canvasChanges.Count - 1)) canvasIndex--;
+                    canvasChanges.RemoveAt(first ? 0 : canvasChanges.Count - 1);
+                    break;
+                case ChangeType.Font:
+                    if (fontChanges.Count <= 1) return false;
+                    if ((first && fontIndex > 0) || (!first && fontIndex == fontChanges.Count - 1)) fontIndex--;
+                    if (ce.Canvas != null) {
+                        if ((first && canvasIndex > 0) || (!first && canvasIndex == canvasChanges.Count - 1)) canvasIndex--;
+                        canvasChanges.Remove((FrameMiniature)ce.Canvas);
+                    }
+                    fontChanges.RemoveAt(first ? 0 : fontChanges.Count - 1);
+                    break;
+                case ChangeType.Selection:
+                    if (selectionChanges.Count <= 1) return false;
+                    if ((first && selectionIndex > 0) || (!first && selectionIndex == selectionChanges.Count - 1)) selectionIndex--;
+                    if (ce.Canvas != null) {
+                        if ((first && canvasIndex > 0) || (!first && canvasIndex == canvasChanges.Count - 1)) canvasIndex--;
+                        canvasChanges.Remove((FrameMiniature)ce.Canvas);
+                    }
+                    selectionChanges.RemoveAt(first ? 0 : selectionChanges.Count - 1);
+                    break;
+                default:
+                    return false;
+            }
+            if ((first && Index > 0) || (!first && Index == Count - 1) || Count == 1) Index--;
+            timeline.RemoveAt(first ? 0 : Count - 1);
+            
+
+            return true;
+        }
+
+        // Remove oldest event
+        private bool RemoveOldest() {
+            if (Count == 0) return false;
+            ChangeEvent ce = timeline.First();
+            RemoveByType(ce);
+
+            return true;
+        }
+
+        // Remove last event
+        public bool RemoveLast() {
+            if (Count == 0) return false;
+            var ce = timeline.Last();
+            RemoveByType(ce, false);
+
+            return true;
+        }
+
+        // Remove history tail
+        private void TruncateTail() {
+            // Check if the Index does not point to the last event
+            //while (Index < Count - 1) Remove
+            if (Index >= -1 && Index < Count - 1) {
+                timeline.RemoveRange(       Index + 1,         Count                 - Index - 1);
+                canvasChanges.RemoveRange(  canvasIndex + 1,   canvasChanges.Count   - canvasIndex - 1);
+                fontChanges.RemoveRange(    fontIndex + 1,     fontChanges.Count     - fontIndex - 1);
+                selectionChanges.RemoveRange(selectionIndex + 1, selectionChanges.Count - selectionIndex - 1);
+            }
+        }
+
+        // Add first states to all lists
+        private void Add() {
+            Add(mainForm.f, false);
+            Add(mainForm.frames, false);
+            var fff = mainForm.f;   // Marshal-by-reference warning workaround
+            int ccс = fff.code;     //
+            Add(ccс, false);
+        }
+
+        // Add canvas change
+        public FrameMiniature? Add(FrameMiniature f, bool useIndex = true) {
+            if (Doing) return null ;
+            TruncateTail();
+
+            if (Count >= Depth) RemoveOldest();
+            canvasChanges.Add(CopyFrameSimple(f));
+            if (useIndex) {
+                timeline.Add(new ChangeEvent(ChangeType.Canvas));
+                Index++;
+                canvasIndex++;
+            }
+            return canvasChanges.Last();
+        }
+
+        // Add Font change
+        public void Add(List<FrameMiniature> ff, bool useIndex = true) {
+            if (Doing) return;
+            TruncateTail();
+
+            var l = new List<FrameMiniature>();
+            foreach (var f in ff) {
+                l.Add(CopyFrameSimple(f));
+            }
+
+            if (Count >= Depth) RemoveOldest();
+            fontChanges.Add(l);
+            if (useIndex) {
+                var canv = Add(mainForm.f, false);
+                canvasIndex++;
+                timeline.Add(new ChangeEvent(ChangeType.Font, canv));
+                Index++;
+                fontIndex++;
+            }
+        }
+
+        // Add Frame selection change
+        public void Add(int code, bool useIndex = true) {
+            if (Doing) return;
+            TruncateTail();
+
+            if (Count >= Depth) RemoveOldest();
+            selectionChanges.Add(code);
+            if (useIndex) {
+                var canv = Add(mainForm.f, false);
+                canvasIndex++;
+                timeline.Add(new ChangeEvent(ChangeType.Selection, canv));
+                Index++;
+                selectionIndex++;
+            }
+
+        }
+
+        private void Do(bool undo = true) {
+            if (!undo && Index >= Count - 1) return;
+            Doing = true;
+            var ce = timeline.ElementAt(Index + (undo ? 0 : 1));
+            int dIndex = undo ? -1 : 1;
+            FrameMiniature fff;
+            switch (ce.Type) {
+                case ChangeType.Canvas:
+                    canvasIndex += dIndex;
+                    mainForm.f = CopyFrameSimple(canvasChanges[canvasIndex]);
+                    mainForm.SetModified();
+                    mainForm.nudX.ValueChanged -= mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged -= mainForm.nudY_ValueChanged;
+                    mainForm.nudY.Value = mainForm.dotHeight = canvasChanges[canvasIndex].height;
+                    mainForm.nudX.Value = mainForm.dotWidth = canvasChanges[canvasIndex].width;
+                    mainForm.SetNewWH();
+                    mainForm.nudX.ValueChanged += mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged += mainForm.nudY_ValueChanged;
+                    break;
+                case ChangeType.Font:
+                    Cursor.Current = Cursors.WaitCursor;
+                    string selItem = "";
+                    int selCode = 0;
+                    if (mainForm.miniList.SelectedItems.Count > 0) {
+                        selItem = mainForm.miniList.SelectedItems[0].Name;
+                        selCode = Convert.ToInt32(selItem);
+                    }
+                    fontIndex += dIndex;
+                    canvasIndex += dIndex;
+                    mainForm.frames.Clear();
+                    mainForm.miniList.Clear();
+                    mainForm.ilMiniatures.Images.Clear();
+                    foreach (var f in fontChanges[fontIndex]) {
+                        mainForm.frames.Add(CopyFrameSimple(f));
+                    }
+                    mainForm.FillFrameLists();
+                    
+                    if (selItem != "") {
+                        var selection = mainForm.miniList.Items.Find(selItem, false);
+                        if (selection.Length > 0) selection[0].Selected = true;
+                        fff = mainForm.frames.Find(x => x.code == selCode);
+                    } else {
+                        mainForm.miniList.Items[0].Selected = true;
+                        fff = mainForm.frames[0];
+                    }
+                    mainForm.f = mainForm.CopyFrame(fff);
+                    mainForm.nudX.ValueChanged -= mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged -= mainForm.nudY_ValueChanged;
+                    mainForm.nudY.Value = mainForm.dotHeight = fff.height;
+                    mainForm.nudX.Value = mainForm.dotWidth = fff.width;
+                    mainForm.SetNewWH();
+                    mainForm.nudX.ValueChanged += mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged += mainForm.nudY_ValueChanged;
+                    
+                    Cursor.Current = Cursors.Default;
+                    break;
+                case ChangeType.Selection:
+                    selectionIndex += dIndex;
+                    canvasIndex += dIndex;
+                    var s = selectionChanges[selectionIndex].ToString().PadLeft(3, '0');
+                    var sel = mainForm.miniList.Items.Find(s, false);
+                    if (sel.Length > 0) sel[0].Selected = true;
+                    fff = mainForm.frames.Find(x => x.code == selectionChanges[selectionIndex]);
+                    mainForm.f = CopyFrameSimple(fff);
+                    mainForm.nudX.ValueChanged -= mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged -= mainForm.nudY_ValueChanged;
+                    mainForm.nudY.Value = mainForm.dotHeight = fff.height;
+                    mainForm.nudX.Value = mainForm.dotWidth = fff.width;
+                    mainForm.SetNewWH();
+                    mainForm.nudX.ValueChanged += mainForm.nudX_ValueChanged;
+                    mainForm.nudY.ValueChanged += mainForm.nudY_ValueChanged;
+                    break;
+                default:
+                    break;
+            }
+            Index += dIndex;
+            Doing = false;
+           
+        }
+
+        // Undo last change
+        public bool Undo() {
+            if (Undos < 1) return false;
+            Do();
+
+            return true;
+        }
+
+        // Redo last ondone change
+        public bool Redo() {
+            if (Redos < 1) return false;
+            Do(false);
+
+            return true;
+        }
+
+    }
+}

McBitFont/CodeShift.Designer.cs

@@ -164,7 +164,7 @@
             Name = "CodeShift";
             ShowIcon = false;
             ShowInTaskbar = false;
-            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             Text = "Code Shift";
             Load += CodeShift_Load;
             ((System.ComponentModel.ISupportInitialize)nudValue).EndInit();

McBitFont/Export.Designer.cs

@@ -343,7 +343,7 @@
             Name = "Export";
             ShowIcon = false;
             ShowInTaskbar = false;
-            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             Text = "Export";
             Load += Export_Load;
             gbScan.ResumeLayout(false);

McBitFont/Export.cs

@@ -233,7 +233,7 @@ namespace McBitFont {
                 if (com && lines != 1 && fcount > 1) {
                     // Comments enabled and other than "1 symbol per line" selected
                     // Print a symbol comment before its data
-                    output += "  // " + f.code.ToString() + " --> " + mainForm.decodeSymbol(f.code) + "\n";
+                    output += "  // " + f.code.ToString() + " --> " + mainForm.DecodeSymbol(f.code) + "\n";
                 }
                 if (lines == 1) {
                     // "1 symbol per line" - new line offset
@@ -369,7 +369,7 @@ namespace McBitFont {
                     if (!f.Equals(flast) && f.width > 0) output += ",";
                     if (com && fcount > 1) {
                         //...with a comment
-                        output += " // " + f.code.ToString() + " --> " + mainForm.decodeSymbol(f.code);
+                        output += " // " + f.code.ToString() + " --> " + mainForm.DecodeSymbol(f.code);
                     }
                     output += "\n";
                 }

McBitFont/FontTester.Designer.cs

@@ -0,0 +1,216 @@
+namespace McBitFont {
+    partial class FontTester {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            components = new System.ComponentModel.Container();
+            lblSpace = new System.Windows.Forms.Label();
+            nudSpace = new System.Windows.Forms.NumericUpDown();
+            lblText = new System.Windows.Forms.Label();
+            tbText = new System.Windows.Forms.TextBox();
+            dotPanel = new System.Windows.Forms.Panel();
+            vScroll = new System.Windows.Forms.VScrollBar();
+            hScroll = new System.Windows.Forms.HScrollBar();
+            lblZoom = new System.Windows.Forms.Label();
+            cbZoom = new System.Windows.Forms.ComboBox();
+            toolTip1 = new System.Windows.Forms.ToolTip(components);
+            btnCopy = new System.Windows.Forms.Button();
+            chkBaseline = new System.Windows.Forms.CheckBox();
+            ((System.ComponentModel.ISupportInitialize)nudSpace).BeginInit();
+            SuspendLayout();
+            // 
+            // lblSpace
+            // 
+            lblSpace.AutoSize = true;
+            lblSpace.Location = new System.Drawing.Point(12, 9);
+            lblSpace.Name = "lblSpace";
+            lblSpace.Size = new System.Drawing.Size(41, 15);
+            lblSpace.TabIndex = 0;
+            lblSpace.Text = "Space:";
+            // 
+            // nudSpace
+            // 
+            nudSpace.Location = new System.Drawing.Point(59, 6);
+            nudSpace.Maximum = new decimal(new int[] { 255, 0, 0, 0 });
+            nudSpace.Name = "nudSpace";
+            nudSpace.Size = new System.Drawing.Size(40, 23);
+            nudSpace.TabIndex = 1;
+            toolTip1.SetToolTip(nudSpace, "Space between symbols in pixels");
+            nudSpace.Value = new decimal(new int[] { 1, 0, 0, 0 });
+            nudSpace.ValueChanged += Scrolling;
+            // 
+            // lblText
+            // 
+            lblText.AutoSize = true;
+            lblText.Location = new System.Drawing.Point(12, 37);
+            lblText.Name = "lblText";
+            lblText.Size = new System.Drawing.Size(138, 15);
+            lblText.TabIndex = 2;
+            lblText.Text = "Text to test the font with:";
+            // 
+            // tbText
+            // 
+            tbText.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            tbText.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204);
+            tbText.Location = new System.Drawing.Point(12, 55);
+            tbText.Name = "tbText";
+            tbText.Size = new System.Drawing.Size(260, 29);
+            tbText.TabIndex = 3;
+            toolTip1.SetToolTip(tbText, "Text to test the font with");
+            tbText.TextChanged += Text_Changed;
+            // 
+            // dotPanel
+            // 
+            dotPanel.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            dotPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            dotPanel.BackColor = System.Drawing.Color.White;
+            dotPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            dotPanel.Location = new System.Drawing.Point(12, 90);
+            dotPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            dotPanel.Name = "dotPanel";
+            dotPanel.Size = new System.Drawing.Size(238, 98);
+            dotPanel.TabIndex = 4;
+            dotPanel.Paint += PaintPixels;
+            dotPanel.Resize += ZoomChanged;
+            // 
+            // vScroll
+            // 
+            vScroll.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
+            vScroll.LargeChange = 25;
+            vScroll.Location = new System.Drawing.Point(251, 84);
+            vScroll.Name = "vScroll";
+            vScroll.Size = new System.Drawing.Size(21, 104);
+            vScroll.TabIndex = 17;
+            vScroll.ValueChanged += Scrolling;
+            // 
+            // hScroll
+            // 
+            hScroll.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            hScroll.Location = new System.Drawing.Point(12, 188);
+            hScroll.Name = "hScroll";
+            hScroll.Size = new System.Drawing.Size(238, 21);
+            hScroll.TabIndex = 16;
+            hScroll.ValueChanged += Scrolling;
+            // 
+            // lblZoom
+            // 
+            lblZoom.AutoSize = true;
+            lblZoom.Location = new System.Drawing.Point(173, 9);
+            lblZoom.Name = "lblZoom";
+            lblZoom.Size = new System.Drawing.Size(42, 15);
+            lblZoom.TabIndex = 18;
+            lblZoom.Text = "Zoom:";
+            // 
+            // cbZoom
+            // 
+            cbZoom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            cbZoom.FormattingEnabled = true;
+            cbZoom.Items.AddRange(new object[] { "2", "3", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50" });
+            cbZoom.Location = new System.Drawing.Point(222, 6);
+            cbZoom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            cbZoom.Name = "cbZoom";
+            cbZoom.Size = new System.Drawing.Size(50, 23);
+            cbZoom.TabIndex = 19;
+            cbZoom.TabStop = false;
+            toolTip1.SetToolTip(cbZoom, "Zoom level");
+            cbZoom.SelectedIndexChanged += ZoomChanged;
+            // 
+            // toolTip1
+            // 
+            toolTip1.AutoPopDelay = 10000;
+            toolTip1.InitialDelay = 500;
+            toolTip1.ReshowDelay = 100;
+            // 
+            // btnCopy
+            // 
+            btnCopy.Anchor = System.Windows.Forms.AnchorStyles.Bottom;
+            btnCopy.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16;
+            btnCopy.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
+            btnCopy.Location = new System.Drawing.Point(110, 214);
+            btnCopy.Name = "btnCopy";
+            btnCopy.Size = new System.Drawing.Size(80, 30);
+            btnCopy.TabIndex = 21;
+            btnCopy.Text = " Copy";
+            btnCopy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
+            toolTip1.SetToolTip(btnCopy, "Copy BitPixels you see to Clipboard");
+            btnCopy.UseVisualStyleBackColor = true;
+            btnCopy.MouseClick += Copy_Click;
+            // 
+            // chkBaseline
+            // 
+            chkBaseline.AutoSize = true;
+            chkBaseline.Location = new System.Drawing.Point(203, 36);
+            chkBaseline.Name = "chkBaseline";
+            chkBaseline.Size = new System.Drawing.Size(69, 19);
+            chkBaseline.TabIndex = 20;
+            chkBaseline.Text = "Baseline";
+            chkBaseline.UseVisualStyleBackColor = true;
+            chkBaseline.CheckedChanged += Scrolling;
+            // 
+            // FontTester
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            ClientSize = new System.Drawing.Size(284, 251);
+            Controls.Add(btnCopy);
+            Controls.Add(chkBaseline);
+            Controls.Add(cbZoom);
+            Controls.Add(lblZoom);
+            Controls.Add(vScroll);
+            Controls.Add(hScroll);
+            Controls.Add(dotPanel);
+            Controls.Add(tbText);
+            Controls.Add(lblText);
+            Controls.Add(nudSpace);
+            Controls.Add(lblSpace);
+            MaximizeBox = false;
+            MinimizeBox = false;
+            MinimumSize = new System.Drawing.Size(300, 290);
+            Name = "FontTester";
+            ShowIcon = false;
+            ShowInTaskbar = false;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            Text = "Font Tester";
+            Load += FontTester_Load;
+            Resize += Form_Resize;
+            ((System.ComponentModel.ISupportInitialize)nudSpace).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label lblSpace;
+        private System.Windows.Forms.NumericUpDown nudSpace;
+        private System.Windows.Forms.Label lblText;
+        private System.Windows.Forms.TextBox tbText;
+        private System.Windows.Forms.Panel dotPanel;
+        private System.Windows.Forms.VScrollBar vScroll;
+        private System.Windows.Forms.HScrollBar hScroll;
+        private System.Windows.Forms.Label lblZoom;
+        private System.Windows.Forms.ToolTip toolTip1;
+        private System.Windows.Forms.ComboBox cbZoom;
+        private System.Windows.Forms.CheckBox chkBaseline;
+        private System.Windows.Forms.Button btnCopy;
+    }
+}

McBitFont/FontTester.cs

@@ -0,0 +1,205 @@
+using MessagePack;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace McBitFont {
+    public partial class FontTester : Form {
+
+        private int codepage = 1251;
+        private int height;
+        private List<MainForm.FrameMiniature> frames;
+        private int baseline;
+        private readonly int absentWidth = 5;
+        private readonly int pixelOffset = 5;
+
+        private int baselineThickness = 1;
+        private byte[] encoded = [];
+        private int cellSize;
+        private int width;
+
+        private readonly DataFormats.Format clpbFormat = DataFormats.GetFormat("McBitFontFrame");
+
+        public FontTester(int codepage, int height, int baseline, List<MainForm.FrameMiniature> frames) {
+            InitializeComponent();
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+            this.codepage = codepage;
+            this.height = height;
+            this.baseline = baseline;
+            this.frames = frames;
+        }
+
+        private void FontTester_Load(object sender, EventArgs e) {
+            cbZoom.SelectedIndex = 2;
+            //cbZoom.SelectedIndexChanged += ZoomChanged;
+            dotPanel.MouseWheel += new MouseEventHandler(DotPanel_MouseWheel);
+        }
+
+        private void PaintPixels(object sender, PaintEventArgs e) {
+            Graphics g = dotPanel.CreateGraphics();
+            SolidBrush sbb = new SolidBrush(Color.Black);
+            SolidBrush sbw = new SolidBrush(Color.White);
+            SolidBrush sbp = new SolidBrush(Color.LightPink);
+            SolidBrush sb;
+            Pen blackPen = new(Color.Black);
+            Pen bluePen = new(Color.FromArgb(100, 20, 20, 200), baselineThickness);
+            int x, y, i, j;
+
+            // Sycle through ecoded bytes of test text
+            int space = (int)nudSpace.Value;
+            int index = 0;
+            for (int c = 0; c < encoded.Length; c++) {
+                // Check if we have such symbol
+                var f = frames.FindAll(x => x.code == encoded[c]);
+                if (f.Count == 1) {
+                    // Draw the symbol
+                    for (i = 0; i < f[0].width; i++) {
+                        x = pixelOffset + (index + i) * cellSize - hScroll.Value;
+                        for (j = 0; j < f[0].height; j++) {
+                            y = pixelOffset + j * cellSize - vScroll.Value;
+                            // Fill the cell with color
+                            if (f[0].data[i, j]) sb = sbb;
+                            else sb = sbw;
+                            g.FillRectangle(sb, x, y, cellSize, cellSize);
+                        }
+                    }
+                    index += (f[0].width > 0 ? f[0].width + space : 0);
+                } else {
+                    blackPen.Width = cellSize;
+                    blackPen.Alignment = System.Drawing.Drawing2D.PenAlignment.Inset;
+                    x = pixelOffset + index * cellSize - hScroll.Value;
+                    y = pixelOffset - vScroll.Value;
+                    g.DrawRectangle(blackPen, x, y + cellSize, absentWidth * cellSize, (height - 2) * cellSize);
+                    g.FillRectangle(sbp, x + cellSize, y + 2 * cellSize, (absentWidth - 2) * cellSize, (height - 4) * cellSize);
+                    index += 5 + space;
+                }
+            }
+
+            // Draw baseline
+            if (chkBaseline.Checked && baseline > 0) {
+                x = pixelOffset - hScroll.Value;
+                y = pixelOffset + baseline * cellSize - vScroll.Value;
+                g.DrawLine(bluePen, x, y, dotPanel.Width - 2 * pixelOffset, y);
+            }
+        }
+
+        private void Text_Changed(object sender, EventArgs e) {
+            int space = (int)nudSpace.Value;
+
+            encoded = Encoding.GetEncoding(codepage).GetBytes(tbText.Text);
+
+            width = space > 0 ? space : 1;
+            for (int c = 0; c < encoded.Length; c++) {
+                var f = frames.FindAll(x => x.code == encoded[c]);
+                width += (f.Count == 1 ? f[0].width : absentWidth) + space;
+            }
+            dotPanel.Invalidate();
+        }
+
+        private void ZoomChanged(object sender, EventArgs e) {
+            cellSize = Convert.ToInt32(cbZoom.Text);
+
+            int w = pixelOffset + width * cellSize;
+            int h = pixelOffset + height * cellSize;
+
+            if (w <= dotPanel.Width) {
+                hScroll.Enabled = false;
+                hScroll.Value = 0;
+            } else {
+                hScroll.Maximum = w - dotPanel.Width + 12;
+                hScroll.Minimum = 0;
+                hScroll.Enabled = true;
+            }
+
+            if (h <= dotPanel.Height) {
+                vScroll.Enabled = false;
+                vScroll.Value = 0;
+            } else {
+                vScroll.Maximum = h - dotPanel.Height + 12;
+                vScroll.Minimum = 0;
+                vScroll.Enabled = true;
+            }
+
+            // Baseline thickness calc
+            baselineThickness = cellSize / 5;
+            if (baselineThickness > 5) baselineThickness = 5;
+            if (baselineThickness < 1) baselineThickness = 1;
+
+            dotPanel.Refresh();
+        }
+
+        private void DotPanel_MouseWheel(object sender, MouseEventArgs e) {
+            int t = e.Delta / 120;
+            if (e.Delta == 0) return;
+            if (ModifierKeys.HasFlag(Keys.Control)) {
+                t += cbZoom.SelectedIndex;
+                if (t > cbZoom.Items.Count - 1) return;
+                if (t < 0) return;
+                cbZoom.SelectedIndex = t;
+            } else if (ModifierKeys.HasFlag(Keys.Shift)) {
+                if (hScroll.Enabled) {
+                    t = t * -1 * cellSize + hScroll.Value;
+                    if (t < hScroll.Minimum) t = hScroll.Minimum;
+                    if (t > hScroll.Maximum) t = hScroll.Maximum;
+                    hScroll.Value = t;
+                }
+            } else {
+                if (vScroll.Enabled) {
+                    t = t * -1 * cellSize + vScroll.Value;
+                    if (t < vScroll.Minimum) t = vScroll.Minimum;
+                    if (t > vScroll.Maximum) t = vScroll.Maximum;
+                    vScroll.Value = t;
+                }
+            }
+        }
+
+        private void Scrolling(object sender, EventArgs e) {
+            dotPanel.Invalidate();
+        }
+
+        private void Form_Resize(object sender, EventArgs e) {
+            btnCopy.Left = this.Width / 2 - 40;
+        }
+
+        private void Copy_Click(object sender, MouseEventArgs e) {
+            if (encoded.Length < 1) {
+                MessageBox.Show("Nothing to copy! Type some symbols first.", "Error!", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            // Sycle through ecoded bytes of test text
+            int space = (int)nudSpace.Value;
+            int index = 0;
+            int i, j;
+            MainForm.FrameMiniature ff = new(0, width, frames[0].height);
+            for (int c = 0; c < encoded.Length; c++) {
+                // Check if we have such symbol
+                var f = frames.FindAll(x => x.code == encoded[c]);
+                if (f.Count == 1) {
+                    // Draw the symbol
+                    for (i = 0; i < f[0].width; i++) {
+                        for (j = 0; j < f[0].height; j++) {
+                            // Fill the frame with data
+                            ff.data[index + i, j] = f[0].data[i, j];
+                        }
+                    }
+                    index += (f[0].width > 0 ? f[0].width + space : 0);
+                } else {
+                    index += 5 + space;
+                }
+            }
+            // Copy the frame we made into Clipboard
+            var bb = MessagePackSerializer.Serialize(ChangeHistory.CopyFrameSimple(ff));
+            DataObject clpbObj = new DataObject(clpbFormat.Name, bb);
+            Clipboard.SetDataObject(clpbObj, true);
+        }
+    }
+
+
+}

McBitFont/FontTester.resx

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>

McBitFont/Form1.Designer.cs

@@ -64,9 +64,12 @@
             openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             importTextToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
             importImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            exportFontLayoutPNGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,6 +77,7 @@
             copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             makeVarWidthToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -82,6 +86,8 @@
             removeBeforeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             removeAfterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             CodeShiftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
+            testFontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             canvasToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             ClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             FillToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -103,6 +109,10 @@
             chkHexCodes = new System.Windows.Forms.CheckBox();
             chkRectSelect = new System.Windows.Forms.CheckBox();
             label3 = new System.Windows.Forms.Label();
+            lblSelectionLabel = new System.Windows.Forms.Label();
+            lblSelection = new System.Windows.Forms.Label();
+            lblModified = new System.Windows.Forms.Label();
+            dlgSavePNG = new System.Windows.Forms.SaveFileDialog();
             ((System.ComponentModel.ISupportInitialize)nudX).BeginInit();
             ((System.ComponentModel.ISupportInitialize)nudY).BeginInit();
             panel1.SuspendLayout();
@@ -360,7 +370,7 @@
             btnExport.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
             toolTip1.SetToolTip(btnExport, "Configure and export data");
             btnExport.UseVisualStyleBackColor = true;
-            btnExport.Click += button1_Click;
+            btnExport.Click += Export_Click;
             // 
             // miniList
             // 
@@ -483,7 +493,10 @@
             // hScroll
             // 
             hScroll.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right;
+            hScroll.Enabled = false;
+            hScroll.LargeChange = 2;
             hScroll.Location = new System.Drawing.Point(14, 609);
+            hScroll.Maximum = 1;
             hScroll.Name = "hScroll";
             hScroll.Size = new System.Drawing.Size(427, 21);
             hScroll.TabIndex = 14;
@@ -492,8 +505,10 @@
             // vScroll
             // 
             vScroll.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right;
-            vScroll.LargeChange = 25;
+            vScroll.Enabled = false;
+            vScroll.LargeChange = 2;
             vScroll.Location = new System.Drawing.Point(444, 31);
+            vScroll.Maximum = 1;
             vScroll.Name = "vScroll";
             vScroll.Size = new System.Drawing.Size(21, 575);
             vScroll.TabIndex = 15;
@@ -523,7 +538,7 @@
             // 
             // fileToolStripMenuItem
             // 
-            fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, importTextToolStripMenuItem1, importImageToolStripMenuItem, exportToolStripMenuItem, exitToolStripMenuItem });
+            fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, toolStripSeparator1, importTextToolStripMenuItem1, importImageToolStripMenuItem, exportToolStripMenuItem, exportFontLayoutPNGToolStripMenuItem, toolStripSeparator2, exitToolStripMenuItem });
             fileToolStripMenuItem.Name = "fileToolStripMenuItem";
             fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
             fileToolStripMenuItem.Text = "File";
@@ -572,12 +587,18 @@
             saveAsToolStripMenuItem.ToolTipText = "Save changes to another file";
             saveAsToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
             // 
+            // toolStripSeparator1
+            // 
+            toolStripSeparator1.Name = "toolStripSeparator1";
+            toolStripSeparator1.Size = new System.Drawing.Size(221, 6);
+            // 
             // importTextToolStripMenuItem1
             // 
             importTextToolStripMenuItem1.Image = Properties.Resources.folder_table;
             importTextToolStripMenuItem1.Name = "importTextToolStripMenuItem1";
             importTextToolStripMenuItem1.Size = new System.Drawing.Size(224, 22);
             importTextToolStripMenuItem1.Text = "Import text file (very limited)";
+            importTextToolStripMenuItem1.ToolTipText = "Import a font from a C array in a file";
             importTextToolStripMenuItem1.Click += importTextToolStripMenuItem1_Click;
             // 
             // importImageToolStripMenuItem
@@ -598,7 +619,21 @@
             exportToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
             exportToolStripMenuItem.Text = "Export";
             exportToolStripMenuItem.ToolTipText = "Configure and export data";
-            exportToolStripMenuItem.Click += button1_Click;
+            exportToolStripMenuItem.Click += Export_Click;
+            // 
+            // exportFontLayoutPNGToolStripMenuItem
+            // 
+            exportFontLayoutPNGToolStripMenuItem.Image = Properties.Resources.picture_go;
+            exportFontLayoutPNGToolStripMenuItem.Name = "exportFontLayoutPNGToolStripMenuItem";
+            exportFontLayoutPNGToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
+            exportFontLayoutPNGToolStripMenuItem.Text = "Export font layout PNG";
+            exportFontLayoutPNGToolStripMenuItem.ToolTipText = "Create an image with all a table showing all 256 symbols";
+            exportFontLayoutPNGToolStripMenuItem.Click += ExportPNG;
+            // 
+            // toolStripSeparator2
+            // 
+            toolStripSeparator2.Name = "toolStripSeparator2";
+            toolStripSeparator2.Size = new System.Drawing.Size(221, 6);
             // 
             // exitToolStripMenuItem
             // 
@@ -613,7 +648,7 @@
             // 
             // editToolStripMenuItem
             // 
-            editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem, selectToolStripMenuItem });
+            editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem, selectToolStripMenuItem, selectAllToolStripMenuItem });
             editToolStripMenuItem.Name = "editToolStripMenuItem";
             editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
             editToolStripMenuItem.Text = "Edit";
@@ -624,7 +659,7 @@
             undoToolStripMenuItem.Image = Properties.Resources.arrow_undo;
             undoToolStripMenuItem.Name = "undoToolStripMenuItem";
             undoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z;
-            undoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            undoToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
             undoToolStripMenuItem.Text = "Undo";
             undoToolStripMenuItem.ToolTipText = "Undo last canvas change";
             undoToolStripMenuItem.Click += undoToolStripMenuItem_Click;
@@ -634,31 +669,29 @@
             redoToolStripMenuItem.Image = Properties.Resources.arrow_redo;
             redoToolStripMenuItem.Name = "redoToolStripMenuItem";
             redoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y;
-            redoToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            redoToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
             redoToolStripMenuItem.Text = "Redo";
             redoToolStripMenuItem.ToolTipText = "Redo canvas change";
             redoToolStripMenuItem.Click += redoToolStripMenuItem_Click;
             // 
             // copyToolStripMenuItem
             // 
-            copyToolStripMenuItem.Enabled = false;
             copyToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16;
             copyToolStripMenuItem.Name = "copyToolStripMenuItem";
             copyToolStripMenuItem.ShortcutKeyDisplayString = "";
             copyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C;
-            copyToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            copyToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
             copyToolStripMenuItem.Text = "Copy";
             copyToolStripMenuItem.ToolTipText = "Copy current symbol to clipboard";
             copyToolStripMenuItem.Click += copyToolStripMenuItem_Click;
             // 
             // pasteToolStripMenuItem
             // 
-            pasteToolStripMenuItem.Enabled = false;
             pasteToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_paste_16;
             pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
             pasteToolStripMenuItem.ShortcutKeyDisplayString = "";
             pasteToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V;
-            pasteToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            pasteToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
             pasteToolStripMenuItem.Text = "Paste";
             pasteToolStripMenuItem.ToolTipText = "Paste from clipboard to current symbol";
             pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click;
@@ -667,13 +700,26 @@
             // 
             selectToolStripMenuItem.Image = Properties.Resources.fam_rectt;
             selectToolStripMenuItem.Name = "selectToolStripMenuItem";
-            selectToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
+            selectToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.R;
+            selectToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
             selectToolStripMenuItem.Text = "Select";
+            selectToolStripMenuItem.ToolTipText = "Toggle Rectangle selection tool";
             selectToolStripMenuItem.Click += selectToolStripMenuItem_Click;
             // 
+            // selectAllToolStripMenuItem
+            // 
+            selectAllToolStripMenuItem.Enabled = false;
+            selectAllToolStripMenuItem.Image = Properties.Resources.arrow_out;
+            selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
+            selectAllToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A;
+            selectAllToolStripMenuItem.Size = new System.Drawing.Size(164, 22);
+            selectAllToolStripMenuItem.Text = "Select All";
+            selectAllToolStripMenuItem.ToolTipText = "Select entire canvas";
+            selectAllToolStripMenuItem.Click += selectAllToolStripMenuItem_Click;
+            // 
             // fontToolStripMenuItem
             // 
-            fontToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { makeVarWidthToolStripMenuItem, prependSymbolToolStripMenuItem, appendSymbolToolStripMenuItem, removeSymbolToolStripMenuItem, removeBeforeToolStripMenuItem, removeAfterToolStripMenuItem, CodeShiftToolStripMenuItem });
+            fontToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { makeVarWidthToolStripMenuItem, prependSymbolToolStripMenuItem, appendSymbolToolStripMenuItem, removeSymbolToolStripMenuItem, removeBeforeToolStripMenuItem, removeAfterToolStripMenuItem, CodeShiftToolStripMenuItem, toolStripSeparator3, testFontToolStripMenuItem });
             fontToolStripMenuItem.Name = "fontToolStripMenuItem";
             fontToolStripMenuItem.Size = new System.Drawing.Size(43, 20);
             fontToolStripMenuItem.Text = "Font";
@@ -753,6 +799,20 @@
             CodeShiftToolStripMenuItem.ToolTipText = "Shift the font on the code line";
             CodeShiftToolStripMenuItem.Click += CodeShiftToolStripMenuItem_Click;
             // 
+            // toolStripSeparator3
+            // 
+            toolStripSeparator3.Name = "toolStripSeparator3";
+            toolStripSeparator3.Size = new System.Drawing.Size(212, 6);
+            // 
+            // testFontToolStripMenuItem
+            // 
+            testFontToolStripMenuItem.Image = Properties.Resources.font;
+            testFontToolStripMenuItem.Name = "testFontToolStripMenuItem";
+            testFontToolStripMenuItem.Size = new System.Drawing.Size(215, 22);
+            testFontToolStripMenuItem.Text = "Test font";
+            testFontToolStripMenuItem.ToolTipText = "Open dialog where you can test the font with any text you type";
+            testFontToolStripMenuItem.Click += TestFont_Click;
+            // 
             // canvasToolStripMenuItem
             // 
             canvasToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { ClearToolStripMenuItem, FillToolStripMenuItem, shiftUpToolStripMenuItem, shiftDownToolStripMenuItem, shiftLeftToolStripMenuItem, shiftRightToolStripMenuItem, invertToolStripMenuItem, mirrorXToolStripMenuItem, mirrorYToolStripMenuItem, applyToolStripMenuItem });
@@ -889,7 +949,7 @@
             btnBaseline.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
             btnBaseline.Image = Properties.Resources.fam_base;
             btnBaseline.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            btnBaseline.Location = new System.Drawing.Point(718, 92);
+            btnBaseline.Location = new System.Drawing.Point(812, 93);
             btnBaseline.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             btnBaseline.Name = "btnBaseline";
             btnBaseline.Size = new System.Drawing.Size(88, 27);
@@ -951,9 +1011,9 @@
             chkRectSelect.Appearance = System.Windows.Forms.Appearance.Button;
             chkRectSelect.Image = Properties.Resources.fam_rectt;
             chkRectSelect.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            chkRectSelect.Location = new System.Drawing.Point(620, 92);
+            chkRectSelect.Location = new System.Drawing.Point(718, 93);
             chkRectSelect.Name = "chkRectSelect";
-            chkRectSelect.Size = new System.Drawing.Size(74, 27);
+            chkRectSelect.Size = new System.Drawing.Size(87, 27);
             chkRectSelect.TabIndex = 23;
             chkRectSelect.Text = " Select";
             chkRectSelect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -972,11 +1032,56 @@
             label3.TabIndex = 21;
             label3.Text = "Cursor:";
             // 
+            // lblSelectionLabel
+            // 
+            lblSelectionLabel.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            lblSelectionLabel.AutoSize = true;
+            lblSelectionLabel.Location = new System.Drawing.Point(616, 93);
+            lblSelectionLabel.Name = "lblSelectionLabel";
+            lblSelectionLabel.Size = new System.Drawing.Size(58, 15);
+            lblSelectionLabel.TabIndex = 25;
+            lblSelectionLabel.Text = "Selection:";
+            lblSelectionLabel.Visible = false;
+            // 
+            // lblSelection
+            // 
+            lblSelection.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            lblSelection.AutoSize = true;
+            lblSelection.Location = new System.Drawing.Point(617, 108);
+            lblSelection.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            lblSelection.Name = "lblSelection";
+            lblSelection.Size = new System.Drawing.Size(30, 15);
+            lblSelection.TabIndex = 24;
+            lblSelection.Text = "W,H";
+            lblSelection.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            lblSelection.Visible = false;
+            // 
+            // lblModified
+            // 
+            lblModified.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
+            lblModified.AutoSize = true;
+            lblModified.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204);
+            lblModified.ForeColor = System.Drawing.SystemColors.Highlight;
+            lblModified.Location = new System.Drawing.Point(616, 78);
+            lblModified.Name = "lblModified";
+            lblModified.Size = new System.Drawing.Size(91, 15);
+            lblModified.TabIndex = 26;
+            lblModified.Text = "Frame modified";
+            lblModified.Visible = false;
+            // 
+            // dlgSavePNG
+            // 
+            dlgSavePNG.DefaultExt = "png";
+            dlgSavePNG.Filter = "PNG Image|*.png;*.PNG";
+            // 
             // MainForm
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             ClientSize = new System.Drawing.Size(915, 647);
+            Controls.Add(lblModified);
+            Controls.Add(lblSelectionLabel);
+            Controls.Add(lblSelection);
             Controls.Add(chkRectSelect);
             Controls.Add(chkHexCodes);
             Controls.Add(label3);
@@ -1022,8 +1127,6 @@
         #endregion
 
         private System.Windows.Forms.Panel dotPanel;
-        private System.Windows.Forms.NumericUpDown nudX;
-        private System.Windows.Forms.NumericUpDown nudY;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.Label lblType;
@@ -1038,8 +1141,6 @@
         private System.Windows.Forms.Button btnMirrorX;
         private System.Windows.Forms.Button btnMirrorY;
         private System.Windows.Forms.Button btnExport;
-        private System.Windows.Forms.ListView miniList;
-        private System.Windows.Forms.ImageList ilMiniatures;
         private System.Windows.Forms.Button btnApply;
         private System.Windows.Forms.HScrollBar hScroll;
         private System.Windows.Forms.VScrollBar vScroll;
@@ -1099,6 +1200,20 @@
         private System.Windows.Forms.CheckBox chkRectSelect;
         private System.Windows.Forms.ToolStripMenuItem selectToolStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem importTextToolStripMenuItem1;
+        private System.Windows.Forms.Label lblSelectionLabel;
+        private System.Windows.Forms.Label lblSelection;
+        private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
+        private System.Windows.Forms.Label lblModified;
+        private System.Windows.Forms.ToolStripMenuItem testFontToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem exportFontLayoutPNGToolStripMenuItem;
+        private System.Windows.Forms.SaveFileDialog dlgSavePNG;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
+        public System.Windows.Forms.ListView miniList;
+        public System.Windows.Forms.ImageList ilMiniatures;
+        public System.Windows.Forms.NumericUpDown nudX;
+        public System.Windows.Forms.NumericUpDown nudY;
     }
 }
 

McBitFont/Form1.resx

@@ -135,6 +135,9 @@
   <metadata name="dlgOpen.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>336, 17</value>
   </metadata>
+  <metadata name="dlgSavePNG.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>644, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

McBitFont/ImageImporter.Designer.cs

@@ -377,7 +377,7 @@
             Name = "ImageImporter";
             ShowIcon = false;
             ShowInTaskbar = false;
-            StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             Text = "Import Image";
             Paint += ImageImporter_Paint;
             ((System.ComponentModel.ISupportInitialize)pbOriginal).EndInit();

McBitFont/ImageImporter.resx

@@ -123,7 +123,4 @@
   <metadata name="dlgLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
-  </metadata>
 </root>

McBitFont/McBitFont.csproj

@@ -20,8 +20,10 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <ApplicationIcon>icon_64.ico</ApplicationIcon>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <AssemblyVersion>2.5.0.0</AssemblyVersion>
+    <FileVersion>2.5.0.0</FileVersion>
+    <Version>$(VersionPrefix)2.5.0</Version>
+    <Copyright>Anton Mukhin</Copyright>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DebugType>portable</DebugType>

McBitFont/New.Designer.cs

@@ -23,469 +23,421 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.nudNewX = new System.Windows.Forms.NumericUpDown();
-            this.nudNewY = new System.Windows.Forms.NumericUpDown();
-            this.label1 = new System.Windows.Forms.Label();
-            this.label2 = new System.Windows.Forms.Label();
-            this.rbMono = new System.Windows.Forms.RadioButton();
-            this.rbVar = new System.Windows.Forms.RadioButton();
-            this.cbNotPrintable = new System.Windows.Forms.CheckBox();
-            this.cbLatin = new System.Windows.Forms.CheckBox();
-            this.cbExtended = new System.Windows.Forms.CheckBox();
-            this.btnOK = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.cbSingle = new System.Windows.Forms.CheckBox();
-            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
-            this.cbEncoding = new System.Windows.Forms.ComboBox();
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pbChar2 = new System.Windows.Forms.PictureBox();
-            this.pbChar1 = new System.Windows.Forms.PictureBox();
-            this.btnFont = new System.Windows.Forms.Button();
-            this.dlgFont = new System.Windows.Forms.FontDialog();
-            this.cbFontBased = new System.Windows.Forms.CheckBox();
-            this.lblFont = new System.Windows.Forms.Label();
-            this.nudShiftX = new System.Windows.Forms.NumericUpDown();
-            this.nudShiftY = new System.Windows.Forms.NumericUpDown();
-            this.lblShiftX = new System.Windows.Forms.Label();
-            this.lblShiftY = new System.Windows.Forms.Label();
-            this.pnlFont = new System.Windows.Forms.Panel();
-            this.label4 = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.nudChar2 = new System.Windows.Forms.NumericUpDown();
-            this.nudChar1 = new System.Windows.Forms.NumericUpDown();
-            this.cbDigits = new System.Windows.Forms.CheckBox();
-            ((System.ComponentModel.ISupportInitialize)(this.nudNewX)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudNewY)).BeginInit();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbChar2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbChar1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudShiftX)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudShiftY)).BeginInit();
-            this.pnlFont.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.nudChar2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudChar1)).BeginInit();
-            this.SuspendLayout();
+            components = new System.ComponentModel.Container();
+            nudNewX = new System.Windows.Forms.NumericUpDown();
+            nudNewY = new System.Windows.Forms.NumericUpDown();
+            label1 = new System.Windows.Forms.Label();
+            label2 = new System.Windows.Forms.Label();
+            rbMono = new System.Windows.Forms.RadioButton();
+            rbVar = new System.Windows.Forms.RadioButton();
+            cbNotPrintable = new System.Windows.Forms.CheckBox();
+            cbLatin = new System.Windows.Forms.CheckBox();
+            cbExtended = new System.Windows.Forms.CheckBox();
+            btnOK = new System.Windows.Forms.Button();
+            btnCancel = new System.Windows.Forms.Button();
+            cbSingle = new System.Windows.Forms.CheckBox();
+            toolTip1 = new System.Windows.Forms.ToolTip(components);
+            cbEncoding = new System.Windows.Forms.ComboBox();
+            panel1 = new System.Windows.Forms.Panel();
+            pbChar2 = new System.Windows.Forms.PictureBox();
+            pbChar1 = new System.Windows.Forms.PictureBox();
+            btnFont = new System.Windows.Forms.Button();
+            dlgFont = new System.Windows.Forms.FontDialog();
+            cbFontBased = new System.Windows.Forms.CheckBox();
+            lblFont = new System.Windows.Forms.Label();
+            nudShiftX = new System.Windows.Forms.NumericUpDown();
+            nudShiftY = new System.Windows.Forms.NumericUpDown();
+            lblShiftX = new System.Windows.Forms.Label();
+            lblShiftY = new System.Windows.Forms.Label();
+            pnlFont = new System.Windows.Forms.Panel();
+            label4 = new System.Windows.Forms.Label();
+            label3 = new System.Windows.Forms.Label();
+            nudChar2 = new System.Windows.Forms.NumericUpDown();
+            nudChar1 = new System.Windows.Forms.NumericUpDown();
+            cbDigits = new System.Windows.Forms.CheckBox();
+            ((System.ComponentModel.ISupportInitialize)nudNewX).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)nudNewY).BeginInit();
+            panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)pbChar2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)pbChar1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)nudShiftX).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)nudShiftY).BeginInit();
+            pnlFont.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)nudChar2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)nudChar1).BeginInit();
+            SuspendLayout();
             // 
             // nudNewX
             // 
-            this.nudNewX.Location = new System.Drawing.Point(68, 32);
-            this.nudNewX.Maximum = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            this.nudNewX.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.nudNewX.Name = "nudNewX";
-            this.nudNewX.Size = new System.Drawing.Size(57, 20);
-            this.nudNewX.TabIndex = 0;
-            this.nudNewX.Value = new decimal(new int[] {
-            32,
-            0,
-            0,
-            0});
-            this.nudNewX.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
-            this.nudNewX.Enter += new System.EventHandler(this.nudFocus);
+            nudNewX.Location = new System.Drawing.Point(68, 32);
+            nudNewX.Maximum = new decimal(new int[] { 255, 0, 0, 0 });
+            nudNewX.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            nudNewX.Name = "nudNewX";
+            nudNewX.Size = new System.Drawing.Size(57, 23);
+            nudNewX.TabIndex = 0;
+            nudNewX.Value = new decimal(new int[] { 32, 0, 0, 0 });
+            nudNewX.ValueChanged += nudNewX_ValueChanged;
+            nudNewX.Enter += nudFocus;
             // 
             // nudNewY
             // 
-            this.nudNewY.Location = new System.Drawing.Point(68, 58);
-            this.nudNewY.Maximum = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            this.nudNewY.Minimum = new decimal(new int[] {
-            1,
-            0,
-            0,
-            0});
-            this.nudNewY.Name = "nudNewY";
-            this.nudNewY.Size = new System.Drawing.Size(57, 20);
-            this.nudNewY.TabIndex = 1;
-            this.nudNewY.Value = new decimal(new int[] {
-            32,
-            0,
-            0,
-            0});
-            this.nudNewY.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
-            this.nudNewY.Enter += new System.EventHandler(this.nudFocus);
+            nudNewY.Location = new System.Drawing.Point(68, 58);
+            nudNewY.Maximum = new decimal(new int[] { 255, 0, 0, 0 });
+            nudNewY.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
+            nudNewY.Name = "nudNewY";
+            nudNewY.Size = new System.Drawing.Size(57, 23);
+            nudNewY.TabIndex = 1;
+            nudNewY.Value = new decimal(new int[] { 32, 0, 0, 0 });
+            nudNewY.ValueChanged += nudNewX_ValueChanged;
+            nudNewY.Enter += nudFocus;
             // 
             // label1
             // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(24, 34);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(38, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "Width:";
-            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            label1.AutoSize = true;
+            label1.Location = new System.Drawing.Point(24, 34);
+            label1.Name = "label1";
+            label1.Size = new System.Drawing.Size(42, 15);
+            label1.TabIndex = 2;
+            label1.Text = "Width:";
+            label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // label2
             // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(21, 60);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(41, 13);
-            this.label2.TabIndex = 3;
-            this.label2.Text = "Height:";
-            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            label2.AutoSize = true;
+            label2.Location = new System.Drawing.Point(21, 60);
+            label2.Name = "label2";
+            label2.Size = new System.Drawing.Size(46, 15);
+            label2.TabIndex = 3;
+            label2.Text = "Height:";
+            label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // rbMono
             // 
-            this.rbMono.AutoSize = true;
-            this.rbMono.Checked = true;
-            this.rbMono.Location = new System.Drawing.Point(24, 84);
-            this.rbMono.Name = "rbMono";
-            this.rbMono.Size = new System.Drawing.Size(87, 17);
-            this.rbMono.TabIndex = 4;
-            this.rbMono.TabStop = true;
-            this.rbMono.Text = "Monospaced";
-            this.rbMono.UseVisualStyleBackColor = true;
+            rbMono.AutoSize = true;
+            rbMono.Checked = true;
+            rbMono.Location = new System.Drawing.Point(24, 84);
+            rbMono.Name = "rbMono";
+            rbMono.Size = new System.Drawing.Size(94, 19);
+            rbMono.TabIndex = 4;
+            rbMono.TabStop = true;
+            rbMono.Text = "Monospaced";
+            rbMono.UseVisualStyleBackColor = true;
             // 
             // rbVar
             // 
-            this.rbVar.AutoSize = true;
-            this.rbVar.Location = new System.Drawing.Point(24, 107);
-            this.rbVar.Name = "rbVar";
-            this.rbVar.Size = new System.Drawing.Size(91, 17);
-            this.rbVar.TabIndex = 5;
-            this.rbVar.Text = "Variable width";
-            this.rbVar.UseVisualStyleBackColor = true;
+            rbVar.AutoSize = true;
+            rbVar.Location = new System.Drawing.Point(24, 107);
+            rbVar.Name = "rbVar";
+            rbVar.Size = new System.Drawing.Size(99, 19);
+            rbVar.TabIndex = 5;
+            rbVar.Text = "Variable width";
+            rbVar.UseVisualStyleBackColor = true;
             // 
             // cbNotPrintable
             // 
-            this.cbNotPrintable.AutoSize = true;
-            this.cbNotPrintable.Location = new System.Drawing.Point(140, 77);
-            this.cbNotPrintable.Name = "cbNotPrintable";
-            this.cbNotPrintable.Size = new System.Drawing.Size(116, 17);
-            this.cbNotPrintable.TabIndex = 7;
-            this.cbNotPrintable.Text = "0-31 (Not printable)";
-            this.cbNotPrintable.UseVisualStyleBackColor = true;
-            this.cbNotPrintable.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbNotPrintable.AutoSize = true;
+            cbNotPrintable.Location = new System.Drawing.Point(140, 77);
+            cbNotPrintable.Name = "cbNotPrintable";
+            cbNotPrintable.Size = new System.Drawing.Size(130, 19);
+            cbNotPrintable.TabIndex = 7;
+            cbNotPrintable.Text = "0-31 (Not printable)";
+            cbNotPrintable.UseVisualStyleBackColor = true;
+            cbNotPrintable.CheckedChanged += checkboxChanged;
             // 
             // cbLatin
             // 
-            this.cbLatin.AutoSize = true;
-            this.cbLatin.Checked = true;
-            this.cbLatin.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.cbLatin.Location = new System.Drawing.Point(140, 100);
-            this.cbLatin.Name = "cbLatin";
-            this.cbLatin.Size = new System.Drawing.Size(91, 17);
-            this.cbLatin.TabIndex = 8;
-            this.cbLatin.Text = "32-127 (Latin)";
-            this.cbLatin.UseVisualStyleBackColor = true;
-            this.cbLatin.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbLatin.AutoSize = true;
+            cbLatin.Checked = true;
+            cbLatin.CheckState = System.Windows.Forms.CheckState.Checked;
+            cbLatin.Location = new System.Drawing.Point(140, 100);
+            cbLatin.Name = "cbLatin";
+            cbLatin.Size = new System.Drawing.Size(98, 19);
+            cbLatin.TabIndex = 8;
+            cbLatin.Text = "32-127 (Latin)";
+            cbLatin.UseVisualStyleBackColor = true;
+            cbLatin.CheckedChanged += checkboxChanged;
             // 
             // cbExtended
             // 
-            this.cbExtended.AutoSize = true;
-            this.cbExtended.Location = new System.Drawing.Point(140, 123);
-            this.cbExtended.Name = "cbExtended";
-            this.cbExtended.Size = new System.Drawing.Size(119, 17);
-            this.cbExtended.TabIndex = 9;
-            this.cbExtended.Text = "128-255 (Extended)";
-            this.cbExtended.UseVisualStyleBackColor = true;
-            this.cbExtended.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbExtended.AutoSize = true;
+            cbExtended.Location = new System.Drawing.Point(140, 123);
+            cbExtended.Name = "cbExtended";
+            cbExtended.Size = new System.Drawing.Size(126, 19);
+            cbExtended.TabIndex = 9;
+            cbExtended.Text = "128-255 (Extended)";
+            cbExtended.UseVisualStyleBackColor = true;
+            cbExtended.CheckedChanged += checkboxChanged;
             // 
             // btnOK
             // 
-            this.btnOK.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOK.Location = new System.Drawing.Point(47, 178);
-            this.btnOK.Name = "btnOK";
-            this.btnOK.Size = new System.Drawing.Size(75, 23);
-            this.btnOK.TabIndex = 10;
-            this.btnOK.Text = "OK";
-            this.btnOK.UseVisualStyleBackColor = true;
-            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            btnOK.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
+            btnOK.Location = new System.Drawing.Point(47, 178);
+            btnOK.Name = "btnOK";
+            btnOK.Size = new System.Drawing.Size(75, 23);
+            btnOK.TabIndex = 10;
+            btnOK.Text = "OK";
+            btnOK.UseVisualStyleBackColor = true;
+            btnOK.Click += btnOK_Click;
             // 
             // btnCancel
             // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(140, 178);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(75, 23);
-            this.btnCancel.TabIndex = 11;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            btnCancel.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
+            btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            btnCancel.Location = new System.Drawing.Point(140, 178);
+            btnCancel.Name = "btnCancel";
+            btnCancel.Size = new System.Drawing.Size(75, 23);
+            btnCancel.TabIndex = 11;
+            btnCancel.Text = "Cancel";
+            btnCancel.UseVisualStyleBackColor = true;
+            btnCancel.Click += btnCancel_Click;
             // 
             // cbSingle
             // 
-            this.cbSingle.AutoSize = true;
-            this.cbSingle.Location = new System.Drawing.Point(140, 31);
-            this.cbSingle.Name = "cbSingle";
-            this.cbSingle.Size = new System.Drawing.Size(84, 17);
-            this.cbSingle.TabIndex = 12;
-            this.cbSingle.Text = "Single frame";
-            this.cbSingle.UseVisualStyleBackColor = true;
-            this.cbSingle.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbSingle.AutoSize = true;
+            cbSingle.Location = new System.Drawing.Point(140, 31);
+            cbSingle.Name = "cbSingle";
+            cbSingle.Size = new System.Drawing.Size(92, 19);
+            cbSingle.TabIndex = 12;
+            cbSingle.Text = "Single frame";
+            cbSingle.UseVisualStyleBackColor = true;
+            cbSingle.CheckedChanged += checkboxChanged;
             // 
             // toolTip1
             // 
-            this.toolTip1.AutoPopDelay = 10000;
-            this.toolTip1.InitialDelay = 500;
-            this.toolTip1.ReshowDelay = 100;
-            this.toolTip1.ToolTipTitle = "Info";
+            toolTip1.AutoPopDelay = 10000;
+            toolTip1.InitialDelay = 500;
+            toolTip1.ReshowDelay = 100;
+            toolTip1.ToolTipTitle = "Info";
             // 
             // cbEncoding
             // 
-            this.cbEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cbEncoding.Enabled = false;
-            this.cbEncoding.FormattingEnabled = true;
-            this.cbEncoding.Location = new System.Drawing.Point(140, 146);
-            this.cbEncoding.Name = "cbEncoding";
-            this.cbEncoding.Size = new System.Drawing.Size(121, 21);
-            this.cbEncoding.TabIndex = 13;
+            cbEncoding.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            cbEncoding.Enabled = false;
+            cbEncoding.FormattingEnabled = true;
+            cbEncoding.Location = new System.Drawing.Point(140, 146);
+            cbEncoding.Name = "cbEncoding";
+            cbEncoding.Size = new System.Drawing.Size(121, 23);
+            cbEncoding.TabIndex = 13;
             // 
             // panel1
             // 
-            this.panel1.Controls.Add(this.pbChar2);
-            this.panel1.Controls.Add(this.pbChar1);
-            this.panel1.Location = new System.Drawing.Point(6, 24);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(200, 124);
-            this.panel1.TabIndex = 14;
+            panel1.Controls.Add(pbChar2);
+            panel1.Controls.Add(pbChar1);
+            panel1.Location = new System.Drawing.Point(6, 24);
+            panel1.Name = "panel1";
+            panel1.Size = new System.Drawing.Size(200, 124);
+            panel1.TabIndex = 14;
             // 
             // pbChar2
             // 
-            this.pbChar2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pbChar2.Location = new System.Drawing.Point(100, 0);
-            this.pbChar2.Name = "pbChar2";
-            this.pbChar2.Size = new System.Drawing.Size(100, 124);
-            this.pbChar2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.pbChar2.TabIndex = 1;
-            this.pbChar2.TabStop = false;
+            pbChar2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            pbChar2.Location = new System.Drawing.Point(100, 0);
+            pbChar2.Name = "pbChar2";
+            pbChar2.Size = new System.Drawing.Size(100, 124);
+            pbChar2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            pbChar2.TabIndex = 1;
+            pbChar2.TabStop = false;
             // 
             // pbChar1
             // 
-            this.pbChar1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pbChar1.Location = new System.Drawing.Point(0, 0);
-            this.pbChar1.Name = "pbChar1";
-            this.pbChar1.Size = new System.Drawing.Size(100, 124);
-            this.pbChar1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.pbChar1.TabIndex = 0;
-            this.pbChar1.TabStop = false;
+            pbChar1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            pbChar1.Location = new System.Drawing.Point(0, 0);
+            pbChar1.Name = "pbChar1";
+            pbChar1.Size = new System.Drawing.Size(100, 124);
+            pbChar1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            pbChar1.TabIndex = 0;
+            pbChar1.TabStop = false;
             // 
             // btnFont
             // 
-            this.btnFont.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnFont.Location = new System.Drawing.Point(6, 178);
-            this.btnFont.Name = "btnFont";
-            this.btnFont.Size = new System.Drawing.Size(71, 23);
-            this.btnFont.TabIndex = 15;
-            this.btnFont.Text = "Font ...";
-            this.btnFont.UseVisualStyleBackColor = true;
-            this.btnFont.Click += new System.EventHandler(this.btnFont_Click);
+            btnFont.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
+            btnFont.Location = new System.Drawing.Point(6, 178);
+            btnFont.Name = "btnFont";
+            btnFont.Size = new System.Drawing.Size(71, 23);
+            btnFont.TabIndex = 15;
+            btnFont.Text = "Font ...";
+            btnFont.UseVisualStyleBackColor = true;
+            btnFont.Click += btnFont_Click;
             // 
             // dlgFont
             // 
-            this.dlgFont.Font = new System.Drawing.Font("Courier New", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.dlgFont.ShowEffects = false;
+            dlgFont.Font = new System.Drawing.Font("Courier New", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204);
+            dlgFont.ShowEffects = false;
             // 
             // cbFontBased
             // 
-            this.cbFontBased.AutoSize = true;
-            this.cbFontBased.Location = new System.Drawing.Point(24, 130);
-            this.cbFontBased.Name = "cbFontBased";
-            this.cbFontBased.Size = new System.Drawing.Size(101, 17);
-            this.cbFontBased.TabIndex = 16;
-            this.cbFontBased.Text = "Based on a font";
-            this.cbFontBased.UseVisualStyleBackColor = true;
-            this.cbFontBased.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbFontBased.AutoSize = true;
+            cbFontBased.Location = new System.Drawing.Point(24, 130);
+            cbFontBased.Name = "cbFontBased";
+            cbFontBased.Size = new System.Drawing.Size(108, 19);
+            cbFontBased.TabIndex = 16;
+            cbFontBased.Text = "Based on a font";
+            cbFontBased.UseVisualStyleBackColor = true;
+            cbFontBased.CheckedChanged += checkboxChanged;
             // 
             // lblFont
             // 
-            this.lblFont.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.lblFont.Location = new System.Drawing.Point(83, 183);
-            this.lblFont.Name = "lblFont";
-            this.lblFont.Size = new System.Drawing.Size(123, 18);
-            this.lblFont.TabIndex = 17;
-            this.lblFont.Text = "font";
+            lblFont.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left;
+            lblFont.Location = new System.Drawing.Point(83, 183);
+            lblFont.Name = "lblFont";
+            lblFont.Size = new System.Drawing.Size(123, 18);
+            lblFont.TabIndex = 17;
+            lblFont.Text = "font";
             // 
             // nudShiftX
             // 
-            this.nudShiftX.Location = new System.Drawing.Point(61, 2);
-            this.nudShiftX.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            -2147483648});
-            this.nudShiftX.Name = "nudShiftX";
-            this.nudShiftX.Size = new System.Drawing.Size(45, 20);
-            this.nudShiftX.TabIndex = 18;
-            this.nudShiftX.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
+            nudShiftX.Location = new System.Drawing.Point(61, 2);
+            nudShiftX.Minimum = new decimal(new int[] { 100, 0, 0, int.MinValue });
+            nudShiftX.Name = "nudShiftX";
+            nudShiftX.Size = new System.Drawing.Size(45, 23);
+            nudShiftX.TabIndex = 18;
+            nudShiftX.ValueChanged += nudNewX_ValueChanged;
             // 
             // nudShiftY
             // 
-            this.nudShiftY.Location = new System.Drawing.Point(161, 2);
-            this.nudShiftY.Minimum = new decimal(new int[] {
-            100,
-            0,
-            0,
-            -2147483648});
-            this.nudShiftY.Name = "nudShiftY";
-            this.nudShiftY.Size = new System.Drawing.Size(45, 20);
-            this.nudShiftY.TabIndex = 19;
-            this.nudShiftY.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
+            nudShiftY.Location = new System.Drawing.Point(161, 2);
+            nudShiftY.Minimum = new decimal(new int[] { 100, 0, 0, int.MinValue });
+            nudShiftY.Name = "nudShiftY";
+            nudShiftY.Size = new System.Drawing.Size(45, 23);
+            nudShiftY.TabIndex = 19;
+            nudShiftY.ValueChanged += nudNewX_ValueChanged;
             // 
             // lblShiftX
             // 
-            this.lblShiftX.AutoSize = true;
-            this.lblShiftX.Location = new System.Drawing.Point(14, 4);
-            this.lblShiftX.Name = "lblShiftX";
-            this.lblShiftX.Size = new System.Drawing.Size(41, 13);
-            this.lblShiftX.TabIndex = 20;
-            this.lblShiftX.Text = "Shift X:";
-            this.lblShiftX.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            lblShiftX.AutoSize = true;
+            lblShiftX.Location = new System.Drawing.Point(14, 4);
+            lblShiftX.Name = "lblShiftX";
+            lblShiftX.Size = new System.Drawing.Size(44, 15);
+            lblShiftX.TabIndex = 20;
+            lblShiftX.Text = "Shift X:";
+            lblShiftX.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // lblShiftY
             // 
-            this.lblShiftY.AutoSize = true;
-            this.lblShiftY.Location = new System.Drawing.Point(114, 4);
-            this.lblShiftY.Name = "lblShiftY";
-            this.lblShiftY.Size = new System.Drawing.Size(41, 13);
-            this.lblShiftY.TabIndex = 21;
-            this.lblShiftY.Text = "Shift Y:";
-            this.lblShiftY.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            lblShiftY.AutoSize = true;
+            lblShiftY.Location = new System.Drawing.Point(114, 4);
+            lblShiftY.Name = "lblShiftY";
+            lblShiftY.Size = new System.Drawing.Size(44, 15);
+            lblShiftY.TabIndex = 21;
+            lblShiftY.Text = "Shift Y:";
+            lblShiftY.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // pnlFont
             // 
-            this.pnlFont.Controls.Add(this.label4);
-            this.pnlFont.Controls.Add(this.label3);
-            this.pnlFont.Controls.Add(this.nudChar2);
-            this.pnlFont.Controls.Add(this.nudChar1);
-            this.pnlFont.Controls.Add(this.lblShiftX);
-            this.pnlFont.Controls.Add(this.lblShiftY);
-            this.pnlFont.Controls.Add(this.panel1);
-            this.pnlFont.Controls.Add(this.btnFont);
-            this.pnlFont.Controls.Add(this.nudShiftY);
-            this.pnlFont.Controls.Add(this.lblFont);
-            this.pnlFont.Controls.Add(this.nudShiftX);
-            this.pnlFont.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pnlFont.Location = new System.Drawing.Point(270, 0);
-            this.pnlFont.Name = "pnlFont";
-            this.pnlFont.Size = new System.Drawing.Size(214, 211);
-            this.pnlFont.TabIndex = 22;
-            this.pnlFont.Visible = false;
+            pnlFont.Controls.Add(label4);
+            pnlFont.Controls.Add(label3);
+            pnlFont.Controls.Add(nudChar2);
+            pnlFont.Controls.Add(nudChar1);
+            pnlFont.Controls.Add(lblShiftX);
+            pnlFont.Controls.Add(lblShiftY);
+            pnlFont.Controls.Add(panel1);
+            pnlFont.Controls.Add(btnFont);
+            pnlFont.Controls.Add(nudShiftY);
+            pnlFont.Controls.Add(lblFont);
+            pnlFont.Controls.Add(nudShiftX);
+            pnlFont.Dock = System.Windows.Forms.DockStyle.Right;
+            pnlFont.Location = new System.Drawing.Point(270, 0);
+            pnlFont.Name = "pnlFont";
+            pnlFont.Size = new System.Drawing.Size(214, 211);
+            pnlFont.TabIndex = 22;
+            pnlFont.Visible = false;
             // 
             // label4
             // 
-            this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(112, 152);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(45, 13);
-            this.label4.TabIndex = 25;
-            this.label4.Text = "Sample:";
-            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            label4.AutoSize = true;
+            label4.Location = new System.Drawing.Point(112, 152);
+            label4.Name = "label4";
+            label4.Size = new System.Drawing.Size(49, 15);
+            label4.TabIndex = 25;
+            label4.Text = "Sample:";
+            label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // label3
             // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(14, 152);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(45, 13);
-            this.label3.TabIndex = 24;
-            this.label3.Text = "Sample:";
-            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            label3.AutoSize = true;
+            label3.Location = new System.Drawing.Point(14, 152);
+            label3.Name = "label3";
+            label3.Size = new System.Drawing.Size(49, 15);
+            label3.TabIndex = 24;
+            label3.Text = "Sample:";
+            label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
             // nudChar2
             // 
-            this.nudChar2.Location = new System.Drawing.Point(161, 149);
-            this.nudChar2.Maximum = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            this.nudChar2.Name = "nudChar2";
-            this.nudChar2.Size = new System.Drawing.Size(45, 20);
-            this.nudChar2.TabIndex = 23;
-            this.nudChar2.Value = new decimal(new int[] {
-            97,
-            0,
-            0,
-            0});
-            this.nudChar2.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
+            nudChar2.Location = new System.Drawing.Point(161, 149);
+            nudChar2.Maximum = new decimal(new int[] { 255, 0, 0, 0 });
+            nudChar2.Name = "nudChar2";
+            nudChar2.Size = new System.Drawing.Size(45, 23);
+            nudChar2.TabIndex = 23;
+            nudChar2.Value = new decimal(new int[] { 97, 0, 0, 0 });
+            nudChar2.ValueChanged += nudNewX_ValueChanged;
             // 
             // nudChar1
             // 
-            this.nudChar1.Location = new System.Drawing.Point(61, 149);
-            this.nudChar1.Maximum = new decimal(new int[] {
-            255,
-            0,
-            0,
-            0});
-            this.nudChar1.Name = "nudChar1";
-            this.nudChar1.Size = new System.Drawing.Size(45, 20);
-            this.nudChar1.TabIndex = 22;
-            this.nudChar1.Value = new decimal(new int[] {
-            65,
-            0,
-            0,
-            0});
-            this.nudChar1.ValueChanged += new System.EventHandler(this.nudNewX_ValueChanged);
+            nudChar1.Location = new System.Drawing.Point(61, 149);
+            nudChar1.Maximum = new decimal(new int[] { 255, 0, 0, 0 });
+            nudChar1.Name = "nudChar1";
+            nudChar1.Size = new System.Drawing.Size(45, 23);
+            nudChar1.TabIndex = 22;
+            nudChar1.Value = new decimal(new int[] { 65, 0, 0, 0 });
+            nudChar1.ValueChanged += nudNewX_ValueChanged;
             // 
             // cbDigits
             // 
-            this.cbDigits.AutoSize = true;
-            this.cbDigits.Location = new System.Drawing.Point(140, 54);
-            this.cbDigits.Name = "cbDigits";
-            this.cbDigits.Size = new System.Drawing.Size(74, 17);
-            this.cbDigits.TabIndex = 23;
-            this.cbDigits.Text = "Digits only";
-            this.cbDigits.UseVisualStyleBackColor = true;
-            this.cbDigits.CheckedChanged += new System.EventHandler(this.checkboxChanged);
+            cbDigits.AutoSize = true;
+            cbDigits.Location = new System.Drawing.Point(140, 54);
+            cbDigits.Name = "cbDigits";
+            cbDigits.Size = new System.Drawing.Size(82, 19);
+            cbDigits.TabIndex = 23;
+            cbDigits.Text = "Digits only";
+            cbDigits.UseVisualStyleBackColor = true;
+            cbDigits.CheckedChanged += checkboxChanged;
             // 
             // New
             // 
-            this.AcceptButton = this.btnOK;
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
-            this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(484, 211);
-            this.Controls.Add(this.cbDigits);
-            this.Controls.Add(this.pnlFont);
-            this.Controls.Add(this.cbFontBased);
-            this.Controls.Add(this.cbEncoding);
-            this.Controls.Add(this.cbSingle);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnOK);
-            this.Controls.Add(this.cbExtended);
-            this.Controls.Add(this.cbLatin);
-            this.Controls.Add(this.cbNotPrintable);
-            this.Controls.Add(this.rbVar);
-            this.Controls.Add(this.rbMono);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.nudNewY);
-            this.Controls.Add(this.nudNewX);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(300, 220);
-            this.Name = "New";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "New";
-            this.Load += new System.EventHandler(this.New_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.nudNewX)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudNewY)).EndInit();
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pbChar2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbChar1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudShiftX)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudShiftY)).EndInit();
-            this.pnlFont.ResumeLayout(false);
-            this.pnlFont.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.nudChar2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.nudChar1)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
+            AcceptButton = btnOK;
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            CancelButton = btnCancel;
+            ClientSize = new System.Drawing.Size(484, 211);
+            Controls.Add(cbDigits);
+            Controls.Add(pnlFont);
+            Controls.Add(cbFontBased);
+            Controls.Add(cbEncoding);
+            Controls.Add(cbSingle);
+            Controls.Add(btnCancel);
+            Controls.Add(btnOK);
+            Controls.Add(cbExtended);
+            Controls.Add(cbLatin);
+            Controls.Add(cbNotPrintable);
+            Controls.Add(rbVar);
+            Controls.Add(rbMono);
+            Controls.Add(label2);
+            Controls.Add(label1);
+            Controls.Add(nudNewY);
+            Controls.Add(nudNewX);
+            FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            MaximizeBox = false;
+            MinimizeBox = false;
+            MinimumSize = new System.Drawing.Size(300, 220);
+            Name = "New";
+            ShowIcon = false;
+            ShowInTaskbar = false;
+            StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            Text = "New";
+            Load += New_Load;
+            ((System.ComponentModel.ISupportInitialize)nudNewX).EndInit();
+            ((System.ComponentModel.ISupportInitialize)nudNewY).EndInit();
+            panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)pbChar2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)pbChar1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)nudShiftX).EndInit();
+            ((System.ComponentModel.ISupportInitialize)nudShiftY).EndInit();
+            pnlFont.ResumeLayout(false);
+            pnlFont.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)nudChar2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)nudChar1).EndInit();
+            ResumeLayout(false);
+            PerformLayout();
 
         }
 

McBitFont/New.cs

@@ -108,8 +108,8 @@ namespace McBitFont {
 
             Bitmap bmp, result;
             Graphics g;
-            chars[0] = mainForm.decodeSymbol((int)nudChar1.Value);
-            chars[1] = mainForm.decodeSymbol((int)nudChar2.Value);
+            chars[0] = mainForm.DecodeSymbol((int)nudChar1.Value);
+            chars[1] = mainForm.DecodeSymbol((int)nudChar2.Value);
             for (int i = 0; i < 2; i++) {
                 bmp = new Bitmap((int)nudNewX.Value, (int)nudNewY.Value);
                 g = Graphics.FromImage(bmp);

McBitFont/New.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

McBitFont/Properties/Resources.Designer.cs

@@ -80,6 +80,16 @@ namespace McBitFont.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_out {
+            get {
+                object obj = ResourceManager.GetObject("arrow_out", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -260,6 +270,16 @@ namespace McBitFont.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap font {
+            get {
+                object obj = ResourceManager.GetObject("font", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -290,6 +310,16 @@ namespace McBitFont.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap picture_go {
+            get {
+                object obj = ResourceManager.GetObject("picture_go", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

McBitFont/Properties/Resources.resx

@@ -136,12 +136,18 @@
   <data name="Famfamfam-Silk-Page-copy.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Famfamfam-Silk-Page-copy.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="font" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\font.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_inout" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_inout.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrow_redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Famfamfam-Silk-Disk.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Famfamfam-Silk-Disk.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -202,8 +208,8 @@
   <data name="Famfamfam-Silk-Page-white.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Famfamfam-Silk-Page-white.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Famfamfam-Silk-Disk.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Famfamfam-Silk-Disk.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="folder_table" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Canvas_Fill" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Canvas_Fill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -220,10 +226,13 @@
   <data name="arrow_undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="arrow_out" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="icon_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\icon_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="folder_table" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="picture_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\picture_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

README.md

@@ -8,6 +8,9 @@ Features:
 - Import an image
 - Save / Load your project for later edits
 - Export as a C array in different formats
+- Import from text C array
+- Export to a PNG image showing all the characters in a table
+- Test your font in special dialog
 
 Requires:
 - Windows 7+
@@ -17,6 +20,8 @@ Some basic hints on the interface:
 - Mouse 1 to mark a pixel black
 - Mouse 2 to mark a pixel white
 - Drag the mouse holding a button to draw pixels
+- Hold Shift to constrain painting horizontally
+- Hold Ctrl to constrain painting vertically
 - Mouse Scroll to scroll up and down
 - Shift + scroll to scroll left and right
 - Crtl + scroll to zoom
@@ -37,6 +42,10 @@ New project dialog
 
 ![New project](/images/Screenshot_New.png)
 
+Font test dialog
+
+![Font tester](/images/Screenshot_Font-tester.png)
+
 Export dialog
 
 ![Export](/images/Screenshot_Export.png)
@@ -48,3 +57,7 @@ Import Image dialog
 Code Shift dialog
 
 ![Code Shift](/images/Screenshot_Code-shift.png)
+
+Font PNG export example
+
+![PNG export example](/images/Font_Minecraft_Rus_5x7_vw.png)

TODO.txt

@@ -1,28 +1,11 @@
 Application:
-V Migrate from .Net Framework 4.7 to .NET 9
-V New Save file format! Use McBitFont v1.7 to convert old save files to the new format.
-V Better quality pictures in symbol list
-V Spinning cursor when application is busy
-V Change Menu icons
-V Re-arranged menu items
-V Option to display codes in Hex numbers
-V Make symbol list wider to display 8 characters instead of 7
+- Consider migrating to WPF in order to make DPI aware UI
+
 
 Functionality:
-V Fill canvas button
-V Context menu in symbol navigator
-V Delete symbols before/after selected
-V Shift all symbols on code line (change symbol codes)
-V Specify starting code (extends the shift)
-V Ability to make monospaced font a variable width one
-V Undo/Redo for canvas changes
-V Image import from a file
-V Import from a text array
-V Rectangle selection to mass-paint, shift and mirror pixels etc...
-V "Packed" fonts export
-V "Bytes total comment in export
+V Middle mouse - drag the canvas
+V Straight line painting (hold Shift / Ctrl)
+V A button to Copy from Test font dialog to then paste into another frame
 
 Bugs:
-V Improper bytes count for 16 or 32 bit numbers export
-V Exception on Code Shift when nothing is selected in Symbols List
-V Wrongly mark Project as modified on symbol selection
+V Nothing selected after removing a symbol. Potential error throw on "Apply"