McFLY/McBitFont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 17 Wiki Activity

Little UI fixes

Browse Source
This commit is contained in:
Anton Mukhin
2025-05-23 17:13:32 +03:00
parent a5e3c8812f
commit ab77f9de21
2 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
McBitFont/Form1.Designer.cs generated
View File

@@ -56,13 +56,14 @@
btnApply = new System.Windows.Forms.Button(); btnApply = new System.Windows.Forms.Button();
hScroll = new System.Windows.Forms.HScrollBar(); hScroll = new System.Windows.Forms.HScrollBar();
vScroll = new System.Windows.Forms.VScrollBar(); vScroll = new System.Windows.Forms.VScrollBar();
label5 = new System.Windows.Forms.Label(); lblCoords = new System.Windows.Forms.Label();
menuStrip1 = new System.Windows.Forms.MenuStrip(); menuStrip1 = new System.Windows.Forms.MenuStrip();
fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
importImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -95,7 +96,7 @@
toolTip1 = new System.Windows.Forms.ToolTip(components); toolTip1 = new System.Windows.Forms.ToolTip(components);
chkLeftSide = new System.Windows.Forms.CheckBox(); chkLeftSide = new System.Windows.Forms.CheckBox();
chkTopSide = new System.Windows.Forms.CheckBox(); chkTopSide = new System.Windows.Forms.CheckBox();
importImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); label3 = 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();
@@ -472,17 +473,17 @@
vScroll.TabIndex = 15; vScroll.TabIndex = 15;
vScroll.ValueChanged += scroll_ValueChanged; vScroll.ValueChanged += scroll_ValueChanged;
// //
// label5 // lblCoords
// //
label5.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; lblCoords.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
label5.AutoSize = true; lblCoords.AutoSize = true;
label5.Location = new System.Drawing.Point(646, 132); lblCoords.Location = new System.Drawing.Point(643, 132);
label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); lblCoords.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
label5.Name = "label5"; lblCoords.Name = "lblCoords";
label5.Size = new System.Drawing.Size(24, 15); lblCoords.Size = new System.Drawing.Size(24, 15);
label5.TabIndex = 16; lblCoords.TabIndex = 16;
label5.Text = "X,Y"; lblCoords.Text = "X,Y";
label5.TextAlign = System.Drawing.ContentAlignment.TopRight; lblCoords.TextAlign = System.Drawing.ContentAlignment.TopRight;
// //
// menuStrip1 // menuStrip1
// //
@@ -545,6 +546,14 @@
saveAsToolStripMenuItem.ToolTipText = "Save changes to another file"; saveAsToolStripMenuItem.ToolTipText = "Save changes to another file";
saveAsToolStripMenuItem.Click += SaveToolStripMenuItem_Click; saveAsToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
// //
// importImageToolStripMenuItem
//
importImageToolStripMenuItem.Image = Properties.Resources.z_folder_image;
importImageToolStripMenuItem.Name = "importImageToolStripMenuItem";
importImageToolStripMenuItem.Size = new System.Drawing.Size(184, 22);
importImageToolStripMenuItem.Text = "Import image";
importImageToolStripMenuItem.Click += importImageToolStripMenuItem_Click;
//
// exportToolStripMenuItem // exportToolStripMenuItem
// //
exportToolStripMenuItem.Image = Properties.Resources.z_export; exportToolStripMenuItem.Image = Properties.Resources.z_export;
@@ -865,25 +874,27 @@
toolTip1.SetToolTip(chkTopSide, "Height changes will be made on Top/Bottom side"); toolTip1.SetToolTip(chkTopSide, "Height changes will be made on Top/Bottom side");
chkTopSide.UseVisualStyleBackColor = true; chkTopSide.UseVisualStyleBackColor = true;
// //
// importImageToolStripMenuItem // label3
// //
importImageToolStripMenuItem.Image = Properties.Resources.z_folder_image; label3.AutoSize = true;
importImageToolStripMenuItem.Name = "importImageToolStripMenuItem"; label3.Location = new System.Drawing.Point(642, 117);
importImageToolStripMenuItem.Size = new System.Drawing.Size(184, 22); label3.Name = "label3";
importImageToolStripMenuItem.Text = "Import image"; label3.Size = new System.Drawing.Size(45, 15);
importImageToolStripMenuItem.Click += importImageToolStripMenuItem_Click; label3.TabIndex = 21;
label3.Text = "Cursor:";
// //
// 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(label3);
Controls.Add(chkTopSide); Controls.Add(chkTopSide);
Controls.Add(chkLeftSide); Controls.Add(chkLeftSide);
Controls.Add(btnBaseline); Controls.Add(btnBaseline);
Controls.Add(btnApply); Controls.Add(btnApply);
Controls.Add(btnExport); Controls.Add(btnExport);
Controls.Add(label5); Controls.Add(lblCoords);
Controls.Add(vScroll); Controls.Add(vScroll);
Controls.Add(hScroll); Controls.Add(hScroll);
Controls.Add(miniList); Controls.Add(miniList);
@@ -941,7 +952,7 @@
private System.Windows.Forms.Button btnApply; private System.Windows.Forms.Button btnApply;
private System.Windows.Forms.HScrollBar hScroll; private System.Windows.Forms.HScrollBar hScroll;
private System.Windows.Forms.VScrollBar vScroll; private System.Windows.Forms.VScrollBar vScroll;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label lblCoords;
private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.MenuStrip menuStrip1;
private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem;
@@ -990,6 +1001,7 @@
private System.Windows.Forms.ToolStripMenuItem tsmiCodeShift; private System.Windows.Forms.ToolStripMenuItem tsmiCodeShift;
private System.Windows.Forms.ToolStripMenuItem tsmiMakeVarWidth; private System.Windows.Forms.ToolStripMenuItem tsmiMakeVarWidth;
private System.Windows.Forms.ToolStripMenuItem importImageToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem importImageToolStripMenuItem;
private System.Windows.Forms.Label label3;
} }
} }

