More keyboard shortcuts

Fixed open file procedure - minilist code leading zeroes
Files re-arrange in the repo; Screenshots; Update readme.md
2023-05-16 21:52:36 +03:00 · 2023-05-16 21:38:30 +03:00 · 2023-05-16 09:58:17 +03:00
14 changed files with 141 additions and 72 deletions
--- a/McBitFont/Form1.Designer.cs
+++ b/McBitFont/Form1.Designer.cs
@@ -50,22 +50,18 @@
            this.label5 = new System.Windows.Forms.Label();
            this.menuStrip1 = new System.Windows.Forms.MenuStrip();
            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.dlgSave = new System.Windows.Forms.SaveFileDialog();
-            this.dlgOpen = new System.Windows.Forms.OpenFileDialog();
            this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.appendSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.removeSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.shiftUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.shiftDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.shiftLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -73,6 +69,10 @@
            this.invertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.mirrorXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
            this.mirrorYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.dlgSave = new System.Windows.Forms.SaveFileDialog();
+            this.dlgOpen = new System.Windows.Forms.OpenFileDialog();
            ((System.ComponentModel.ISupportInitialize)(this.nudX)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.nudY)).BeginInit();
            this.panel1.SuspendLayout();
@@ -407,60 +407,6 @@
            this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
            this.fileToolStripMenuItem.Text = "File";
            // 
-            // editToolStripMenuItem
-            // 
-            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.copyToolStripMenuItem,
-            this.pasteToolStripMenuItem,
-            this.prependSymbolToolStripMenuItem,
-            this.appendSymbolToolStripMenuItem,
-            this.removeSymbolToolStripMenuItem,
-            this.applyToolStripMenuItem});
-            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
-            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
-            this.editToolStripMenuItem.Text = "Edit";
-            // 
-            // toolsToolStripMenuItem
-            // 
-            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.shiftUpToolStripMenuItem,
-            this.shiftDownToolStripMenuItem,
-            this.shiftLeftToolStripMenuItem,
-            this.shiftRightToolStripMenuItem,
-            this.invertToolStripMenuItem,
-            this.mirrorXToolStripMenuItem,
-            this.mirrorYToolStripMenuItem,
-            this.exportToolStripMenuItem});
-            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
-            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
-            this.toolsToolStripMenuItem.Text = "Tools";
-            // 
-            // exportToolStripMenuItem
-            // 
-            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
-            this.exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
-            this.exportToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
-            this.exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
-            this.exportToolStripMenuItem.Text = "Export";
-            this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // aboutToolStripMenuItem
-            // 
-            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
-            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
-            this.aboutToolStripMenuItem.Text = "About";
-            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
-            // 
-            // dlgSave
-            // 
-            this.dlgSave.DefaultExt = "mbf";
-            this.dlgSave.Filter = "McBitFont files|*.mbf|All files|*.*";
-            // 
-            // dlgOpen
-            // 
-            this.dlgOpen.DefaultExt = "mbf";
-            this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*";
-            // 
            // newToolStripMenuItem
            // 
            this.newToolStripMenuItem.Image = global::McBitFont.Properties.Resources.file;
@@ -501,6 +447,19 @@
            this.exitToolStripMenuItem.Text = "Exit";
            this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
            // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.copyToolStripMenuItem,
+            this.pasteToolStripMenuItem,
+            this.prependSymbolToolStripMenuItem,
+            this.appendSymbolToolStripMenuItem,
+            this.removeSymbolToolStripMenuItem,
+            this.applyToolStripMenuItem});
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
+            this.editToolStripMenuItem.Text = "Edit";
+            // 
            // copyToolStripMenuItem
            // 
            this.copyToolStripMenuItem.Enabled = false;
@@ -508,7 +467,7 @@
            this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
            this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C";
            this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.copyToolStripMenuItem.Text = "Copy";
            this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
            // 
@@ -519,7 +478,7 @@
            this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
            this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V";
            this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
-            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.pasteToolStripMenuItem.Text = "Paste";
            this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
            // 
@@ -528,7 +487,9 @@
            this.prependSymbolToolStripMenuItem.Enabled = false;
            this.prependSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add;
            this.prependSymbolToolStripMenuItem.Name = "prependSymbolToolStripMenuItem";
-            this.prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.prependSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Ins";
+            this.prependSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert)));
+            this.prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.prependSymbolToolStripMenuItem.Text = "Prepend symbol";
            this.prependSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click);
            // 
@@ -537,7 +498,9 @@
            this.appendSymbolToolStripMenuItem.Enabled = false;
            this.appendSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add;
            this.appendSymbolToolStripMenuItem.Name = "appendSymbolToolStripMenuItem";
-            this.appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.appendSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+End";
+            this.appendSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.End)));
+            this.appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.appendSymbolToolStripMenuItem.Text = "Append symbol";
            this.appendSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click);
            // 
@@ -546,7 +509,9 @@
            this.removeSymbolToolStripMenuItem.Enabled = false;
            this.removeSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_remove;
            this.removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem";
-            this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.removeSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Del";
+            this.removeSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete)));
+            this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.removeSymbolToolStripMenuItem.Text = "Remove symbol";
            this.removeSymbolToolStripMenuItem.Click += new System.EventHandler(this.removeSymbolToolStripMenuItem_Click);
            // 
@@ -554,10 +519,27 @@
            // 
            this.applyToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_check;
            this.applyToolStripMenuItem.Name = "applyToolStripMenuItem";
