TODO features:
Application: - Indicate modified project by adding "*" to window caption Functionality: - Copy/Paste should be aware of rectangle selection - Select All function - Select and Select All shortcuts Bugs: - Hostory does not record pastes from clipboard - Undo/Redo menu availability recalculation does not happen sometimes
This commit is contained in:
42
McBitFont/Form1.Designer.cs
generated
42
McBitFont/Form1.Designer.cs
generated
@@ -74,6 +74,7 @@
|
|||||||
copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
fontToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
makeVarWidthToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
makeVarWidthToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
@@ -105,6 +106,7 @@
|
|||||||
label3 = new System.Windows.Forms.Label();
|
label3 = new System.Windows.Forms.Label();
|
||||||
lblSelectionLabel = new System.Windows.Forms.Label();
|
lblSelectionLabel = new System.Windows.Forms.Label();
|
||||||
lblSelection = new System.Windows.Forms.Label();
|
lblSelection = new System.Windows.Forms.Label();
|
||||||
|
lblModified = new System.Windows.Forms.Label();
|
||||||
((System.ComponentModel.ISupportInitialize)nudX).BeginInit();
|
((System.ComponentModel.ISupportInitialize)nudX).BeginInit();
|
||||||
((System.ComponentModel.ISupportInitialize)nudY).BeginInit();
|
((System.ComponentModel.ISupportInitialize)nudY).BeginInit();
|
||||||
panel1.SuspendLayout();
|
panel1.SuspendLayout();
|
||||||
@@ -615,7 +617,7 @@
|
|||||||
//
|
//
|
||||||
// editToolStripMenuItem
|
// 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.Name = "editToolStripMenuItem";
|
||||||
editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
|
editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
|
||||||
editToolStripMenuItem.Text = "Edit";
|
editToolStripMenuItem.Text = "Edit";
|
||||||
@@ -626,7 +628,7 @@
|
|||||||
undoToolStripMenuItem.Image = Properties.Resources.arrow_undo;
|
undoToolStripMenuItem.Image = Properties.Resources.arrow_undo;
|
||||||
undoToolStripMenuItem.Name = "undoToolStripMenuItem";
|
undoToolStripMenuItem.Name = "undoToolStripMenuItem";
|
||||||
undoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z;
|
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.Text = "Undo";
|
||||||
undoToolStripMenuItem.ToolTipText = "Undo last canvas change";
|
undoToolStripMenuItem.ToolTipText = "Undo last canvas change";
|
||||||
undoToolStripMenuItem.Click += undoToolStripMenuItem_Click;
|
undoToolStripMenuItem.Click += undoToolStripMenuItem_Click;
|
||||||
@@ -636,19 +638,18 @@
|
|||||||
redoToolStripMenuItem.Image = Properties.Resources.arrow_redo;
|
redoToolStripMenuItem.Image = Properties.Resources.arrow_redo;
|
||||||
redoToolStripMenuItem.Name = "redoToolStripMenuItem";
|
redoToolStripMenuItem.Name = "redoToolStripMenuItem";
|
||||||
redoToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y;
|
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.Text = "Redo";
|
||||||
redoToolStripMenuItem.ToolTipText = "Redo canvas change";
|
redoToolStripMenuItem.ToolTipText = "Redo canvas change";
|
||||||
redoToolStripMenuItem.Click += redoToolStripMenuItem_Click;
|
redoToolStripMenuItem.Click += redoToolStripMenuItem_Click;
|
||||||
//
|
//
|
||||||
// copyToolStripMenuItem
|
// copyToolStripMenuItem
|
||||||
//
|
//
|
||||||
copyToolStripMenuItem.Enabled = false;
|
|
||||||
copyToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16;
|
copyToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16;
|
||||||
copyToolStripMenuItem.Name = "copyToolStripMenuItem";
|
copyToolStripMenuItem.Name = "copyToolStripMenuItem";
|
||||||
copyToolStripMenuItem.ShortcutKeyDisplayString = "";
|
copyToolStripMenuItem.ShortcutKeyDisplayString = "";
|
||||||
copyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C;
|
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.Text = "Copy";
|
||||||
copyToolStripMenuItem.ToolTipText = "Copy current symbol to clipboard";
|
copyToolStripMenuItem.ToolTipText = "Copy current symbol to clipboard";
|
||||||
copyToolStripMenuItem.Click += copyToolStripMenuItem_Click;
|
copyToolStripMenuItem.Click += copyToolStripMenuItem_Click;
|
||||||
@@ -660,7 +661,7 @@
|
|||||||
pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
|
pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
|
||||||
pasteToolStripMenuItem.ShortcutKeyDisplayString = "";
|
pasteToolStripMenuItem.ShortcutKeyDisplayString = "";
|
||||||
pasteToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V;
|
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.Text = "Paste";
|
||||||
pasteToolStripMenuItem.ToolTipText = "Paste from clipboard to current symbol";
|
pasteToolStripMenuItem.ToolTipText = "Paste from clipboard to current symbol";
|
||||||
pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click;
|
pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click;
|
||||||
@@ -669,10 +670,21 @@
|
|||||||
//
|
//
|
||||||
selectToolStripMenuItem.Image = Properties.Resources.fam_rectt;
|
selectToolStripMenuItem.Image = Properties.Resources.fam_rectt;
|
||||||
selectToolStripMenuItem.Name = "selectToolStripMenuItem";
|
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.Text = "Select";
|
||||||
selectToolStripMenuItem.Click += selectToolStripMenuItem_Click;
|
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.Click += selectAllToolStripMenuItem_Click;
|
||||||
|
//
|
||||||
// fontToolStripMenuItem
|
// 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 });
|
||||||
@@ -998,11 +1010,25 @@
|
|||||||
lblSelection.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
lblSelection.TextAlign = System.Drawing.ContentAlignment.TopRight;
|
||||||
lblSelection.Visible = false;
|
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;
|
||||||
|
//
|
||||||
// MainForm
|
// MainForm
|
||||||
//
|
//
|
||||||
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
|
||||||
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
ClientSize = new System.Drawing.Size(915, 647);
|
ClientSize = new System.Drawing.Size(915, 647);
|
||||||
|
Controls.Add(lblModified);
|
||||||
Controls.Add(lblSelectionLabel);
|
Controls.Add(lblSelectionLabel);
|
||||||
Controls.Add(lblSelection);
|
Controls.Add(lblSelection);
|
||||||
Controls.Add(chkRectSelect);
|
Controls.Add(chkRectSelect);
|
||||||
@@ -1129,6 +1155,8 @@
|
|||||||
private System.Windows.Forms.ToolStripMenuItem importTextToolStripMenuItem1;
|
private System.Windows.Forms.ToolStripMenuItem importTextToolStripMenuItem1;
|
||||||
private System.Windows.Forms.Label lblSelectionLabel;
|
private System.Windows.Forms.Label lblSelectionLabel;
|
||||||
private System.Windows.Forms.Label lblSelection;
|
private System.Windows.Forms.Label lblSelection;
|
||||||
|
private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem;
|
||||||
|
private System.Windows.Forms.Label lblModified;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -83,6 +83,18 @@ namespace McBitFont {
|
|||||||
lblSelection.Text = width.ToString() + ',' + height.ToString();
|
lblSelection.Text = width.ToString() + ',' + height.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetModified(bool modif = true, bool prj = false) {
|
||||||
|
string suffix = "";
|
||||||
|
if (prj) {
|
||||||
|
prjModified = modif;
|
||||||
|
if (modif) suffix = " *";
|
||||||
|
SetWindowCap(suffix);
|
||||||
|
} else {
|
||||||
|
modified = modif;
|
||||||
|
lblModified.Visible = modif;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void Form1_Load(object sender, EventArgs e) {
|
private void Form1_Load(object sender, EventArgs e) {
|
||||||
lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
|
lblType.Text = monospaced ? "Monospaced" : "Variable width / Single";
|
||||||
tsmiMakeVarWidth.Visible = monospaced;
|
tsmiMakeVarWidth.Visible = monospaced;
|
||||||
@@ -134,9 +146,19 @@ namespace McBitFont {
|
|||||||
return (int)(((ushort)lowPart) | (uint)(highPart << 16));
|
return (int)(((ushort)lowPart) | (uint)(highPart << 16));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static FrameMiniature CopyFrame(FrameMiniature frame) {
|
private FrameMiniature CopyFrame(FrameMiniature frame, bool clipboard = false) {
|
||||||
var ff = new FrameMiniature(frame.code, frame.width, frame.height);
|
int width = chkRectSelect.Checked ? selection2.X - selection1.X + 1 : frame.width;
|
||||||
|
int height = chkRectSelect.Checked ? selection2.Y - selection1.Y + 1 : frame.height;
|
||||||
|
var ff = new FrameMiniature(frame.code, width, height);
|
||||||
|
|
||||||
|
if (chkRectSelect.Checked && clipboard) {
|
||||||
|
for (int i = 0; i <= selection2.X - selection1.X; i++)
|
||||||
|
for (int j = 0; j <= selection2.Y - selection1.Y; j++) {
|
||||||
|
ff.data[i, j] = frame.data[i + selection1.X, j + selection1.Y];
|
||||||
|
}
|
||||||
|
} else
|
||||||
Array.Copy(frame.data, ff.data, frame.data.Length);
|
Array.Copy(frame.data, ff.data, frame.data.Length);
|
||||||
|
|
||||||
return ff;
|
return ff;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,10 +205,10 @@ namespace McBitFont {
|
|||||||
ilMiniatures.Images.Add(s, (Image)bmp);
|
ilMiniatures.Images.Add(s, (Image)bmp);
|
||||||
miniList.Items[s].ImageKey = s;
|
miniList.Items[s].ImageKey = s;
|
||||||
}
|
}
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
}
|
}
|
||||||
if (nudX.Focused) {
|
if (nudX.Focused) {
|
||||||
modified = true;
|
SetModified();
|
||||||
}
|
}
|
||||||
|
|
||||||
DotResize((int)nudX.Value, dotHeight);
|
DotResize((int)nudX.Value, dotHeight);
|
||||||
@@ -205,8 +227,8 @@ namespace McBitFont {
|
|||||||
miniList.Items[s].ImageKey = s;
|
miniList.Items[s].ImageKey = s;
|
||||||
}
|
}
|
||||||
if (nudY.Focused) {
|
if (nudY.Focused) {
|
||||||
modified = true;
|
SetModified();
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
DotResize(dotWidth, (int)nudY.Value);
|
DotResize(dotWidth, (int)nudY.Value);
|
||||||
@@ -318,7 +340,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -341,7 +363,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -364,7 +386,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -386,7 +408,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -497,7 +519,7 @@ namespace McBitFont {
|
|||||||
fChanged = true;
|
fChanged = true;
|
||||||
int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
|
int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
|
||||||
int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
|
int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
|
||||||
modified = true;
|
SetModified();
|
||||||
rect1 = new Rectangle(x, y, cellSize, cellSize);
|
rect1 = new Rectangle(x, y, cellSize, cellSize);
|
||||||
dotPanel.Invalidate(rect1);
|
dotPanel.Invalidate(rect1);
|
||||||
}
|
}
|
||||||
@@ -506,7 +528,7 @@ namespace McBitFont {
|
|||||||
fChanged = true;
|
fChanged = true;
|
||||||
int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
|
int x = pixelOffset + i * (cellSize + gap) - hScroll.Value;
|
||||||
int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
|
int y = pixelOffset + j * (cellSize + gap) - vScroll.Value;
|
||||||
modified = true;
|
SetModified();
|
||||||
rect1 = new Rectangle(x, y, cellSize, cellSize);
|
rect1 = new Rectangle(x, y, cellSize, cellSize);
|
||||||
dotPanel.Invalidate(rect1);
|
dotPanel.Invalidate(rect1);
|
||||||
}
|
}
|
||||||
@@ -528,7 +550,7 @@ namespace McBitFont {
|
|||||||
|
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -552,7 +574,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -576,7 +598,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,7 +609,7 @@ namespace McBitFont {
|
|||||||
} else {
|
} else {
|
||||||
f = CopyFrame(frames.Find(x => x.code == f.code));
|
f = CopyFrame(frames.Find(x => x.code == f.code));
|
||||||
}
|
}
|
||||||
modified = false;
|
SetModified(false); ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -608,8 +630,8 @@ namespace McBitFont {
|
|||||||
ilMiniatures.Images.RemoveByKey(s);
|
ilMiniatures.Images.RemoveByKey(s);
|
||||||
ilMiniatures.Images.Add(s, (Image)sizedBMP);
|
ilMiniatures.Images.Add(s, (Image)sizedBMP);
|
||||||
sizedBMP.Dispose();
|
sizedBMP.Dispose();
|
||||||
modified = false;
|
SetModified(false);
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Bitmap GetMiniPictue(FrameMiniature m) {
|
private static Bitmap GetMiniPictue(FrameMiniature m) {
|
||||||
@@ -792,7 +814,7 @@ namespace McBitFont {
|
|||||||
prjName = "Untitled";
|
prjName = "Untitled";
|
||||||
prjFileName = "";
|
prjFileName = "";
|
||||||
SetWindowCap();
|
SetWindowCap();
|
||||||
modified = false;
|
SetModified(false); ;
|
||||||
CheckForAdd();
|
CheckForAdd();
|
||||||
fbuffer = false;
|
fbuffer = false;
|
||||||
miniList.Items[0].Selected = true;
|
miniList.Items[0].Selected = true;
|
||||||
@@ -816,7 +838,7 @@ namespace McBitFont {
|
|||||||
tsmiRemoveSymbol.Enabled = false;
|
tsmiRemoveSymbol.Enabled = false;
|
||||||
tsmiRemoveBefore.Enabled = false;
|
tsmiRemoveBefore.Enabled = false;
|
||||||
tsmiRemoveAfter.Enabled = false;
|
tsmiRemoveAfter.Enabled = false;
|
||||||
copyToolStripMenuItem.Enabled = false;
|
//copyToolStripMenuItem.Enabled = false;
|
||||||
pasteToolStripMenuItem.Enabled = false;
|
pasteToolStripMenuItem.Enabled = false;
|
||||||
return;
|
return;
|
||||||
//miniList.Items[0].Selected = true;
|
//miniList.Items[0].Selected = true;
|
||||||
@@ -840,7 +862,7 @@ namespace McBitFont {
|
|||||||
removeSymbolToolStripMenuItem.Enabled = false;
|
removeSymbolToolStripMenuItem.Enabled = false;
|
||||||
tsmiRemoveSymbol.Enabled = false;
|
tsmiRemoveSymbol.Enabled = false;
|
||||||
}
|
}
|
||||||
copyToolStripMenuItem.Enabled = true;
|
//copyToolStripMenuItem.Enabled = true;
|
||||||
if (ff.Equals(frames.First())) {
|
if (ff.Equals(frames.First())) {
|
||||||
removeBeforeToolStripMenuItem.Enabled = false;
|
removeBeforeToolStripMenuItem.Enabled = false;
|
||||||
removeAfterToolStripMenuItem.Enabled = true;
|
removeAfterToolStripMenuItem.Enabled = true;
|
||||||
@@ -897,14 +919,16 @@ namespace McBitFont {
|
|||||||
nudY.ValueChanged -= nudY_ValueChanged;
|
nudY.ValueChanged -= nudY_ValueChanged;
|
||||||
nudX.Value = frames.First().width;
|
nudX.Value = frames.First().width;
|
||||||
nudY.Value = frames.First().height;
|
nudY.Value = frames.First().height;
|
||||||
|
selection1.X = 0; selection1.Y = 0;
|
||||||
|
selection2.X = (int)nudX.Value - 1; selection2.Y = (int)nudY.Value - 1;
|
||||||
DotResize((int)nudX.Value, (int)nudY.Value);
|
DotResize((int)nudX.Value, (int)nudY.Value);
|
||||||
nudX.ValueChanged += nudX_ValueChanged;
|
nudX.ValueChanged += nudX_ValueChanged;
|
||||||
nudY.ValueChanged += nudY_ValueChanged;
|
nudY.ValueChanged += nudY_ValueChanged;
|
||||||
f = CopyFrame(frames.First());
|
f = CopyFrame(frames.First());
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
miniList.Refresh();
|
miniList.Refresh();
|
||||||
modified = false;
|
SetModified(false);
|
||||||
prjModified = false;
|
SetModified(false, true);
|
||||||
|
|
||||||
prjFileName = filename;
|
prjFileName = filename;
|
||||||
prjName = Path.GetFileNameWithoutExtension(filename);
|
prjName = Path.GetFileNameWithoutExtension(filename);
|
||||||
@@ -914,6 +938,7 @@ namespace McBitFont {
|
|||||||
|
|
||||||
CheckForAdd();
|
CheckForAdd();
|
||||||
fbuffer = false;
|
fbuffer = false;
|
||||||
|
//copyToolStripMenuItem.Enabled = true;
|
||||||
|
|
||||||
// Re-create history object
|
// Re-create history object
|
||||||
history = new CanvasHistory();
|
history = new CanvasHistory();
|
||||||
@@ -936,14 +961,14 @@ namespace McBitFont {
|
|||||||
MessagePackSerializer.Serialize(ms, sav);
|
MessagePackSerializer.Serialize(ms, sav);
|
||||||
ms.Close();
|
ms.Close();
|
||||||
}
|
}
|
||||||
prjModified = false;
|
|
||||||
prjName = Path.GetFileNameWithoutExtension(filename);
|
prjName = Path.GetFileNameWithoutExtension(filename);
|
||||||
prjFileName = filename;
|
prjFileName = filename;
|
||||||
SetWindowCap();
|
SetModified(false, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetWindowCap() {
|
private void SetWindowCap(string suffix = "") {
|
||||||
this.Text = "McBitFont v" + version + " - " + prjName;
|
this.Text = "McBitFont v" + version + " - " + prjName + suffix;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1014,26 +1039,40 @@ namespace McBitFont {
|
|||||||
|
|
||||||
private void copyToolStripMenuItem_Click(object sender, EventArgs e) {
|
private void copyToolStripMenuItem_Click(object sender, EventArgs e) {
|
||||||
fbuffer = true;
|
fbuffer = true;
|
||||||
fbuf = CopyFrame(f);
|
fbuf = CopyFrame(f, true);
|
||||||
pasteToolStripMenuItem.Enabled = true;
|
pasteToolStripMenuItem.Enabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void pasteToolStripMenuItem_Click(object sender, EventArgs e) {
|
private void pasteToolStripMenuItem_Click(object sender, EventArgs e) {
|
||||||
|
history.AddPre(f);
|
||||||
if (fbuf.width == f.width && fbuf.height == f.height) {
|
if (fbuf.width == f.width && fbuf.height == f.height) {
|
||||||
Array.Copy(fbuf.data, f.data, fbuf.data.Length);
|
Array.Copy(fbuf.data, f.data, fbuf.data.Length);
|
||||||
} else {
|
} else {
|
||||||
var wmax = (fbuf.width > f.width) ? f.width : fbuf.width;
|
int di, dj, wmax, hmax, selw, selh;
|
||||||
var hmax = (fbuf.height > f.height) ? f.height : fbuf.height;
|
if (chkRectSelect.Checked) {
|
||||||
|
di = selection1.X;
|
||||||
|
dj = selection1.Y;
|
||||||
|
selw = selection2.X - selection1.X + 1;
|
||||||
|
selh = selection2.Y - selection1.Y + 1;
|
||||||
|
wmax = fbuf.width > selw ? selw : fbuf.width;
|
||||||
|
hmax = fbuf.height > selh ? selh : fbuf.height;
|
||||||
|
} else {
|
||||||
|
di = 0;
|
||||||
|
dj = 0;
|
||||||
|
wmax = (fbuf.width > f.width) ? f.width : fbuf.width;
|
||||||
|
hmax = (fbuf.height > f.height) ? f.height : fbuf.height;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < wmax; i++) {
|
for (int i = 0; i < wmax; i++) {
|
||||||
for (int j = 0; j < hmax; j++) {
|
for (int j = 0; j < hmax; j++) {
|
||||||
f.data[i, j] = fbuf.data[i, j];
|
f.data[i + di, j + dj] = fbuf.data[i, j];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
history.AddPost(f);
|
||||||
|
CheckHistoryButtons();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
modified = true;
|
SetModified();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void aboutToolStripMenuItem_Click(object sender, EventArgs e) {
|
private void aboutToolStripMenuItem_Click(object sender, EventArgs e) {
|
||||||
@@ -1051,7 +1090,7 @@ namespace McBitFont {
|
|||||||
if (MessageBox.Show("Current symbol is modified.\nDo you want to save the changes?", "Symbol was modified!", MessageBoxButtons.YesNo) == DialogResult.Yes) {
|
if (MessageBox.Show("Current symbol is modified.\nDo you want to save the changes?", "Symbol was modified!", MessageBoxButtons.YesNo) == DialogResult.Yes) {
|
||||||
SaveFrame();
|
SaveFrame();
|
||||||
}
|
}
|
||||||
modified = false;
|
SetModified(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1091,7 +1130,7 @@ namespace McBitFont {
|
|||||||
|
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
CheckHistoryButtons();
|
CheckHistoryButtons();
|
||||||
modified = true;
|
SetModified();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1138,7 +1177,7 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
//dotPanel.Refresh();
|
//dotPanel.Refresh();
|
||||||
miniList.Refresh();
|
miniList.Refresh();
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void removeBeforeToolStripMenuItem_Click(object sender, EventArgs e) {
|
private void removeBeforeToolStripMenuItem_Click(object sender, EventArgs e) {
|
||||||
@@ -1154,7 +1193,7 @@ namespace McBitFont {
|
|||||||
makeVarWidthToolStripMenuItem.Visible = false;
|
makeVarWidthToolStripMenuItem.Visible = false;
|
||||||
tsmiMakeVarWidth.Visible = false;
|
tsmiMakeVarWidth.Visible = false;
|
||||||
lblType.Text = "Variable width / Single";
|
lblType.Text = "Variable width / Single";
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void CheckHistoryButtons() {
|
public void CheckHistoryButtons() {
|
||||||
@@ -1220,7 +1259,7 @@ namespace McBitFont {
|
|||||||
|
|
||||||
history.Clear();
|
history.Clear();
|
||||||
CheckForAdd();
|
CheckForAdd();
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1234,8 +1273,9 @@ namespace McBitFont {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
history.AddPost(f);
|
history.AddPost(f);
|
||||||
|
CheckHistoryButtons();
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
modified = true;
|
SetModified();
|
||||||
}
|
}
|
||||||
iform.Dispose();
|
iform.Dispose();
|
||||||
}
|
}
|
||||||
@@ -1257,6 +1297,7 @@ namespace McBitFont {
|
|||||||
|
|
||||||
private void chkRectSelect_CheckedChanged(object sender, EventArgs e) {
|
private void chkRectSelect_CheckedChanged(object sender, EventArgs e) {
|
||||||
lblSelection.Visible = lblSelectionLabel.Visible = chkRectSelect.Checked;
|
lblSelection.Visible = lblSelectionLabel.Visible = chkRectSelect.Checked;
|
||||||
|
selectAllToolStripMenuItem.Enabled = chkRectSelect.Checked;
|
||||||
dotPanel.Refresh();
|
dotPanel.Refresh();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1362,7 +1403,7 @@ namespace McBitFont {
|
|||||||
miniList.Items.Add(s, (chkHexCodes.Checked ? sHex : s) + ' ' + sss, s);
|
miniList.Items.Add(s, (chkHexCodes.Checked ? sHex : s) + ' ' + sss, s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
prjModified = true;
|
SetModified(true, true);
|
||||||
if (miniList.Items.Count > 0) miniList.Items[0].Selected = true;
|
if (miniList.Items.Count > 0) miniList.Items[0].Selected = true;
|
||||||
f = frames[0];
|
f = frames[0];
|
||||||
dotWidth = f.width;
|
dotWidth = f.width;
|
||||||
@@ -1375,5 +1416,13 @@ namespace McBitFont {
|
|||||||
//MessageBox.Show(bits + "-font found. " + data.Count + " numbers (" + data.Count * bits / 8 + " bytes) total\n" + "Start code: " + data.ElementAt(4) + " End code: " + data.ElementAt(5));
|
//MessageBox.Show(bits + "-font found. " + data.Count + " numbers (" + data.Count * bits / 8 + " bytes) total\n" + "Start code: " + data.ElementAt(4) + " End code: " + data.ElementAt(5));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) {
|
||||||
|
selection1.X = 0;
|
||||||
|
selection1.Y = 0;
|
||||||
|
selection2.X = dotWidth - 1;
|
||||||
|
selection2.Y = dotHeight - 1;
|
||||||
|
dotPanel.Refresh();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
10
McBitFont/Properties/Resources.Designer.cs
generated
10
McBitFont/Properties/Resources.Designer.cs
generated
@@ -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>
|
/// <summary>
|
||||||
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
/// Looks up a localized resource of type System.Drawing.Bitmap.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@@ -142,6 +142,9 @@
|
|||||||
<data name="arrow_redo" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<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>
|
<value>..\Resources\redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</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">
|
<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>
|
<value>..\Resources\icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -202,8 +205,8 @@
|
|||||||
<data name="Famfamfam-Silk-Page-white.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<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>
|
<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>
|
||||||
<data name="Famfamfam-Silk-Disk.16" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="folder_table" 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>
|
<value>..\Resources\folder_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="Canvas_Fill" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<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>
|
<value>..\Resources\Canvas_Fill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
@@ -223,7 +226,7 @@
|
|||||||
<data name="icon_64" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<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>
|
<value>..\Resources\icon_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="folder_table" type="System.Resources.ResXFileRef, System.Windows.Forms">
|
<data name="arrow_out" 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>
|
<value>..\Resources\arrow_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
BIN
McBitFont/Resources/arrow_out.png
Normal file
BIN
McBitFont/Resources/arrow_out.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 594 B |
6
TODO.txt
6
TODO.txt
@@ -1,9 +1,15 @@
|
|||||||
Application:
|
Application:
|
||||||
V Move Select and Baseline buttons right
|
V Move Select and Baseline buttons right
|
||||||
V Display RectSelection width and width
|
V Display RectSelection width and width
|
||||||
|
V Indicate modified project by adding "*" to window caption
|
||||||
|
|
||||||
Functionality:
|
Functionality:
|
||||||
|
V Copy/Paste should be aware of rectangle selection
|
||||||
|
V Select All function
|
||||||
|
V Select and Select All shortcuts
|
||||||
|
|
||||||
Bugs:
|
Bugs:
|
||||||
V EncodingProvider hotfix
|
V EncodingProvider hotfix
|
||||||
V Check if frame changed before exit application
|
V Check if frame changed before exit application
|
||||||
|
V Hostory does not record pastes from clipboard
|
||||||
|
V Undo/Redo menu availability recalculation does not happen sometimes
|
||||||
|
BIN
icons/famfamfam/arrow_out.png
Normal file
BIN
icons/famfamfam/arrow_out.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 594 B |
Reference in New Issue
Block a user