diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs index edc6839..8bfd76e 100644 --- a/McBitFont/Form1.Designer.cs +++ b/McBitFont/Form1.Designer.cs @@ -101,6 +101,7 @@ chkHexCodes = new System.Windows.Forms.CheckBox(); chkRectSelect = new System.Windows.Forms.CheckBox(); label3 = new System.Windows.Forms.Label(); + selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)nudX).BeginInit(); ((System.ComponentModel.ISupportInitialize)nudY).BeginInit(); panel1.SuspendLayout(); @@ -604,7 +605,7 @@ // // editToolStripMenuItem // - editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem }); + editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { undoToolStripMenuItem, redoToolStripMenuItem, copyToolStripMenuItem, pasteToolStripMenuItem, selectToolStripMenuItem }); editToolStripMenuItem.Name = "editToolStripMenuItem"; editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); editToolStripMenuItem.Text = "Edit"; @@ -615,7 +616,7 @@ undoToolStripMenuItem.Image = Properties.Resources.arrow_undo; undoToolStripMenuItem.Name = "undoToolStripMenuItem"; 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(180, 22); undoToolStripMenuItem.Text = "Undo"; undoToolStripMenuItem.ToolTipText = "Undo last canvas change"; undoToolStripMenuItem.Click += undoToolStripMenuItem_Click; @@ -625,7 +626,7 @@ redoToolStripMenuItem.Image = Properties.Resources.arrow_redo; redoToolStripMenuItem.Name = "redoToolStripMenuItem"; 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(180, 22); redoToolStripMenuItem.Text = "Redo"; redoToolStripMenuItem.ToolTipText = "Redo canvas change"; redoToolStripMenuItem.Click += redoToolStripMenuItem_Click; @@ -637,7 +638,7 @@ copyToolStripMenuItem.Name = "copyToolStripMenuItem"; copyToolStripMenuItem.ShortcutKeyDisplayString = ""; 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(180, 22); copyToolStripMenuItem.Text = "Copy"; copyToolStripMenuItem.ToolTipText = "Copy current symbol to clipboard"; copyToolStripMenuItem.Click += copyToolStripMenuItem_Click; @@ -649,7 +650,7 @@ pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; pasteToolStripMenuItem.ShortcutKeyDisplayString = ""; 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(180, 22); pasteToolStripMenuItem.Text = "Paste"; pasteToolStripMenuItem.ToolTipText = "Paste from clipboard to current symbol"; pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click; @@ -870,12 +871,15 @@ // btnBaseline // btnBaseline.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnBaseline.Image = Properties.Resources.fam_base; + btnBaseline.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; btnBaseline.Location = new System.Drawing.Point(718, 92); btnBaseline.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); btnBaseline.Name = "btnBaseline"; btnBaseline.Size = new System.Drawing.Size(88, 27); btnBaseline.TabIndex = 18; - btnBaseline.Text = "Baseline"; + btnBaseline.Text = " Baseline"; + btnBaseline.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; toolTip1.SetToolTip(btnBaseline, "Set irtual base line for the font"); btnBaseline.UseVisualStyleBackColor = true; btnBaseline.Click += btnBaseline_Click; @@ -929,11 +933,15 @@ // chkRectSelect.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; chkRectSelect.Appearance = System.Windows.Forms.Appearance.Button; + chkRectSelect.Image = Properties.Resources.fam_rectt; + chkRectSelect.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; 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.Text = " Select"; + chkRectSelect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + chkRectSelect.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; toolTip1.SetToolTip(chkRectSelect, "Turn on/off rectangle selection"); chkRectSelect.UseVisualStyleBackColor = true; chkRectSelect.CheckedChanged += chkRectSelect_CheckedChanged; @@ -948,6 +956,14 @@ label3.TabIndex = 21; label3.Text = "Cursor:"; // + // selectToolStripMenuItem + // + selectToolStripMenuItem.Image = Properties.Resources.fam_rectt; + selectToolStripMenuItem.Name = "selectToolStripMenuItem"; + selectToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + selectToolStripMenuItem.Text = "Select"; + selectToolStripMenuItem.Click += selectToolStripMenuItem_Click; + // // MainForm // AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -1073,6 +1089,7 @@ private System.Windows.Forms.Button btnFill; private System.Windows.Forms.ToolStripMenuItem FillToolStripMenuItem; private System.Windows.Forms.CheckBox chkRectSelect; + private System.Windows.Forms.ToolStripMenuItem selectToolStripMenuItem; } } diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs index eda7c9e..c684761 100644 --- a/McBitFont/Form1.cs +++ b/McBitFont/Form1.cs @@ -383,7 +383,7 @@ namespace McBitFont { private void dotPanel_MouseMove(object sender, MouseEventArgs e) { var rectSel = chkRectSelect.Checked; bool rectSelUpdated = false; - + // Moving baseline Rectangle rect1, rect2; if (set_base) { @@ -1235,5 +1235,10 @@ namespace McBitFont { private void chkRectSelect_CheckedChanged(object sender, EventArgs e) { dotPanel.Refresh(); } + + private void selectToolStripMenuItem_Click(object sender, EventArgs e) { + chkRectSelect.Checked = !chkRectSelect.Checked; + selectToolStripMenuItem.Checked = !selectToolStripMenuItem.Checked; + } } } diff --git a/McBitFont/Properties/Resources.Designer.cs b/McBitFont/Properties/Resources.Designer.cs index 281bcaa..2c7606b 100644 --- a/McBitFont/Properties/Resources.Designer.cs +++ b/McBitFont/Properties/Resources.Designer.cs @@ -140,6 +140,26 @@ namespace McBitFont.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap fam_base { + get { + object obj = ResourceManager.GetObject("fam_base", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap fam_rectt { + get { + object obj = ResourceManager.GetObject("fam_rectt", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/McBitFont/Properties/Resources.resx b/McBitFont/Properties/Resources.resx index cabd1c6..90e4395 100644 --- a/McBitFont/Properties/Resources.resx +++ b/McBitFont/Properties/Resources.resx @@ -196,9 +196,15 @@ ..\Resources\arrow_redo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fam_rectt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Famfamfam-Silk-Page-white.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Canvas_Fill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Famfamfam-Silk-Shape-flip-horizontal.16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -214,7 +220,7 @@ ..\Resources\icon_64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Canvas_Fill.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\fam_base.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/McBitFont/Resources/arrow_inout1.png b/McBitFont/Resources/arrow_inout1.png new file mode 100644 index 0000000..1b76367 Binary files /dev/null and b/McBitFont/Resources/arrow_inout1.png differ diff --git a/McBitFont/Resources/fam_base.png b/McBitFont/Resources/fam_base.png new file mode 100644 index 0000000..ed6cdcb Binary files /dev/null and b/McBitFont/Resources/fam_base.png differ diff --git a/McBitFont/Resources/fam_rectt.png b/McBitFont/Resources/fam_rectt.png new file mode 100644 index 0000000..796b520 Binary files /dev/null and b/McBitFont/Resources/fam_rectt.png differ diff --git a/icons/fam_base.png b/icons/fam_base.png new file mode 100644 index 0000000..ea83977 Binary files /dev/null and b/icons/fam_base.png differ diff --git a/icons/fam_rectt.png b/icons/fam_rectt.png new file mode 100644 index 0000000..796b520 Binary files /dev/null and b/icons/fam_rectt.png differ diff --git a/icons/Canvas_Clear.png b/icons/famfamfam/Canvas_Clear.png similarity index 100% rename from icons/Canvas_Clear.png rename to icons/famfamfam/Canvas_Clear.png diff --git a/icons/Canvas_Fill.png b/icons/famfamfam/Canvas_Fill.png similarity index 100% rename from icons/Canvas_Fill.png rename to icons/famfamfam/Canvas_Fill.png diff --git a/icons/famfamfam/fam_base.png b/icons/famfamfam/fam_base.png new file mode 100644 index 0000000..ed6cdcb Binary files /dev/null and b/icons/famfamfam/fam_base.png differ diff --git a/icons/famfamfam/fam_rectt.png b/icons/famfamfam/fam_rectt.png new file mode 100644 index 0000000..796b520 Binary files /dev/null and b/icons/famfamfam/fam_rectt.png differ diff --git a/images/Screenshot_Main.png b/images/Screenshot_Main.png index dffbe83..ffad225 100644 Binary files a/images/Screenshot_Main.png and b/images/Screenshot_Main.png differ