-            this.applyToolStripMenuItem.Size = new System.Drawing.Size(160, 22);
+            this.applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space";
+            this.applyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space)));
+            this.applyToolStripMenuItem.Size = new System.Drawing.Size(212, 22);
            this.applyToolStripMenuItem.Text = "Apply";
            this.applyToolStripMenuItem.Click += new System.EventHandler(this.button2_Click);
            // 
+            // toolsToolStripMenuItem
+            // 
+            this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.shiftUpToolStripMenuItem,
+            this.shiftDownToolStripMenuItem,
+            this.shiftLeftToolStripMenuItem,
+            this.shiftRightToolStripMenuItem,
+            this.invertToolStripMenuItem,
+            this.mirrorXToolStripMenuItem,
+            this.mirrorYToolStripMenuItem,
+            this.exportToolStripMenuItem});
+            this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem";
+            this.toolsToolStripMenuItem.Size = new System.Drawing.Size(46, 20);
+            this.toolsToolStripMenuItem.Text = "Tools";
+            // 
            // shiftUpToolStripMenuItem
            // 
            this.shiftUpToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_top;
@@ -628,6 +610,32 @@
            this.mirrorYToolStripMenuItem.Text = "Mirror Y";
            this.mirrorYToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorY_Click);
            // 
+            // exportToolStripMenuItem
+            // 
+            this.exportToolStripMenuItem.Name = "exportToolStripMenuItem";
+            this.exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E";
+            this.exportToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E)));
+            this.exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22);
+            this.exportToolStripMenuItem.Text = "Export";
+            this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click);
+            // 
+            // aboutToolStripMenuItem
+            // 
+            this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+            this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20);
+            this.aboutToolStripMenuItem.Text = "About";
+            this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click);
+            // 
+            // dlgSave
+            // 
+            this.dlgSave.DefaultExt = "mbf";
+            this.dlgSave.Filter = "McBitFont files|*.mbf|All files|*.*";
+            // 
+            // dlgOpen
+            // 
+            this.dlgOpen.DefaultExt = "mbf";
+            this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*";
+            // 
            // MainForm
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
--- a/McBitFont/Form1.cs
+++ b/McBitFont/Form1.cs
@@ -50,7 +50,7 @@ namespace McBitFont {
        public bool monospaced = false;
        bool modified = false;
        bool prjModified = false;
-        public const string version = "1.1";
+        public const string version = "1.2";
        public string prjName = "Untitled";
        public int codepage = 1251;
        private FrameMiniature fbuf;
@@ -630,7 +630,7 @@ namespace McBitFont {
                miniList.Items.Clear();
                ilMiniatures.Images.Clear();
                foreach (FrameMiniature ff in frames) {
-                    var s = ff.code.ToString();
+                    var s = ff.code.ToString().PadLeft(3, '0');
                    ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
                    miniList.Items.Add(s, s + ' ' + (char)ff.code, s);
                }
--- a/McBitFont/McBitFont.csproj
+++ b/McBitFont/McBitFont.csproj
@@ -12,6 +12,21 @@
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -177,5 +192,17 @@
    <None Include="Resources\icon_32.png" />
    <None Include="Resources\icon.png" />
  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 и x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/McBitFont/Properties/AssemblyInfo.cs
+++ b/McBitFont/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("McBitFont")]
-[assembly: AssemblyCopyright("Anton Mukhin © 2023")]
+[assembly: AssemblyCopyright("© Anton Mukhin, 2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
--- a/README.md
+++ b/README.md
@@ -1,3 +1,37 @@
 # McBitFont

-pixel based Font to C arrays converter
+McFLY's Bit Font and Image Editor
+
+Features:
+- Generate a project based on a font installed in the system
+- Basic pixel manipulations: shift, flip, invert, etc...
+- Save / Load your project for later edits
+- Export as a C array in different formats
+
+Requires .Net Framework 4.7+
+
+Some basic hints on the interface:
+- Mouse 1 to mark a puxel black
+- Mouse 2 to mark a puxel white
+- Drag the mouse holding a button to draw pixels
+- Mouse Scroll to scroll up and down
+- Crtl + scroll to scroll left and right
+- Shift + scroll to zoom
+
+
+Download in the Releases section!
+
+
+### Screenshots:
+
+Main window
+
+![Main window](/images/Screenshot_01.png)
+
+New project dialog
+
+![New project](/images/Screenshot_02.png)
+
+Export dialog
+
+![Export](/images/Screenshot_03.png)
--- a/icons/app/icon.ico
+++ b/icons/app/icon.ico
--- a/icons/app/icon.png
+++ b/icons/app/icon.png
--- a/icons/app/icon_32.ico
+++ b/icons/app/icon_32.ico
--- a/icons/app/icon_32.png
+++ b/icons/app/icon_32.png
--- a/icons/app/icon_64.ico
+++ b/icons/app/icon_64.ico
--- a/icons/app/icon_64.png
+++ b/icons/app/icon_64.png
--- a/images/Screenshot_01.png
+++ b/images/Screenshot_01.png
--- a/images/Screenshot_02.png
+++ b/images/Screenshot_02.png
--- a/images/Screenshot_03.png
+++ b/images/Screenshot_03.png
Author	SHA1	Message	Date
Anton Mukhin	703e8d91ef	More keyboard shortcuts	2023-05-16 21:52:36 +03:00
Anton Mukhin	de8aa295da	Fixed open file procedure - minilist code leading zeroes	2023-05-16 21:38:30 +03:00
Anton Mukhin	232b543a35	Files re-arrange in the repo; Screenshots; Update readme.md	2023-05-16 09:58:17 +03:00