diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs index ec0e2e2..4f07d84 100644 --- a/McBitFont/Form1.Designer.cs +++ b/McBitFont/Form1.Designer.cs @@ -99,8 +99,8 @@ chkLeftSide = new System.Windows.Forms.CheckBox(); chkTopSide = new System.Windows.Forms.CheckBox(); chkHexCodes = new System.Windows.Forms.CheckBox(); - label3 = new System.Windows.Forms.Label(); chkRectSelect = new System.Windows.Forms.CheckBox(); + label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)nudX).BeginInit(); ((System.ComponentModel.ISupportInitialize)nudY).BeginInit(); panel1.SuspendLayout(); @@ -529,7 +529,7 @@ newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N; newToolStripMenuItem.Size = new System.Drawing.Size(184, 22); newToolStripMenuItem.Text = "New"; - newToolStripMenuItem.ToolTipText = "Create new file"; + newToolStripMenuItem.ToolTipText = "Create new project"; newToolStripMenuItem.Click += newToolStripMenuItem_Click; // // openToolStripMenuItem @@ -571,6 +571,7 @@ importImageToolStripMenuItem.Name = "importImageToolStripMenuItem"; importImageToolStripMenuItem.Size = new System.Drawing.Size(184, 22); importImageToolStripMenuItem.Text = "Import image"; + importImageToolStripMenuItem.ToolTipText = "Import image from a file"; importImageToolStripMenuItem.Click += importImageToolStripMenuItem_Click; // // exportToolStripMenuItem @@ -744,7 +745,7 @@ ClearToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W; ClearToolStripMenuItem.Size = new System.Drawing.Size(197, 22); ClearToolStripMenuItem.Text = "Clear canvas"; - ClearToolStripMenuItem.ToolTipText = "Clear canvas"; + ClearToolStripMenuItem.ToolTipText = "Paint canvas white"; ClearToolStripMenuItem.Click += btnClear_Click; // // FillToolStripMenuItem @@ -754,6 +755,7 @@ FillToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.B; FillToolStripMenuItem.Size = new System.Drawing.Size(197, 22); FillToolStripMenuItem.Text = "Fill canvas"; + FillToolStripMenuItem.ToolTipText = "Paint canvas black"; FillToolStripMenuItem.Click += btnFill_Click; // // shiftUpToolStripMenuItem @@ -906,6 +908,7 @@ // // chkHexCodes // + chkHexCodes.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; chkHexCodes.AutoSize = true; chkHexCodes.Location = new System.Drawing.Point(618, 155); chkHexCodes.Name = "chkHexCodes"; @@ -916,6 +919,19 @@ chkHexCodes.UseVisualStyleBackColor = true; chkHexCodes.CheckedChanged += chkHexCodes_CheckedChanged; // + // chkRectSelect + // + chkRectSelect.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + chkRectSelect.Appearance = System.Windows.Forms.Appearance.Button; + chkRectSelect.Location = new System.Drawing.Point(620, 92); + chkRectSelect.Name = "chkRectSelect"; + chkRectSelect.Size = new System.Drawing.Size(74, 27); + chkRectSelect.TabIndex = 23; + chkRectSelect.Text = "Rect Select"; + toolTip1.SetToolTip(chkRectSelect, "Turn on/off rectangle selection"); + chkRectSelect.UseVisualStyleBackColor = true; + chkRectSelect.CheckedChanged += chkRectSelect_CheckedChanged; + // // label3 // label3.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; @@ -926,17 +942,6 @@ label3.TabIndex = 21; label3.Text = "Cursor:"; // - // chkRectSelect - // - chkRectSelect.Appearance = System.Windows.Forms.Appearance.Button; - chkRectSelect.Location = new System.Drawing.Point(620, 92); - chkRectSelect.Name = "chkRectSelect"; - chkRectSelect.Size = new System.Drawing.Size(74, 27); - chkRectSelect.TabIndex = 23; - chkRectSelect.Text = "Rect Select"; - chkRectSelect.UseVisualStyleBackColor = true; - chkRectSelect.CheckedChanged += chkRectSelect_CheckedChanged; - // // MainForm // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs index 581c7dc..eda7c9e 100644 --- a/McBitFont/Form1.cs +++ b/McBitFont/Form1.cs @@ -177,10 +177,10 @@ namespace McBitFont { ilMiniatures.Images.Add(s, (Image)bmp); miniList.Items[s].ImageKey = s; } + prjModified = true; } if (nudX.Focused) { modified = true; - prjModified = true; } DotResize((int)nudX.Value, dotHeight); @@ -239,6 +239,8 @@ namespace McBitFont { f = FrameResize(f, ww, hh); dotWidth = ww; dotHeight = hh; + if (selection2.X > dotWidth - 1) selection2.X = dotWidth - 1; + if (selection2.Y > dotHeight - 1) selection2.Y = dotHeight - 1; SetNewWH(); cbZoom_SelectedIndexChanged(cbZoom, null); @@ -1068,7 +1070,6 @@ namespace McBitFont { history.AddPost(f); CheckHistoryButtons(); modified = true; - prjModified = true; dotPanel.Refresh(); } diff --git a/McBitFont/ImageImporter.Designer.cs b/McBitFont/ImageImporter.Designer.cs index d27cd77..ff4c113 100644 --- a/McBitFont/ImageImporter.Designer.cs +++ b/McBitFont/ImageImporter.Designer.cs @@ -110,6 +110,7 @@ btnLoadImage.Text = " Load Image"; btnLoadImage.TextAlign = System.Drawing.ContentAlignment.MiddleRight; btnLoadImage.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + toolTip1.SetToolTip(btnLoadImage, "Load image from a file"); btnLoadImage.UseVisualStyleBackColor = true; btnLoadImage.Click += btnLoadImage_Click; // @@ -140,6 +141,7 @@ btnConvert.Text = " Convert"; btnConvert.TextAlign = System.Drawing.ContentAlignment.MiddleRight; btnConvert.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + toolTip1.SetToolTip(btnConvert, "Convert image to pixelated black and white"); btnConvert.UseVisualStyleBackColor = true; btnConvert.Click += btnConvert_Click; // @@ -154,6 +156,7 @@ tbPixelization.Name = "tbPixelization"; tbPixelization.Size = new System.Drawing.Size(128, 32); tbPixelization.TabIndex = 7; + toolTip1.SetToolTip(tbPixelization, "Pixelization level. Higher value makes bigger pixels during conversion"); tbPixelization.Value = 1; tbPixelization.ValueChanged += tbPixelization_ValueChanged; tbPixelization.KeyDown += tbPixelization_KeyDown; @@ -188,6 +191,7 @@ tbThreshold.Size = new System.Drawing.Size(128, 32); tbThreshold.TabIndex = 9; tbThreshold.TickFrequency = 8; + toolTip1.SetToolTip(tbThreshold, "Black / White conversion threshold"); tbThreshold.ValueChanged += tbThreshold_ValueChanged; tbThreshold.KeyDown += tbThreshold_KeyDown; // @@ -221,6 +225,7 @@ btnResize.Text = " Resize to frame"; btnResize.TextAlign = System.Drawing.ContentAlignment.MiddleRight; btnResize.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; + toolTip1.SetToolTip(btnResize, "Resize converted image to fit the current frame"); btnResize.UseVisualStyleBackColor = true; btnResize.Click += btnResize_Click; // diff --git a/McBitFont/ImageImporter.resx b/McBitFont/ImageImporter.resx index 9a6538c..d3fcd46 100644 --- a/McBitFont/ImageImporter.resx +++ b/McBitFont/ImageImporter.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 147, 17 + 17, 17 diff --git a/images/Screenshot_Main.png b/images/Screenshot_Main.png index 189e1d0..dffbe83 100644 Binary files a/images/Screenshot_Main.png and b/images/Screenshot_Main.png differ