Update TODO; More examples

McBitFont/Export.cs

@@ -88,7 +88,7 @@ namespace McBitFont {
             int imin, jmin, imax, jmax, idir, jdir;
 
             if (com) {
-                //Header comments
+                // Header comments
                 output += comments["header"];
                 output += comments["scan_order"] + cbOrder.Text + "\n";
                 output += comments["scan_hdir"] + cbHDir.Text + "\n";
@@ -107,7 +107,7 @@ namespace McBitFont {
                 }
             }
 
-            //Figure out mins and maxes
+            // Figure out mins and maxes
             if (cbOrder.SelectedIndex == 0) {
                 if (cbHDir.SelectedIndex == 0) {
                     // Columns; Left to right

McBitFont/Form1.cs

@@ -51,7 +51,7 @@ namespace McBitFont {
         public bool monospaced = false;
         bool modified = false;
         bool prjModified = false;
-        public const string version = "1.3";
+        public const string version = "1.6";
         public string prjName = "Untitled";
         public int codepage = 1251;
         private FrameMiniature fbuf;
@@ -89,6 +89,11 @@ namespace McBitFont {
             this.Text = "McBitFont " + version + " - " + prjName;
 
             fbuf = new FrameMiniature(0, dotWidth, dotHeight);
+
+            // Chek for arguments
+            if (Environment.GetCommandLineArgs().Length > 1) {
+                loadProject(Environment.GetCommandLineArgs()[1]);
+            }
         }
 
         [DllImport("user32.dll")]
@@ -141,7 +146,7 @@ namespace McBitFont {
                 for (int i = 0; i < frames.Count; i++) {
                     frames[i] = frameResize(frames[i], (int)nudX.Value, dotHeight);
                     bmp = getMiniPictue(frames[i]);
-                    string s = frames[i].code.ToString();
+                    string s = frames[i].code.ToString().PadLeft(3, '0');
                     ilMiniatures.Images.RemoveByKey(s);
                     ilMiniatures.Images.Add(s, (Image)bmp);
                     miniList.Items[s].ImageKey = s;
@@ -158,11 +163,12 @@ namespace McBitFont {
             for (int i = 0; i < frames.Count; i++) {
                 frames[i] = frameResize(frames[i], dotWidth, (int)nudY.Value);
                 bmp = getMiniPictue(frames[i]);
-                string s = frames[i].code.ToString();
+                string s = frames[i].code.ToString().PadLeft(3, '0');
                 ilMiniatures.Images.RemoveByKey(s);
                 ilMiniatures.Images.Add(s, (Image)bmp);
                 miniList.Items[s].ImageKey = s;
             }
+            if (nudY.Focused) modified = true;
             prjModified = true;
             dotResize(dotWidth, (int)nudY.Value);
         }
@@ -278,17 +284,18 @@ namespace McBitFont {
         }
 
         private void dotPanel_MouseMove(object sender, MouseEventArgs e) {
+            Rectangle rect1, rect2;
             if (set_base) {
 
                 int yy = pixelOffset + baseline * (cellSize + gap) - vScroll.Value - 1;
-                Rectangle rect1 = new Rectangle(pixelOffset, yy, w, 3);
+                rect1 = new Rectangle(pixelOffset, yy, w, 2);
                 baseline = (e.Y - pixelOffset + vScroll.Value) / (cellSize + gap);
 
                 if (baseline >= dotHeight) baseline = dotHeight - 1;
                 if (baseline < 0) baseline = 0;
 
                 yy = pixelOffset + baseline * (cellSize + gap) - vScroll.Value - 1;
-                Rectangle rect2 = new Rectangle(pixelOffset, yy, w, 3);
+                rect2 = new Rectangle(pixelOffset, yy, w, 2);
 
                 dotPanel.Invalidate(rect1);
                 dotPanel.Invalidate(rect2);
@@ -309,8 +316,9 @@ namespace McBitFont {
                 f.data[i, j] = true;
                 int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
                 int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
-                g.FillRectangle(sbb, x, y, cellSize, cellSize);
                 modified = true;
+                rect1 = new Rectangle(x, y, cellSize, cellSize);
+                dotPanel.Invalidate(rect1);
             }
             if (e.Button == MouseButtons.Right && f.data[i, j]) {
                 Graphics g = dotPanel.CreateGraphics();
@@ -318,8 +326,9 @@ namespace McBitFont {
                 f.data[i, j] = false;
                 int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
                 int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
-                g.FillRectangle(sbw, x, y, cellSize, cellSize);
                 modified = true;
+                rect1 = new Rectangle(x, y, cellSize, cellSize);
+                dotPanel.Invalidate(rect1);
             }
 
         }
@@ -473,13 +482,13 @@ namespace McBitFont {
                     }
                     if (f.data[i, j]) sb = sbb;
                     else sb = sbw;
-                    g.FillRectangle(sb, x, y, cellSize, cellSize);
+                    g.FillRectangle(sb, x, (baseline == j ? y+1 : y), cellSize, (baseline == j ? cellSize-1 : cellSize));
                 }
             }
 
             if (baseline > 0 && gap > 0) {
                 x = pixelOffset - hScroll.Value;
-                y = pixelOffset + baseline * (cellSize + gap) - vScroll.Value - 1;
+                y = pixelOffset + baseline * (cellSize + gap) - vScroll.Value;
                 g.DrawLine(
                     new Pen(Color.Blue, 2),
                     x, y,
@@ -571,10 +580,10 @@ namespace McBitFont {
                     monospaced = form.rbMono.Checked;
                 }
                 lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
+                codepage = (form.cbEncoding.SelectedItem as New.EncodingItem).Code;
                 foreach (FrameMiniature ff in frames) {
                     var s = ff.code.ToString().PadLeft(3, '0');
                     ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
-                    codepage =(form.cbEncoding.SelectedItem as New.EncodingItem).Code;
                     var sss = decodeSymbol(ff.code);
                     miniList.Items.Add(s, s+' '+append+sss, s);
                 }
@@ -583,11 +592,14 @@ namespace McBitFont {
                 miniList.Refresh();
                 form.Dispose();
 
+                baseline = 0;
+
                 prjName = "Untitled";
                 this.Text = "McBitFont " + version + " - " + prjName;
                 modified = false;
                 checkForAdd();
                 fbuffer = false;
+                dotPanel.Refresh();
             }
         }
 
@@ -625,6 +637,11 @@ namespace McBitFont {
         }
 
         private void saveToolStripMenuItem_Click(object sender, EventArgs e) {
+            if (modified) {
+                if (MessageBox.Show("Current frame is modified.\nDo you want to apply the changes first?", "The frame was modified!", MessageBoxButtons.YesNo) == DialogResult.Yes) {
+                    saveFrame();
+                }
+            }
             if (dlgSave.ShowDialog() == DialogResult.OK) {
                 SaveBlock sav;
                 sav.monospaced = monospaced;
@@ -642,6 +659,46 @@ namespace McBitFont {
             }
         }
 
+        private void loadProject(string filename) {
+            SaveBlock sav;
+            BinaryFormatter formatter = new BinaryFormatter();
+
+            using (FileStream fs = File.Open(filename, FileMode.Open)) {
+                sav = (SaveBlock)formatter.Deserialize(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;
+
+            prjName = Path.GetFileNameWithoutExtension(filename);
+            this.Text = "McBitFont " + version + " - " + prjName;
+            checkForAdd();
+            fbuffer = false;
+        }
+
         private void openToolStripMenuItem_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) {
@@ -650,42 +707,7 @@ namespace McBitFont {
                 }
             }
             if (dlgOpen.ShowDialog() == DialogResult.OK) {
-                SaveBlock sav;
+                loadProject(dlgOpen.FileName);
-                BinaryFormatter formatter = new BinaryFormatter();
-
-                using (FileStream fs = File.Open(dlgOpen.FileName, FileMode.Open)) {
-                    sav = (SaveBlock)formatter.Deserialize(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');
-                    ilMiniatures.Images.Add(s, (Image)getMiniPictue(ff));
-                    miniList.Items.Add(s, s + ' ' + (char)ff.code, 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;
-                
-                prjName = Path.GetFileNameWithoutExtension(dlgOpen.FileName);
-                this.Text = "McBitFont " + version + " - " + prjName;
-                checkForAdd();
-                fbuffer = false;
             }
         }
 

McBitFont/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.6.0.0")]

TODO.txt

@@ -0,0 +1,23 @@
+Application:
+- Implement "Save" menu
+
+Functionality:
+- Context menu in symbol navigator
+- Delete symbols before/after selected
+- Shift all symbols on code line (change symbol codes)
+- Specify starting code (extends the shift)
+- "Only numbers" range in the New dialog
+- "Specify range" in the New dialog
+- "Single frame", "only numbers" and "specify range" as radio buttons
+- Button to Clear/Fill a block
+- Undo/Redo
+- Image import from a file
+- Import from a text array
+- Copy-paste to a symbol with different size
+- Rectangle selection to mass-paint, shift and mirror pixels
+- Change height of variable width fonts with ability to choose which side to add pixels to
+- Make it possible to have zero width chars in VarWidth fonts
+- "Packed" fonts export
+
+Bugs:
+- Every char changes its width to default on VarWidth font height change!