14
McBitFont/Form1.cs
View File

@@ -95,7 +95,7 @@ namespace McBitFont {
ListViewItem_SetSpacing(miniList, 50 + 2, 50 + 22); ListViewItem_SetSpacing(miniList, 50 + 2, 50 + 22);
this.Text = "McBitFont " + version + " - " + prjName; SetWindowCap();
fbuf = new FrameMiniature(0, dotWidth, dotHeight); fbuf = new FrameMiniature(0, dotWidth, dotHeight);
@@ -330,7 +330,7 @@ namespace McBitFont {
// Change coordinates in the panel // Change coordinates in the panel
int i = (e.X - pixelOffset + hScroll.Value) / (cellSize + gap); int i = (e.X - pixelOffset + hScroll.Value) / (cellSize + gap);
int j = (e.Y - pixelOffset + vScroll.Value) / (cellSize + gap); int j = (e.Y - pixelOffset + vScroll.Value) / (cellSize + gap);
label5.Text = i.ToString() + ',' + j.ToString(); lblCoords.Text = i.ToString() + ',' + j.ToString();
// history management // history management
if (e.Button != MouseButtons.None && !mouseDown) { if (e.Button != MouseButtons.None && !mouseDown) {
@@ -660,7 +660,7 @@ namespace McBitFont {
prjName = "Untitled"; prjName = "Untitled";
prjFileName = ""; prjFileName = "";
this.Text = "McBitFont " + version + " - " + prjName; SetWindowCap();
modified = false; modified = false;
CheckForAdd(); CheckForAdd();
fbuffer = false; fbuffer = false;
@@ -775,7 +775,7 @@ namespace McBitFont {
prjFileName = filename; prjFileName = filename;
prjName = Path.GetFileNameWithoutExtension(filename); prjName = Path.GetFileNameWithoutExtension(filename);
this.Text = "McBitFont " + version + " - " + prjName; SetWindowCap();
miniList.Items[0].Selected = true; miniList.Items[0].Selected = true;
@@ -805,7 +805,11 @@ namespace McBitFont {
prjModified = false; prjModified = false;
prjName = Path.GetFileNameWithoutExtension(filename); prjName = Path.GetFileNameWithoutExtension(filename);
prjFileName = filename; prjFileName = filename;
this.Text = "McBitFont " + version + " - " + prjName; SetWindowCap();
}
private void SetWindowCap() {
this.Text = "McBitFont v" + version + " - " + prjName;
} }
private void openToolStripMenuItem_Click(object sender, EventArgs e) { private void openToolStripMenuItem_Click(object sender, EventArgs e) {