v1.7a - UI fix

.gitignore

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

McBitFont/FodyWeavers.xml

@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <Costura />
+</Weavers>

McBitFont/Form1.cs

@@ -1,13 +1,21 @@
 using MessagePack;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Runtime.InteropServices.ComTypes;
+using System.Runtime.Serialization.Formatters.Binary;
 using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Windows.Forms.VisualStyles;
 
 
 namespace McBitFont {
@@ -56,7 +64,7 @@ namespace McBitFont {
         public bool monospaced = false;
         bool modified = false;
         bool prjModified = false;
-        public const string version = "2.0";
+        public const string version = "1.7a";
         public string prjName = "Untitled";
         public string prjFileName = "";
         public int codepage = 1251;
@@ -72,7 +80,7 @@ namespace McBitFont {
 
         private void Form1_Load(object sender, EventArgs e) {
             lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
-            dotWidth = (int)nudX.Value;
+            dotWidth  = (int)nudX.Value;
             dotHeight = (int)nudY.Value;
 
             gap = (cellSize < 5) ? 0 : 1;
@@ -100,18 +108,16 @@ namespace McBitFont {
             if (Environment.GetCommandLineArgs().Length > 1) {
                 loadProject(Environment.GetCommandLineArgs()[1]);
             }
-
-            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
         }
 
         [DllImport("user32.dll")]
         public static extern int SendMessage(IntPtr hWnd, int msg, IntPtr wParam, IntPtr lParam);
-
+        
         public int MakeLong(short lowPart, short highPart) {
             return (int)(((ushort)lowPart) | (uint)(highPart << 16));
         }
 
-        FrameMiniature copyFrame(FrameMiniature frame) {
+        FrameMiniature copyFrame(FrameMiniature frame) { 
             var ff = new FrameMiniature(frame.code, frame.width, frame.height);
             Array.Copy(frame.data, ff.data, frame.data.Length);
             return ff;
@@ -199,9 +205,9 @@ namespace McBitFont {
             ff.width = neww;
             ff.height = newh;
             t = new bool[neww, newh];
-            for (int i = 0; i < imax; i++) {
+            for (int i=0; i<imax; i++) {
-                for (int j = 0; j < jmax; j++) {
+                for (int j=0;j<jmax; j++) {
-                    if (i + di >= 0 && j + dj >= 0) t[i, j] = ff.data[i + di, j + dj];
+                    if (i+di >= 0 && j+dj >= 0) t[i, j] = ff.data[i + di, j + dj];
                 }
             }
             ff.data = t;
@@ -232,7 +238,7 @@ namespace McBitFont {
                 hScroll.Minimum = 0;
                 hScroll.Enabled = true;
             }
-
+            
             if (h <= dotPanel.Height) {
                 vScroll.Enabled = false;
                 vScroll.Value = 0;
@@ -347,7 +353,7 @@ namespace McBitFont {
             bool c;
             for (int i = 0; i < dotWidth; i++) {
                 c = f.data[i, dotHeight - 1];
-                for (int j = dotHeight - 1; j >= 0; j--) {
+                for (int j = dotHeight-1; j >= 0; j--) {
                     if (j == 0) {
                         f.data[i, j] = c;
                     } else {
@@ -448,7 +454,7 @@ namespace McBitFont {
             for (int i = 0; i < m.width; i++) {
                 for (int j = 0; j < m.height; j++) {
                     c = m.data[i, j] ? Color.Black : Color.White;
-                    bmp.SetPixel(i + imin, j + jmin, c);
+                    bmp.SetPixel(i+imin, j+jmin, c);
                 }
             }
             var sizedBMP = new Bitmap(bmp, new Size(50, 50));
@@ -464,19 +470,19 @@ namespace McBitFont {
             Pen p = new Pen(Color.FromArgb(64, Color.Green));
             int x, y;
 
-            for (int i = 0; i < dotWidth; i++) {
+            for (int i=0; i<dotWidth; i++) {
                 x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
                 if (gap > 0 && i != 0 && (i % 8) == 0) {
                     g.DrawLine(p, x - 1, pixelOffset - vScroll.Value, x - 1, h);
                 }
-                for (int j = 0; j < dotHeight; j++) {
+                for (int j=0; j<dotHeight; j++) {
                     y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
                     if (gap > 0 && i == 0 && j != 0 && (j % 8) == 0) {
-                        g.DrawLine(p, pixelOffset - hScroll.Value, y - 1, w, y - 1);
+                        g.DrawLine(p, pixelOffset - hScroll.Value, y-1, w, y-1);
                     }
                     if (f.data[i, j]) sb = sbb;
                     else sb = sbw;
-                    g.FillRectangle(sb, x, (baseline == j ? y + 1 : y), cellSize, (baseline == j ? cellSize - 1 : cellSize));
+                    g.FillRectangle(sb, x, (baseline == j ? y+1 : y), cellSize, (baseline == j ? cellSize-1 : cellSize));
                 }
             }
 
@@ -545,7 +551,7 @@ namespace McBitFont {
                 nudY.Value = newh;
                 FrameMiniature newf;
                 if (form.cbSingle.Checked) {
-                    frames.Add(new FrameMiniature(0, neww, newh));
+                    frames.Add( new FrameMiniature(0, neww, newh));
                     //f = frames.Find(x => x.code == 0);
                     append = "Single";
                     monospaced = false;
@@ -557,20 +563,20 @@ namespace McBitFont {
                     } else {
                         if (form.cbNotPrintable.Checked) imin = 0;
                         else if (form.cbLatin.Checked) imin = 32;
-                        else imin = 128;
+                        else  imin = 128;
 
                         if (form.cbExtended.Checked) imax = 255;
                         else if (form.cbLatin.Checked) imax = 127;
                         else imax = 31;
                     }
 
-
+                    
                     for (i = imin; i <= imax; i++) {
                         newf = new FrameMiniature(i, neww, newh);
                         if (form.cbFontBased.Checked) newf = fillFrame(newf, form.dlgFont.Font, (int)form.nudShiftX.Value, (int)form.nudShiftY.Value);
                         frames.Add(newf);
                     }
-
+                    
                     monospaced = form.rbMono.Checked;
                 }
                 lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
@@ -579,7 +585,7 @@ namespace McBitFont {
                     var s = ff.code.ToString().PadLeft(3, '0');
                     ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
                     var sss = decodeSymbol(ff.code);
-                    miniList.Items.Add(s, s + ' ' + append + sss, s);
+                    miniList.Items.Add(s, s+' '+append+sss, s);
                 }
                 f = copyFrame(frames.First());
                 dotPanel.Refresh();
@@ -603,8 +609,6 @@ namespace McBitFont {
             checkModifiedFrame();
             if (miniList.SelectedItems.Count == 0) {
                 removeSymbolToolStripMenuItem.Enabled = false;
-                removeBeforeToolStripMenuItem.Enabled = false;
-                removeAfterToolStripMenuItem.Enabled = false;
                 copyToolStripMenuItem.Enabled = false;
                 pasteToolStripMenuItem.Enabled = false;
                 return;
@@ -624,17 +628,6 @@ namespace McBitFont {
                 removeSymbolToolStripMenuItem.Enabled = false;
             }
             copyToolStripMenuItem.Enabled = true;
-            if (ff.Equals(frames.First())) {
-                removeBeforeToolStripMenuItem.Enabled = false;
-                removeAfterToolStripMenuItem.Enabled = true;
-            } else if (ff.Equals(frames.Last())) {
-                removeBeforeToolStripMenuItem.Enabled = true;
-                removeAfterToolStripMenuItem.Enabled = false;
-            } else {
-                removeBeforeToolStripMenuItem.Enabled = true;
-                removeAfterToolStripMenuItem.Enabled = true;
-            }
-
             if (fbuffer) pasteToolStripMenuItem.Enabled = true;
             else pasteToolStripMenuItem.Enabled = false;
         }
@@ -642,15 +635,29 @@ namespace McBitFont {
         private void saveToolStripMenuItem_Click(object sender, EventArgs e) {
             checkModifiedFrame();
             if (dlgSave.ShowDialog() == DialogResult.OK) {
-                saveProject(dlgSave.FileName);
+                SaveBlock sav;
+                sav.monospaced = monospaced;
+                sav.frames = frames;
+                sav.codepage = codepage;
+                sav.baseline = baseline;
+                BinaryFormatter formatter = new BinaryFormatter();
+                using (Stream ms = File.OpenWrite(dlgSave.FileName)) {
+                    formatter.Serialize(ms, sav);
+                    ms.Close();
+                }
+                prjModified = false;
+                prjName = Path.GetFileNameWithoutExtension(dlgSave.FileName);
+                prjFileName = dlgSave.FileName;
+                this.Text = "McBitFont " + version + " - " + prjName;
             }
         }
 
         private void loadProject(string filename) {
             SaveBlock sav;
+            BinaryFormatter formatter = new BinaryFormatter();
 
             using (FileStream fs = File.Open(filename, FileMode.Open)) {
-                sav = MessagePackSerializer.Deserialize<SaveBlock>(fs);
+                sav = (SaveBlock)formatter.Deserialize(fs);
                 fs.Close();
             }
             monospaced = sav.monospaced;
@@ -692,9 +699,9 @@ namespace McBitFont {
             sav.frames = frames;
             sav.codepage = codepage;
             sav.baseline = baseline;
-
+            BinaryFormatter formatter = new BinaryFormatter();
             using (Stream ms = File.OpenWrite(filename)) {
-                MessagePackSerializer.Serialize(ms, sav);
+                formatter.Serialize(ms, sav);
                 ms.Close();
             }
             prjModified = false;
@@ -737,7 +744,7 @@ namespace McBitFont {
                 ff = new FrameMiniature(frames.Last().code + 1, dotWidth, dotHeight);
                 frames.Add(ff);
             }
-
+            
             var s = ff.code.ToString().PadLeft(3, '0');
             ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
             var sss = decodeSymbol(ff.code);
@@ -768,11 +775,11 @@ namespace McBitFont {
                 Array.Copy(fbuf.data, f.data, fbuf.data.Length);
             } else {
                 var wmax = (fbuf.width > f.width) ? f.width : fbuf.width;
-                var hmax = (fbuf.height > f.height) ? f.height : fbuf.height;
+                var hmax = (fbuf.height >  f.height) ? f.height : fbuf.height;
 
                 for (int i = 0; i < wmax; i++) {
                     for (int j = 0; j < hmax; j++) {
-                        f.data[i, j] = fbuf.data[i, j];
+                        f.data[i,j] = fbuf.data[i,j];
                     }
                 }
             }
@@ -807,7 +814,7 @@ namespace McBitFont {
                 checkModifiedFrame();
                 saveProject(prjFileName);
             }
-
+            
         }
 
         private void btnClear_Click(object sender, EventArgs e) {
@@ -816,6 +823,75 @@ namespace McBitFont {
             dotPanel.Refresh();
         }
 
+        private void saveJSONToolStripMenuItem_Click(object sender, EventArgs e) {
+            checkModifiedFrame();
+            if (dlgSave.ShowDialog() == DialogResult.OK) {
+                SaveBlock sav;
+                sav.monospaced = monospaced;
+                sav.frames = frames;
+                sav.codepage = codepage;
+                sav.baseline = baseline;
+                using (Stream ms = File.OpenWrite(dlgSave.FileName)) {
+                    // TODO: Serializer here
+                    MessagePackSerializer.Serialize(ms, sav);
+                    ms.Close();
+                }
+                prjModified = false;
+                prjName = Path.GetFileNameWithoutExtension(dlgSave.FileName);
+                prjFileName = dlgSave.FileName;
+                this.Text = "McBitFont " + version + " - " + prjName;
+            }
+        }
+
+        private void openDEVToolStripMenuItem_Click(object sender, EventArgs e) {
+            if (prjModified) {
+                if (MessageBox.Show("The project is modified.\nDo you want to save it first?", "Project was modified!", MessageBoxButtons.YesNo) == DialogResult.Yes) {
+                    saveAsToolStripMenuItem.PerformClick();
+                    return;
+                }
+            }
+            if (dlgOpen.ShowDialog() == DialogResult.OK) {
+                SaveBlock sav;
+
+                var filename = dlgOpen.FileName;
+                using (FileStream fs = File.Open(filename, FileMode.Open)) {
+                    sav = MessagePackSerializer.Deserialize<SaveBlock>(fs);
+                    fs.Close();
+                }
+                monospaced = sav.monospaced;
+                codepage = sav.codepage;
+                baseline = sav.baseline;
+                lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
+                frames = sav.frames;
+                miniList.Items.Clear();
+                ilMiniatures.Images.Clear();
+                foreach (FrameMiniature ff in frames) {
+                    var s = ff.code.ToString().PadLeft(3, '0');
+                    var sss = decodeSymbol(ff.code);
+                    ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
+                    miniList.Items.Add(s, s + ' ' + sss, s);
+                }
+                nudX.ValueChanged -= nudX_ValueChanged;
+                nudY.ValueChanged -= nudY_ValueChanged;
+                nudX.Value = frames.First().width;
+                nudY.Value = frames.First().height;
+                dotResize((int)nudX.Value, (int)nudY.Value);
+                nudX.ValueChanged += nudX_ValueChanged;
+                nudY.ValueChanged += nudY_ValueChanged;
+                f = copyFrame(frames.First());
+                dotPanel.Refresh();
+                miniList.Refresh();
+                modified = false;
+                prjModified = false;
+
+                prjFileName = filename;
+                prjName = Path.GetFileNameWithoutExtension(filename);
+                this.Text = "McBitFont " + version + " - " + prjName;
+                checkForAdd();
+                fbuffer = false;
+            }
+        }
+
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e) {
             if (prjModified) {
                 if (MessageBox.Show("The project is modified.\nAre you sure you want to quit?", "Are you sure?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) {
@@ -830,35 +906,5 @@ namespace McBitFont {
             dotPanel.Refresh();
         }
 
-        // Remove all before or after specified symbol
-        private void removeBA(bool before) {
-            if (miniList.SelectedItems.Count == 0) {
-                removeBeforeToolStripMenuItem.Enabled = false;
-                removeAfterToolStripMenuItem.Enabled = false;
-                return;
-            }
-            int step = before ? -1 : 1;
-            var sel = miniList.SelectedItems[0].ImageKey;
-            int code = Convert.ToInt32(sel);
-            int findex;
-
-            while (miniList.Items.ContainsKey((code + step).ToString().PadLeft(3, '0'))) {
-                code += step;
-                findex = frames.FindIndex(x => x.code == code);
-                frames.RemoveAt(findex);
-                miniList.Items.RemoveByKey(code.ToString().PadLeft(3, '0'));
-            }
-            //dotPanel.Refresh();
-            miniList.Refresh();
-            prjModified = true;
-        }
-
-        private void removeBeforeToolStripMenuItem_Click(object sender, EventArgs e) {
-            removeBA(true);
-        }
-
-        private void removeAfterToolStripMenuItem_Click(object sender, EventArgs e) {
-            removeBA(false);
-        }
     }
 }

McBitFont/Form1.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
+    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the
+    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes
+    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
+    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support
+    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture.
+    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
+    
-    The mimetype is used for serialized objects, and tells the
+    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not
+    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
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can
+    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/McBitFont.csproj

@@ -1,7 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <TargetFramework>net9.0-windows</TargetFramework>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7C01529E-4414-405F-9B57-19FA4AF8ED60}</ProjectGuid>
     <OutputType>WinExe</OutputType>
+    <RootNamespace>McBitFont</RootNamespace>
+    <AssemblyName>McBitFont</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -13,33 +27,229 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <ApplicationVersion>1.7.0.0</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <UseWindowsForms>true</UseWindowsForms>
-    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <ApplicationIcon>icon_64.ico</ApplicationIcon>
-    <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>embedded</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <DebugSymbols>true</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icon_64.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>0A7368787FA9EE4B7327F4CB5CD09A2A4CBF3168</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>McBitFont_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Costura, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.6.0.0\lib\netstandard2.0\Costura.dll</HintPath>
+    </Reference>
+    <Reference Include="MessagePack, Version=3.1.3.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
+      <HintPath>..\packages\MessagePack.3.1.3\lib\net472\MessagePack.dll</HintPath>
+    </Reference>
+    <Reference Include="MessagePack.Annotations, Version=3.1.3.0, Culture=neutral, PublicKeyToken=b4a0369545f0a1be, processorArchitecture=MSIL">
+      <HintPath>..\packages\MessagePack.Annotations.3.1.3\lib\netstandard2.0\MessagePack.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.NET.StringTools, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.NET.StringTools.17.11.4\lib\net472\Microsoft.NET.StringTools.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="About.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="About.Designer.cs">
+      <DependentUpon>About.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Export.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Export.Designer.cs">
+      <DependentUpon>Export.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Form1.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Form1.Designer.cs">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </Compile>
+    <Compile Include="New.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="New.Designer.cs">
+      <DependentUpon>New.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <EmbeddedResource Include="About.resx">
+      <DependentUpon>About.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Export.resx">
+      <DependentUpon>Export.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="New.resx">
+      <DependentUpon>New.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <None Include="McBitFont_TemporaryKey.pfx" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\action_add.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\action_remove.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\arrow_back.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\arrow_down.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\arrow_next.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\arrow_top.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\file.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\folder_open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\save.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\action_check.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Shape-flip-vertical.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Shape-flip-horizontal.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Page-paste.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Page-copy.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Door-out.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Disk.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Page-white.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Folder-page.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Famfamfam-Silk-Folder.16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\Ionic-Ionicons-Invert-mode-outline.16.png" />
+  </ItemGroup>
   <ItemGroup>
     <Content Include="icon.ico" />
     <Content Include="icon_64.ico" />
-    <PackageReference Include="MessagePack" Version="3.1.3" />
+    <None Include="Resources\icon_64.png" />
-    <PackageReference Include="MessagePack.Annotations" Version="3.1.3" />
+    <None Include="Resources\icon_32.png" />
-    <PackageReference Include="MessagePackAnalyzer" Version="3.1.3" />
+    <None Include="Resources\icon.png" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.5" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.NET.StringTools" Version="17.11.4" />
-    <PackageReference Include="System.Collections.Immutable" Version="9.0.5" />
-    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.1.2" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.5" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
       <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 и x64%29</ProductName>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
       <Install>true</Install>
     </BootstrapperPackage>
     <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -48,4 +258,17 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\MessagePackAnalyzer.3.1.3\build\MessagePackAnalyzer.targets" Condition="Exists('..\packages\MessagePackAnalyzer.3.1.3\build\MessagePackAnalyzer.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MessagePackAnalyzer.3.1.3\build\MessagePackAnalyzer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MessagePackAnalyzer.3.1.3\build\MessagePackAnalyzer.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.8.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.8.2\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
+  </Target>
+  <Import Project="..\packages\Fody.6.8.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.8.2\build\Fody.targets')" />
+  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
 </Project>

McBitFont/Properties/AssemblyInfo.cs

@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Общие сведения об этой сборке предоставляются следующим набором
+// набора атрибутов. Измените значения этих атрибутов для изменения сведений,
+// связанных со сборкой.
+[assembly: AssemblyTitle("McBitFont")]
+[assembly: AssemblyDescription("McFLY's Bit Font and Image Editor")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("McBitFont")]
+[assembly: AssemblyCopyright("© Anton Mukhin, 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
+// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
+// COM, следует установить атрибут ComVisible в TRUE для этого типа.
+[assembly: ComVisible(false)]
+
+// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+[assembly: Guid("7c01529e-4414-405f-9b57-19fa4af8ed60")]
+
+// Сведения о версии сборки состоят из указанных ниже четырех значений:
+//
+//      Основной номер версии
+//      Дополнительный номер версии
+//      Номер сборки
+//      Редакция
+//
+// Можно задать все значения или принять номера сборки и редакции по умолчанию 
+// используя "*", как показано ниже:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.7.0.0")]
+[assembly: AssemblyFileVersion("1.7.0.0")]

McBitFont/packages.config

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Costura.Fody" version="6.0.0" targetFramework="net472" developmentDependency="true" />
+  <package id="Fody" version="6.8.2" targetFramework="net472" developmentDependency="true" />
+  <package id="MessagePack" version="3.1.3" targetFramework="net472" />
+  <package id="MessagePack.Annotations" version="3.1.3" targetFramework="net472" />
+  <package id="MessagePackAnalyzer" version="3.1.3" targetFramework="net472" developmentDependency="true" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
+  <package id="Microsoft.NET.StringTools" version="17.11.4" targetFramework="net472" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
+  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net472" />
+  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+</packages>

TODO.txt

@@ -1,9 +1,8 @@
 Application:
-V Migrate from .Net Framework 4.7 to .NET 9
 
 Functionality:
 - Context menu in symbol navigator
-V Delete symbols before/after selected
+- Delete symbols before/after selected
 - Shift all symbols on code line (change symbol codes)
 - Specify starting code (extends the shift)
 - Ability to make monospaced font a variable width one