From ea3de134d21d173ff786f29b5559a9a4ac5ab164 Mon Sep 17 00:00:00 2001 From: Anton Mukhin Date: Tue, 20 May 2025 09:12:34 +0300 Subject: [PATCH] Migrated to .NET 9 (with some functionality broken) --- McBitFont/Form1.Designer.cs | 1127 ++++++++++++-------------- McBitFont/Form1.cs | 101 +-- McBitFont/Form1.resx | 57 +- McBitFont/McBitFont.csproj | 226 +----- McBitFont/Properties/AssemblyInfo.cs | 36 - McBitFont/packages.config | 14 - 6 files changed, 580 insertions(+), 981 deletions(-) delete mode 100644 McBitFont/Properties/AssemblyInfo.cs delete mode 100644 McBitFont/packages.config diff --git a/McBitFont/Form1.Designer.cs b/McBitFont/Form1.Designer.cs index 9a10dc0..3fc093c 100644 --- a/McBitFont/Form1.Designer.cs +++ b/McBitFont/Form1.Designer.cs @@ -23,766 +23,709 @@ /// содержимое этого метода с помощью редактора кода. /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); + components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - this.dotPanel = new System.Windows.Forms.Panel(); - this.nudX = new System.Windows.Forms.NumericUpDown(); - this.nudY = new System.Windows.Forms.NumericUpDown(); - this.label1 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.lblType = new System.Windows.Forms.Label(); - this.cbZoom = new System.Windows.Forms.ComboBox(); - this.label4 = new System.Windows.Forms.Label(); - this.panel1 = new System.Windows.Forms.Panel(); - this.btnClear = new System.Windows.Forms.Button(); - this.btnMirrorY = new System.Windows.Forms.Button(); - this.btnMirrorX = new System.Windows.Forms.Button(); - this.btnInvert = new System.Windows.Forms.Button(); - this.btnShiftDown = new System.Windows.Forms.Button(); - this.btnShiftUp = new System.Windows.Forms.Button(); - this.btnShiftRight = new System.Windows.Forms.Button(); - this.btnShiftLeft = new System.Windows.Forms.Button(); - this.btnExport = new System.Windows.Forms.Button(); - this.miniList = new System.Windows.Forms.ListView(); - this.ilMiniatures = new System.Windows.Forms.ImageList(this.components); - this.btnApply = new System.Windows.Forms.Button(); - this.hScroll = new System.Windows.Forms.HScrollBar(); - this.vScroll = new System.Windows.Forms.VScrollBar(); - this.label5 = new System.Windows.Forms.Label(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveDEVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.appendSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.removeSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shiftUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shiftDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shiftLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.shiftRightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.invertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mirrorXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mirrorYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dlgSave = new System.Windows.Forms.SaveFileDialog(); - this.dlgOpen = new System.Windows.Forms.OpenFileDialog(); - this.btnBaseline = new System.Windows.Forms.Button(); - this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.chkLeftSide = new System.Windows.Forms.CheckBox(); - this.chkTopSide = new System.Windows.Forms.CheckBox(); - this.openDEVToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)(this.nudX)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudY)).BeginInit(); - this.panel1.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); + dotPanel = new System.Windows.Forms.Panel(); + nudX = new System.Windows.Forms.NumericUpDown(); + nudY = new System.Windows.Forms.NumericUpDown(); + label1 = new System.Windows.Forms.Label(); + label2 = new System.Windows.Forms.Label(); + lblType = new System.Windows.Forms.Label(); + cbZoom = new System.Windows.Forms.ComboBox(); + label4 = new System.Windows.Forms.Label(); + panel1 = new System.Windows.Forms.Panel(); + btnClear = new System.Windows.Forms.Button(); + btnMirrorY = new System.Windows.Forms.Button(); + btnMirrorX = new System.Windows.Forms.Button(); + btnInvert = new System.Windows.Forms.Button(); + btnShiftDown = new System.Windows.Forms.Button(); + btnShiftUp = new System.Windows.Forms.Button(); + btnShiftRight = new System.Windows.Forms.Button(); + btnShiftLeft = new System.Windows.Forms.Button(); + btnExport = new System.Windows.Forms.Button(); + miniList = new System.Windows.Forms.ListView(); + ilMiniatures = new System.Windows.Forms.ImageList(components); + btnApply = new System.Windows.Forms.Button(); + hScroll = new System.Windows.Forms.HScrollBar(); + vScroll = new System.Windows.Forms.VScrollBar(); + label5 = new System.Windows.Forms.Label(); + menuStrip1 = new System.Windows.Forms.MenuStrip(); + fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + newToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + pasteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + prependSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + appendSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + removeSymbolToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + toolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + ClearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + shiftUpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + shiftDownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + shiftLeftToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + shiftRightToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + invertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + mirrorXToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + mirrorYToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + exportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + dlgSave = new System.Windows.Forms.SaveFileDialog(); + dlgOpen = new System.Windows.Forms.OpenFileDialog(); + btnBaseline = new System.Windows.Forms.Button(); + toolTip1 = new System.Windows.Forms.ToolTip(components); + chkLeftSide = new System.Windows.Forms.CheckBox(); + chkTopSide = new System.Windows.Forms.CheckBox(); + ((System.ComponentModel.ISupportInitialize)nudX).BeginInit(); + ((System.ComponentModel.ISupportInitialize)nudY).BeginInit(); + panel1.SuspendLayout(); + menuStrip1.SuspendLayout(); + SuspendLayout(); // // dotPanel // - this.dotPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dotPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.dotPanel.BackColor = System.Drawing.SystemColors.ControlDark; - this.dotPanel.Location = new System.Drawing.Point(12, 27); - this.dotPanel.Name = "dotPanel"; - this.dotPanel.Size = new System.Drawing.Size(389, 498); - this.dotPanel.TabIndex = 0; - this.dotPanel.Paint += new System.Windows.Forms.PaintEventHandler(this.dotPanel_Paint); - this.dotPanel.MouseDown += new System.Windows.Forms.MouseEventHandler(this.dotPanel_MouseMove); - this.dotPanel.MouseMove += new System.Windows.Forms.MouseEventHandler(this.dotPanel_MouseMove); - this.dotPanel.Resize += new System.EventHandler(this.cbZoom_SelectedIndexChanged); + dotPanel.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + dotPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; + dotPanel.BackColor = System.Drawing.SystemColors.ControlDark; + dotPanel.Location = new System.Drawing.Point(14, 31); + dotPanel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + dotPanel.Name = "dotPanel"; + dotPanel.Size = new System.Drawing.Size(454, 575); + dotPanel.TabIndex = 0; + dotPanel.Paint += dotPanel_Paint; + dotPanel.MouseDown += dotPanel_MouseMove; + dotPanel.MouseMove += dotPanel_MouseMove; + dotPanel.Resize += cbZoom_SelectedIndexChanged; // // nudX // - this.nudX.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.nudX.Location = new System.Drawing.Point(666, 27); - this.nudX.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.nudX.Name = "nudX"; - this.nudX.Size = new System.Drawing.Size(40, 20); - this.nudX.TabIndex = 1; - this.toolTip1.SetToolTip(this.nudX, "Symbol width"); - this.nudX.Value = new decimal(new int[] { - 32, - 0, - 0, - 0}); - this.nudX.ValueChanged += new System.EventHandler(this.nudX_ValueChanged); + nudX.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + nudX.Location = new System.Drawing.Point(777, 31); + nudX.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + nudX.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); + nudX.Name = "nudX"; + nudX.Size = new System.Drawing.Size(47, 23); + nudX.TabIndex = 1; + toolTip1.SetToolTip(nudX, "Symbol width"); + nudX.Value = new decimal(new int[] { 32, 0, 0, 0 }); + nudX.ValueChanged += nudX_ValueChanged; // // nudY // - this.nudY.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.nudY.Location = new System.Drawing.Point(666, 49); - this.nudY.Maximum = new decimal(new int[] { - 255, - 0, - 0, - 0}); - this.nudY.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.nudY.Name = "nudY"; - this.nudY.Size = new System.Drawing.Size(40, 20); - this.nudY.TabIndex = 2; - this.toolTip1.SetToolTip(this.nudY, "Symbol height"); - this.nudY.Value = new decimal(new int[] { - 32, - 0, - 0, - 0}); - this.nudY.ValueChanged += new System.EventHandler(this.nudY_ValueChanged); + nudY.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + nudY.Location = new System.Drawing.Point(777, 57); + nudY.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + nudY.Maximum = new decimal(new int[] { 255, 0, 0, 0 }); + nudY.Minimum = new decimal(new int[] { 1, 0, 0, 0 }); + nudY.Name = "nudY"; + nudY.Size = new System.Drawing.Size(47, 23); + nudY.TabIndex = 2; + toolTip1.SetToolTip(nudY, "Symbol height"); + nudY.Value = new decimal(new int[] { 32, 0, 0, 0 }); + nudY.ValueChanged += nudY_ValueChanged; // // label1 // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(622, 29); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(38, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Width:"; + label1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + label1.AutoSize = true; + label1.Location = new System.Drawing.Point(726, 33); + label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label1.Name = "label1"; + label1.Size = new System.Drawing.Size(42, 15); + label1.TabIndex = 3; + label1.Text = "Width:"; // // label2 // - this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(619, 51); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(41, 13); - this.label2.TabIndex = 4; - this.label2.Text = "Height:"; + label2.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(722, 59); + label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(46, 15); + label2.TabIndex = 4; + label2.Text = "Height:"; // // lblType // - this.lblType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.lblType.Location = new System.Drawing.Point(554, 138); - this.lblType.Name = "lblType"; - this.lblType.Size = new System.Drawing.Size(217, 13); - this.lblType.TabIndex = 0; - this.lblType.Text = "Monospaced"; - this.lblType.TextAlign = System.Drawing.ContentAlignment.TopRight; + lblType.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + lblType.Location = new System.Drawing.Point(646, 159); + lblType.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + lblType.Name = "lblType"; + lblType.Size = new System.Drawing.Size(253, 15); + lblType.TabIndex = 0; + lblType.Text = "Monospaced"; + lblType.TextAlign = System.Drawing.ContentAlignment.TopRight; // // cbZoom // - this.cbZoom.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.cbZoom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cbZoom.FormattingEnabled = true; - this.cbZoom.Items.AddRange(new object[] { - "2", - "3", - "5", - "10", - "15", - "20", - "25", - "30", - "35", - "40", - "45", - "50"}); - this.cbZoom.Location = new System.Drawing.Point(554, 45); - this.cbZoom.Name = "cbZoom"; - this.cbZoom.Size = new System.Drawing.Size(59, 21); - this.cbZoom.TabIndex = 6; - this.cbZoom.TabStop = false; - this.toolTip1.SetToolTip(this.cbZoom, "Canvas zoom level"); - this.cbZoom.SelectedIndexChanged += new System.EventHandler(this.cbZoom_SelectedIndexChanged); + cbZoom.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + cbZoom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + cbZoom.FormattingEnabled = true; + cbZoom.Items.AddRange(new object[] { "2", "3", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50" }); + cbZoom.Location = new System.Drawing.Point(646, 52); + cbZoom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + cbZoom.Name = "cbZoom"; + cbZoom.Size = new System.Drawing.Size(68, 23); + cbZoom.TabIndex = 6; + cbZoom.TabStop = false; + toolTip1.SetToolTip(cbZoom, "Canvas zoom level"); // // label4 // - this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(553, 29); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(62, 13); - this.label4.TabIndex = 7; - this.label4.Text = "Zoom level:"; + label4.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + label4.AutoSize = true; + label4.Location = new System.Drawing.Point(645, 33); + label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label4.Name = "label4"; + label4.Size = new System.Drawing.Size(69, 15); + label4.TabIndex = 7; + label4.Text = "Zoom level:"; // // panel1 // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel1.Controls.Add(this.btnClear); - this.panel1.Controls.Add(this.btnMirrorY); - this.panel1.Controls.Add(this.btnMirrorX); - this.panel1.Controls.Add(this.btnInvert); - this.panel1.Controls.Add(this.btnShiftDown); - this.panel1.Controls.Add(this.btnShiftUp); - this.panel1.Controls.Add(this.btnShiftRight); - this.panel1.Controls.Add(this.btnShiftLeft); - this.panel1.Location = new System.Drawing.Point(428, 27); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(120, 121); - this.panel1.TabIndex = 9; + panel1.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + panel1.Controls.Add(btnClear); + panel1.Controls.Add(btnMirrorY); + panel1.Controls.Add(btnMirrorX); + panel1.Controls.Add(btnInvert); + panel1.Controls.Add(btnShiftDown); + panel1.Controls.Add(btnShiftUp); + panel1.Controls.Add(btnShiftRight); + panel1.Controls.Add(btnShiftLeft); + panel1.Location = new System.Drawing.Point(499, 31); + panel1.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + panel1.Name = "panel1"; + panel1.Size = new System.Drawing.Size(140, 139); + panel1.TabIndex = 9; // // btnClear // - this.btnClear.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnClear.Location = new System.Drawing.Point(7, 8); - this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(30, 30); - this.btnClear.TabIndex = 7; - this.btnClear.Text = "○"; - this.toolTip1.SetToolTip(this.btnClear, "Clear canvas"); - this.btnClear.UseVisualStyleBackColor = true; - this.btnClear.Click += new System.EventHandler(this.btnClear_Click); + btnClear.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnClear.Location = new System.Drawing.Point(8, 9); + btnClear.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnClear.Name = "btnClear"; + btnClear.Size = new System.Drawing.Size(35, 35); + btnClear.TabIndex = 7; + btnClear.Text = "○"; + toolTip1.SetToolTip(btnClear, "Clear canvas"); + btnClear.UseVisualStyleBackColor = true; + btnClear.Click += btnClear_Click; // // btnMirrorY // - this.btnMirrorY.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnMirrorY.Location = new System.Drawing.Point(79, 80); - this.btnMirrorY.Name = "btnMirrorY"; - this.btnMirrorY.Size = new System.Drawing.Size(30, 30); - this.btnMirrorY.TabIndex = 6; - this.btnMirrorY.Text = "⩥"; - this.toolTip1.SetToolTip(this.btnMirrorY, "Mirror by Y axis (vertical)"); - this.btnMirrorY.UseVisualStyleBackColor = true; - this.btnMirrorY.Click += new System.EventHandler(this.btnMirrorY_Click); + btnMirrorY.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnMirrorY.Location = new System.Drawing.Point(92, 92); + btnMirrorY.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnMirrorY.Name = "btnMirrorY"; + btnMirrorY.Size = new System.Drawing.Size(35, 35); + btnMirrorY.TabIndex = 6; + btnMirrorY.Text = "⩥"; + toolTip1.SetToolTip(btnMirrorY, "Mirror by Y axis (vertical)"); + btnMirrorY.UseVisualStyleBackColor = true; + btnMirrorY.Click += btnMirrorY_Click; // // btnMirrorX // - this.btnMirrorX.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnMirrorX.Location = new System.Drawing.Point(43, 80); - this.btnMirrorX.Name = "btnMirrorX"; - this.btnMirrorX.Size = new System.Drawing.Size(30, 30); - this.btnMirrorX.TabIndex = 5; - this.btnMirrorX.Text = "◮"; - this.toolTip1.SetToolTip(this.btnMirrorX, "Mirror by X axis (horizontal)"); - this.btnMirrorX.UseVisualStyleBackColor = true; - this.btnMirrorX.Click += new System.EventHandler(this.btnMirrorX_Click); + btnMirrorX.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnMirrorX.Location = new System.Drawing.Point(50, 92); + btnMirrorX.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnMirrorX.Name = "btnMirrorX"; + btnMirrorX.Size = new System.Drawing.Size(35, 35); + btnMirrorX.TabIndex = 5; + btnMirrorX.Text = "◮"; + toolTip1.SetToolTip(btnMirrorX, "Mirror by X axis (horizontal)"); + btnMirrorX.UseVisualStyleBackColor = true; + btnMirrorX.Click += btnMirrorX_Click; // // btnInvert // - this.btnInvert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnInvert.Location = new System.Drawing.Point(7, 80); - this.btnInvert.Name = "btnInvert"; - this.btnInvert.Size = new System.Drawing.Size(30, 30); - this.btnInvert.TabIndex = 4; - this.btnInvert.Text = "◪"; - this.toolTip1.SetToolTip(this.btnInvert, "Invert pixel colors"); - this.btnInvert.UseVisualStyleBackColor = true; - this.btnInvert.Click += new System.EventHandler(this.btnInvert_Click); + btnInvert.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnInvert.Location = new System.Drawing.Point(8, 92); + btnInvert.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnInvert.Name = "btnInvert"; + btnInvert.Size = new System.Drawing.Size(35, 35); + btnInvert.TabIndex = 4; + btnInvert.Text = "◪"; + toolTip1.SetToolTip(btnInvert, "Invert pixel colors"); + btnInvert.UseVisualStyleBackColor = true; + btnInvert.Click += btnInvert_Click; // // btnShiftDown // - this.btnShiftDown.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnShiftDown.Location = new System.Drawing.Point(43, 44); - this.btnShiftDown.Name = "btnShiftDown"; - this.btnShiftDown.Size = new System.Drawing.Size(30, 30); - this.btnShiftDown.TabIndex = 3; - this.btnShiftDown.Text = "▼"; - this.toolTip1.SetToolTip(this.btnShiftDown, "Shift pixels down"); - this.btnShiftDown.UseVisualStyleBackColor = true; - this.btnShiftDown.Click += new System.EventHandler(this.btnShiftDown_Click); + btnShiftDown.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnShiftDown.Location = new System.Drawing.Point(50, 51); + btnShiftDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnShiftDown.Name = "btnShiftDown"; + btnShiftDown.Size = new System.Drawing.Size(35, 35); + btnShiftDown.TabIndex = 3; + btnShiftDown.Text = "▼"; + toolTip1.SetToolTip(btnShiftDown, "Shift pixels down"); + btnShiftDown.UseVisualStyleBackColor = true; + btnShiftDown.Click += btnShiftDown_Click; // // btnShiftUp // - this.btnShiftUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnShiftUp.Location = new System.Drawing.Point(43, 8); - this.btnShiftUp.Name = "btnShiftUp"; - this.btnShiftUp.Size = new System.Drawing.Size(30, 30); - this.btnShiftUp.TabIndex = 2; - this.btnShiftUp.Text = "▲"; - this.toolTip1.SetToolTip(this.btnShiftUp, "Shift pixels up"); - this.btnShiftUp.UseVisualStyleBackColor = true; - this.btnShiftUp.Click += new System.EventHandler(this.btnShiftUp_Click); + btnShiftUp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnShiftUp.Location = new System.Drawing.Point(50, 9); + btnShiftUp.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnShiftUp.Name = "btnShiftUp"; + btnShiftUp.Size = new System.Drawing.Size(35, 35); + btnShiftUp.TabIndex = 2; + btnShiftUp.Text = "▲"; + toolTip1.SetToolTip(btnShiftUp, "Shift pixels up"); + btnShiftUp.UseVisualStyleBackColor = true; + btnShiftUp.Click += btnShiftUp_Click; // // btnShiftRight // - this.btnShiftRight.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnShiftRight.Location = new System.Drawing.Point(79, 44); - this.btnShiftRight.Name = "btnShiftRight"; - this.btnShiftRight.Size = new System.Drawing.Size(30, 30); - this.btnShiftRight.TabIndex = 1; - this.btnShiftRight.Text = "▶"; - this.toolTip1.SetToolTip(this.btnShiftRight, "Shift pixels right"); - this.btnShiftRight.UseVisualStyleBackColor = true; - this.btnShiftRight.Click += new System.EventHandler(this.btnShiftRight_Click); + btnShiftRight.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnShiftRight.Location = new System.Drawing.Point(92, 51); + btnShiftRight.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnShiftRight.Name = "btnShiftRight"; + btnShiftRight.Size = new System.Drawing.Size(35, 35); + btnShiftRight.TabIndex = 1; + btnShiftRight.Text = "▶"; + toolTip1.SetToolTip(btnShiftRight, "Shift pixels right"); + btnShiftRight.UseVisualStyleBackColor = true; + btnShiftRight.Click += btnShiftRight_Click; // // btnShiftLeft // - this.btnShiftLeft.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.btnShiftLeft.Location = new System.Drawing.Point(7, 44); - this.btnShiftLeft.Name = "btnShiftLeft"; - this.btnShiftLeft.Size = new System.Drawing.Size(30, 30); - this.btnShiftLeft.TabIndex = 0; - this.btnShiftLeft.Text = "◀"; - this.toolTip1.SetToolTip(this.btnShiftLeft, "Shift pixels left"); - this.btnShiftLeft.UseVisualStyleBackColor = true; - this.btnShiftLeft.Click += new System.EventHandler(this.btnShiftLeft_Click); + btnShiftLeft.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + btnShiftLeft.Location = new System.Drawing.Point(8, 51); + btnShiftLeft.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnShiftLeft.Name = "btnShiftLeft"; + btnShiftLeft.Size = new System.Drawing.Size(35, 35); + btnShiftLeft.TabIndex = 0; + btnShiftLeft.Text = "◀"; + toolTip1.SetToolTip(btnShiftLeft, "Shift pixels left"); + btnShiftLeft.UseVisualStyleBackColor = true; + btnShiftLeft.Click += btnShiftLeft_Click; // // btnExport // - this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnExport.Location = new System.Drawing.Point(696, 109); - this.btnExport.Name = "btnExport"; - this.btnExport.Size = new System.Drawing.Size(75, 23); - this.btnExport.TabIndex = 10; - this.btnExport.Text = "Export"; - this.toolTip1.SetToolTip(this.btnExport, "Configure and export data"); - this.btnExport.UseVisualStyleBackColor = true; - this.btnExport.Click += new System.EventHandler(this.button1_Click); + btnExport.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnExport.Location = new System.Drawing.Point(812, 126); + btnExport.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnExport.Name = "btnExport"; + btnExport.Size = new System.Drawing.Size(88, 27); + btnExport.TabIndex = 10; + btnExport.Text = "Export"; + toolTip1.SetToolTip(btnExport, "Configure and export data"); + btnExport.UseVisualStyleBackColor = true; + btnExport.Click += button1_Click; // // miniList // - this.miniList.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.miniList.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.miniList.GridLines = true; - this.miniList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; - this.miniList.HideSelection = false; - this.miniList.LargeImageList = this.ilMiniatures; - this.miniList.Location = new System.Drawing.Point(428, 154); - this.miniList.MultiSelect = false; - this.miniList.Name = "miniList"; - this.miniList.ShowGroups = false; - this.miniList.Size = new System.Drawing.Size(343, 395); - this.miniList.SmallImageList = this.ilMiniatures; - this.miniList.Sorting = System.Windows.Forms.SortOrder.Ascending; - this.miniList.TabIndex = 12; - this.miniList.TabStop = false; - this.miniList.TileSize = new System.Drawing.Size(50, 50); - this.miniList.UseCompatibleStateImageBehavior = false; - this.miniList.SelectedIndexChanged += new System.EventHandler(this.miniList_SelectedIndexChanged); + miniList.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + miniList.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, 204); + miniList.GridLines = true; + miniList.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; + miniList.LargeImageList = ilMiniatures; + miniList.Location = new System.Drawing.Point(499, 178); + miniList.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + miniList.MultiSelect = false; + miniList.Name = "miniList"; + miniList.ShowGroups = false; + miniList.Size = new System.Drawing.Size(400, 455); + miniList.SmallImageList = ilMiniatures; + miniList.Sorting = System.Windows.Forms.SortOrder.Ascending; + miniList.TabIndex = 12; + miniList.TabStop = false; + miniList.TileSize = new System.Drawing.Size(50, 50); + miniList.UseCompatibleStateImageBehavior = false; + miniList.SelectedIndexChanged += miniList_SelectedIndexChanged; // // ilMiniatures // - this.ilMiniatures.ColorDepth = System.Windows.Forms.ColorDepth.Depth4Bit; - this.ilMiniatures.ImageSize = new System.Drawing.Size(50, 50); - this.ilMiniatures.TransparentColor = System.Drawing.Color.Transparent; + ilMiniatures.ColorDepth = System.Windows.Forms.ColorDepth.Depth4Bit; + ilMiniatures.ImageSize = new System.Drawing.Size(50, 50); + ilMiniatures.TransparentColor = System.Drawing.Color.Transparent; // // btnApply // - this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnApply.Location = new System.Drawing.Point(615, 109); - this.btnApply.Name = "btnApply"; - this.btnApply.Size = new System.Drawing.Size(75, 23); - this.btnApply.TabIndex = 13; - this.btnApply.Text = "Apply"; - this.toolTip1.SetToolTip(this.btnApply, "Apply changes made to the symbol"); - this.btnApply.UseVisualStyleBackColor = true; - this.btnApply.Click += new System.EventHandler(this.button2_Click); + btnApply.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + btnApply.Location = new System.Drawing.Point(718, 126); + btnApply.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + btnApply.Name = "btnApply"; + btnApply.Size = new System.Drawing.Size(88, 27); + btnApply.TabIndex = 13; + btnApply.Text = "Apply"; + toolTip1.SetToolTip(btnApply, "Apply changes made to the symbol"); + btnApply.UseVisualStyleBackColor = true; + btnApply.Click += button2_Click; // // hScroll // - this.hScroll.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.hScroll.Location = new System.Drawing.Point(12, 528); - this.hScroll.Name = "hScroll"; - this.hScroll.Size = new System.Drawing.Size(389, 21); - this.hScroll.TabIndex = 14; - this.hScroll.ValueChanged += new System.EventHandler(this.scroll_ValueChanged); + hScroll.Anchor = System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right; + hScroll.Location = new System.Drawing.Point(14, 609); + hScroll.Name = "hScroll"; + hScroll.Size = new System.Drawing.Size(454, 21); + hScroll.TabIndex = 14; + hScroll.ValueChanged += scroll_ValueChanged; // // vScroll // - this.vScroll.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Right))); - this.vScroll.LargeChange = 25; - this.vScroll.Location = new System.Drawing.Point(404, 27); - this.vScroll.Name = "vScroll"; - this.vScroll.Size = new System.Drawing.Size(21, 498); - this.vScroll.TabIndex = 15; - this.vScroll.ValueChanged += new System.EventHandler(this.scroll_ValueChanged); + vScroll.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right; + vScroll.LargeChange = 25; + vScroll.Location = new System.Drawing.Point(471, 31); + vScroll.Name = "vScroll"; + vScroll.Size = new System.Drawing.Size(21, 575); + vScroll.TabIndex = 15; + vScroll.ValueChanged += scroll_ValueChanged; // // label5 // - this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(554, 114); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(24, 13); - this.label5.TabIndex = 16; - this.label5.Text = "X,Y"; - this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight; + label5.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + label5.AutoSize = true; + label5.Location = new System.Drawing.Point(646, 132); + label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label5.Name = "label5"; + label5.Size = new System.Drawing.Size(24, 15); + label5.TabIndex = 16; + label5.Text = "X,Y"; + label5.TextAlign = System.Drawing.ContentAlignment.TopRight; // // menuStrip1 // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.fileToolStripMenuItem, - this.editToolStripMenuItem, - this.toolsToolStripMenuItem, - this.aboutToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(784, 24); - this.menuStrip1.TabIndex = 17; - this.menuStrip1.Text = "menuStrip1"; + menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { fileToolStripMenuItem, editToolStripMenuItem, toolsToolStripMenuItem, aboutToolStripMenuItem }); + menuStrip1.Location = new System.Drawing.Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + menuStrip1.Size = new System.Drawing.Size(915, 24); + menuStrip1.TabIndex = 17; + menuStrip1.Text = "menuStrip1"; // // fileToolStripMenuItem // - this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newToolStripMenuItem, - this.openToolStripMenuItem, - this.openDEVToolStripMenuItem, - this.saveDEVToolStripMenuItem, - this.saveToolStripMenuItem, - this.saveAsToolStripMenuItem, - this.exitToolStripMenuItem}); - this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; - this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); - this.fileToolStripMenuItem.Text = "File"; + fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { newToolStripMenuItem, openToolStripMenuItem, saveToolStripMenuItem, saveAsToolStripMenuItem, exitToolStripMenuItem }); + fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); + fileToolStripMenuItem.Text = "File"; // // newToolStripMenuItem // - this.newToolStripMenuItem.Image = global::McBitFont.Properties.Resources.file; - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+N"; - this.newToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N))); - this.newToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.newToolStripMenuItem.Text = "New"; - this.newToolStripMenuItem.Click += new System.EventHandler(this.newToolStripMenuItem_Click); + newToolStripMenuItem.Image = Properties.Resources.file; + newToolStripMenuItem.Name = "newToolStripMenuItem"; + newToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+N"; + newToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N; + newToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + newToolStripMenuItem.Text = "New"; + newToolStripMenuItem.Click += newToolStripMenuItem_Click; // // openToolStripMenuItem // - this.openToolStripMenuItem.Image = global::McBitFont.Properties.Resources.folder_open; - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+O"; - this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.openToolStripMenuItem.Text = "Open"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); - // - // saveDEVToolStripMenuItem - // - this.saveDEVToolStripMenuItem.Name = "saveDEVToolStripMenuItem"; - this.saveDEVToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.saveDEVToolStripMenuItem.Text = "Save as (new format)"; - this.saveDEVToolStripMenuItem.Click += new System.EventHandler(this.saveJSONToolStripMenuItem_Click); + openToolStripMenuItem.Image = Properties.Resources.folder_open; + openToolStripMenuItem.Name = "openToolStripMenuItem"; + openToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+O"; + openToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O; + openToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + openToolStripMenuItem.Text = "Open"; + openToolStripMenuItem.Click += openToolStripMenuItem_Click; // // saveToolStripMenuItem // - this.saveToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Disk_16; - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+S"; - this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.saveToolStripMenuItem.Text = "Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click_1); + saveToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Disk_16; + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+S"; + saveToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S; + saveToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + saveToolStripMenuItem.Text = "Save"; + saveToolStripMenuItem.Click += saveToolStripMenuItem_Click_1; // // saveAsToolStripMenuItem // - this.saveAsToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Disk_16; - this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+S"; - this.saveAsToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)(((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift) - | System.Windows.Forms.Keys.S))); - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.saveAsToolStripMenuItem.Text = "Save as"; - this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + saveAsToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Disk_16; + saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; + saveAsToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Shift+S"; + saveAsToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.S; + saveAsToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + saveAsToolStripMenuItem.Text = "Save as"; + saveAsToolStripMenuItem.Click += saveToolStripMenuItem_Click; // // exitToolStripMenuItem // - this.exitToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Door_out_16; - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+X"; - this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X))); - this.exitToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.exitToolStripMenuItem.Text = "Exit"; - this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + exitToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Door_out_16; + exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + exitToolStripMenuItem.ShortcutKeyDisplayString = "Alt+X"; + exitToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.X; + exitToolStripMenuItem.Size = new System.Drawing.Size(184, 22); + exitToolStripMenuItem.Text = "Exit"; + exitToolStripMenuItem.Click += exitToolStripMenuItem_Click; // // editToolStripMenuItem // - this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.copyToolStripMenuItem, - this.pasteToolStripMenuItem, - this.prependSymbolToolStripMenuItem, - this.appendSymbolToolStripMenuItem, - this.removeSymbolToolStripMenuItem, - this.applyToolStripMenuItem}); - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); - this.editToolStripMenuItem.Text = "Edit"; + editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { copyToolStripMenuItem, pasteToolStripMenuItem, prependSymbolToolStripMenuItem, appendSymbolToolStripMenuItem, removeSymbolToolStripMenuItem, applyToolStripMenuItem }); + editToolStripMenuItem.Name = "editToolStripMenuItem"; + editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + editToolStripMenuItem.Text = "Edit"; // // copyToolStripMenuItem // - this.copyToolStripMenuItem.Enabled = false; - this.copyToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Page_copy_16; - this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; - this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); - this.copyToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.copyToolStripMenuItem.Text = "Copy"; - this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + copyToolStripMenuItem.Enabled = false; + copyToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_copy_16; + copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + copyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+C"; + copyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C; + copyToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + copyToolStripMenuItem.Text = "Copy"; + copyToolStripMenuItem.Click += copyToolStripMenuItem_Click; // // pasteToolStripMenuItem // - this.pasteToolStripMenuItem.Enabled = false; - this.pasteToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Page_paste_16; - this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; - this.pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; - this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V))); - this.pasteToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.pasteToolStripMenuItem.Text = "Paste"; - this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click); + pasteToolStripMenuItem.Enabled = false; + pasteToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Page_paste_16; + pasteToolStripMenuItem.Name = "pasteToolStripMenuItem"; + pasteToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+V"; + pasteToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V; + pasteToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + pasteToolStripMenuItem.Text = "Paste"; + pasteToolStripMenuItem.Click += pasteToolStripMenuItem_Click; // // prependSymbolToolStripMenuItem // - this.prependSymbolToolStripMenuItem.Enabled = false; - this.prependSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add; - this.prependSymbolToolStripMenuItem.Name = "prependSymbolToolStripMenuItem"; - this.prependSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Ins"; - this.prependSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert))); - this.prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.prependSymbolToolStripMenuItem.Text = "Prepend symbol"; - this.prependSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click); + prependSymbolToolStripMenuItem.Enabled = false; + prependSymbolToolStripMenuItem.Image = Properties.Resources.action_add; + prependSymbolToolStripMenuItem.Name = "prependSymbolToolStripMenuItem"; + prependSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Ins"; + prependSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Insert; + prependSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + prependSymbolToolStripMenuItem.Text = "Prepend symbol"; + prependSymbolToolStripMenuItem.Click += prependSymbolToolStripMenuItem_Click; // // appendSymbolToolStripMenuItem // - this.appendSymbolToolStripMenuItem.Enabled = false; - this.appendSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_add; - this.appendSymbolToolStripMenuItem.Name = "appendSymbolToolStripMenuItem"; - this.appendSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+End"; - this.appendSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.End))); - this.appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.appendSymbolToolStripMenuItem.Text = "Append symbol"; - this.appendSymbolToolStripMenuItem.Click += new System.EventHandler(this.prependSymbolToolStripMenuItem_Click); + appendSymbolToolStripMenuItem.Enabled = false; + appendSymbolToolStripMenuItem.Image = Properties.Resources.action_add; + appendSymbolToolStripMenuItem.Name = "appendSymbolToolStripMenuItem"; + appendSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+End"; + appendSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.End; + appendSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + appendSymbolToolStripMenuItem.Text = "Append symbol"; + appendSymbolToolStripMenuItem.Click += prependSymbolToolStripMenuItem_Click; // // removeSymbolToolStripMenuItem // - this.removeSymbolToolStripMenuItem.Enabled = false; - this.removeSymbolToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_remove; - this.removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem"; - this.removeSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Del"; - this.removeSymbolToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete))); - this.removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.removeSymbolToolStripMenuItem.Text = "Remove symbol"; - this.removeSymbolToolStripMenuItem.Click += new System.EventHandler(this.removeSymbolToolStripMenuItem_Click); + removeSymbolToolStripMenuItem.Enabled = false; + removeSymbolToolStripMenuItem.Image = Properties.Resources.action_remove; + removeSymbolToolStripMenuItem.Name = "removeSymbolToolStripMenuItem"; + removeSymbolToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Del"; + removeSymbolToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Delete; + removeSymbolToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + removeSymbolToolStripMenuItem.Text = "Remove symbol"; + removeSymbolToolStripMenuItem.Click += removeSymbolToolStripMenuItem_Click; // // applyToolStripMenuItem // - this.applyToolStripMenuItem.Image = global::McBitFont.Properties.Resources.action_check; - this.applyToolStripMenuItem.Name = "applyToolStripMenuItem"; - this.applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space"; - this.applyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space))); - this.applyToolStripMenuItem.Size = new System.Drawing.Size(212, 22); - this.applyToolStripMenuItem.Text = "Apply"; - this.applyToolStripMenuItem.Click += new System.EventHandler(this.button2_Click); + applyToolStripMenuItem.Image = Properties.Resources.action_check; + applyToolStripMenuItem.Name = "applyToolStripMenuItem"; + applyToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Space"; + applyToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Space; + applyToolStripMenuItem.Size = new System.Drawing.Size(212, 22); + applyToolStripMenuItem.Text = "Apply"; + applyToolStripMenuItem.Click += button2_Click; // // toolsToolStripMenuItem // - this.toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.ClearToolStripMenuItem, - this.shiftUpToolStripMenuItem, - this.shiftDownToolStripMenuItem, - this.shiftLeftToolStripMenuItem, - this.shiftRightToolStripMenuItem, - this.invertToolStripMenuItem, - this.mirrorXToolStripMenuItem, - this.mirrorYToolStripMenuItem, - this.exportToolStripMenuItem}); - this.toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; - this.toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); - this.toolsToolStripMenuItem.Text = "Tools"; + toolsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { ClearToolStripMenuItem, shiftUpToolStripMenuItem, shiftDownToolStripMenuItem, shiftLeftToolStripMenuItem, shiftRightToolStripMenuItem, invertToolStripMenuItem, mirrorXToolStripMenuItem, mirrorYToolStripMenuItem, exportToolStripMenuItem }); + toolsToolStripMenuItem.Name = "toolsToolStripMenuItem"; + toolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + toolsToolStripMenuItem.Text = "Tools"; // // ClearToolStripMenuItem // - this.ClearToolStripMenuItem.Name = "ClearToolStripMenuItem"; - this.ClearToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+W"; - this.ClearToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.W))); - this.ClearToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.ClearToolStripMenuItem.Text = "Clear canvas"; - this.ClearToolStripMenuItem.Click += new System.EventHandler(this.btnClear_Click); + ClearToolStripMenuItem.Name = "ClearToolStripMenuItem"; + ClearToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+W"; + 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.Click += btnClear_Click; // // shiftUpToolStripMenuItem // - this.shiftUpToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_top; - this.shiftUpToolStripMenuItem.Name = "shiftUpToolStripMenuItem"; - this.shiftUpToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; - this.shiftUpToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up))); - this.shiftUpToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.shiftUpToolStripMenuItem.Text = "Shift Up"; - this.shiftUpToolStripMenuItem.Click += new System.EventHandler(this.btnShiftUp_Click); + shiftUpToolStripMenuItem.Image = Properties.Resources.arrow_top; + shiftUpToolStripMenuItem.Name = "shiftUpToolStripMenuItem"; + shiftUpToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Up"; + shiftUpToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up; + shiftUpToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + shiftUpToolStripMenuItem.Text = "Shift Up"; + shiftUpToolStripMenuItem.Click += btnShiftUp_Click; // // shiftDownToolStripMenuItem // - this.shiftDownToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_down; - this.shiftDownToolStripMenuItem.Name = "shiftDownToolStripMenuItem"; - this.shiftDownToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; - this.shiftDownToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down))); - this.shiftDownToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.shiftDownToolStripMenuItem.Text = "Shift Down"; - this.shiftDownToolStripMenuItem.Click += new System.EventHandler(this.btnShiftDown_Click); + shiftDownToolStripMenuItem.Image = Properties.Resources.arrow_down; + shiftDownToolStripMenuItem.Name = "shiftDownToolStripMenuItem"; + shiftDownToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Down"; + shiftDownToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down; + shiftDownToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + shiftDownToolStripMenuItem.Text = "Shift Down"; + shiftDownToolStripMenuItem.Click += btnShiftDown_Click; // // shiftLeftToolStripMenuItem // - this.shiftLeftToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_back; - this.shiftLeftToolStripMenuItem.Name = "shiftLeftToolStripMenuItem"; - this.shiftLeftToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Left"; - this.shiftLeftToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Left))); - this.shiftLeftToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.shiftLeftToolStripMenuItem.Text = "Shift left"; - this.shiftLeftToolStripMenuItem.Click += new System.EventHandler(this.btnShiftLeft_Click); + shiftLeftToolStripMenuItem.Image = Properties.Resources.arrow_back; + shiftLeftToolStripMenuItem.Name = "shiftLeftToolStripMenuItem"; + shiftLeftToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Left"; + shiftLeftToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Left; + shiftLeftToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + shiftLeftToolStripMenuItem.Text = "Shift left"; + shiftLeftToolStripMenuItem.Click += btnShiftLeft_Click; // // shiftRightToolStripMenuItem // - this.shiftRightToolStripMenuItem.Image = global::McBitFont.Properties.Resources.arrow_next; - this.shiftRightToolStripMenuItem.Name = "shiftRightToolStripMenuItem"; - this.shiftRightToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Right"; - this.shiftRightToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Right))); - this.shiftRightToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.shiftRightToolStripMenuItem.Text = "Shift Right"; - this.shiftRightToolStripMenuItem.Click += new System.EventHandler(this.btnShiftRight_Click); + shiftRightToolStripMenuItem.Image = Properties.Resources.arrow_next; + shiftRightToolStripMenuItem.Name = "shiftRightToolStripMenuItem"; + shiftRightToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Right"; + shiftRightToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Right; + shiftRightToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + shiftRightToolStripMenuItem.Text = "Shift Right"; + shiftRightToolStripMenuItem.Click += btnShiftRight_Click; // // invertToolStripMenuItem // - this.invertToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Ionic_Ionicons_Invert_mode_outline_16; - this.invertToolStripMenuItem.Name = "invertToolStripMenuItem"; - this.invertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; - this.invertToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I))); - this.invertToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.invertToolStripMenuItem.Text = "Invert"; - this.invertToolStripMenuItem.Click += new System.EventHandler(this.btnInvert_Click); + invertToolStripMenuItem.Image = Properties.Resources.Ionic_Ionicons_Invert_mode_outline_16; + invertToolStripMenuItem.Name = "invertToolStripMenuItem"; + invertToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+I"; + invertToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I; + invertToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + invertToolStripMenuItem.Text = "Invert"; + invertToolStripMenuItem.Click += btnInvert_Click; // // mirrorXToolStripMenuItem // - this.mirrorXToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Shape_flip_horizontal_16; - this.mirrorXToolStripMenuItem.Name = "mirrorXToolStripMenuItem"; - this.mirrorXToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X"; - this.mirrorXToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X))); - this.mirrorXToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.mirrorXToolStripMenuItem.Text = "Mirror X"; - this.mirrorXToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorX_Click); + mirrorXToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Shape_flip_horizontal_16; + mirrorXToolStripMenuItem.Name = "mirrorXToolStripMenuItem"; + mirrorXToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+X"; + mirrorXToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X; + mirrorXToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + mirrorXToolStripMenuItem.Text = "Mirror X"; + mirrorXToolStripMenuItem.Click += btnMirrorX_Click; // // mirrorYToolStripMenuItem // - this.mirrorYToolStripMenuItem.Image = global::McBitFont.Properties.Resources.Famfamfam_Silk_Shape_flip_vertical_16; - this.mirrorYToolStripMenuItem.Name = "mirrorYToolStripMenuItem"; - this.mirrorYToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Y"; - this.mirrorYToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y))); - this.mirrorYToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.mirrorYToolStripMenuItem.Text = "Mirror Y"; - this.mirrorYToolStripMenuItem.Click += new System.EventHandler(this.btnMirrorY_Click); + mirrorYToolStripMenuItem.Image = Properties.Resources.Famfamfam_Silk_Shape_flip_vertical_16; + mirrorYToolStripMenuItem.Name = "mirrorYToolStripMenuItem"; + mirrorYToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+Y"; + mirrorYToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y; + mirrorYToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + mirrorYToolStripMenuItem.Text = "Mirror Y"; + mirrorYToolStripMenuItem.Click += btnMirrorY_Click; // // exportToolStripMenuItem // - this.exportToolStripMenuItem.Name = "exportToolStripMenuItem"; - this.exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; - this.exportToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E))); - this.exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22); - this.exportToolStripMenuItem.Text = "Export"; - this.exportToolStripMenuItem.Click += new System.EventHandler(this.button1_Click); + exportToolStripMenuItem.Name = "exportToolStripMenuItem"; + exportToolStripMenuItem.ShortcutKeyDisplayString = "Ctrl+E"; + exportToolStripMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.E; + exportToolStripMenuItem.Size = new System.Drawing.Size(197, 22); + exportToolStripMenuItem.Text = "Export"; + exportToolStripMenuItem.Click += button1_Click; // // aboutToolStripMenuItem // - this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; - this.aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20); - this.aboutToolStripMenuItem.Text = "About"; - this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); + aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; + aboutToolStripMenuItem.Size = new System.Drawing.Size(52, 20); + aboutToolStripMenuItem.Text = "About"; + aboutToolStripMenuItem.Click += aboutToolStripMenuItem_Click; // // dlgSave // - this.dlgSave.DefaultExt = "mbf"; - this.dlgSave.Filter = "McBitFont files|*.mbf|McBitFont new format|*.mbfont|All files|*.*"; + dlgSave.DefaultExt = "mbf"; + dlgSave.Filter = "McBitFont files|*.mbfont|All files|*.*"; // // dlgOpen // - this.dlgOpen.DefaultExt = "mbf"; - this.dlgOpen.Filter = "McBitFont files|*.mbf|All files|*.*"; + dlgOpen.DefaultExt = "mbf"; + dlgOpen.Filter = "McBitFont files|*.mbfont|All files|*.*"; // // btnBaseline // - this.btnBaseline.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnBaseline.Location = new System.Drawing.Point(615, 80); - this.btnBaseline.Name = "btnBaseline"; - this.btnBaseline.Size = new System.Drawing.Size(75, 23); - this.btnBaseline.TabIndex = 18; - this.btnBaseline.Text = "Baseline"; - this.toolTip1.SetToolTip(this.btnBaseline, "Set irtual base line for the font"); - this.btnBaseline.UseVisualStyleBackColor = true; - this.btnBaseline.Click += new System.EventHandler(this.btnBaseline_Click); + btnBaseline.Anchor = System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right; + 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"; + toolTip1.SetToolTip(btnBaseline, "Set irtual base line for the font"); + btnBaseline.UseVisualStyleBackColor = true; + btnBaseline.Click += btnBaseline_Click; // // toolTip1 // - this.toolTip1.AutoPopDelay = 10000; - this.toolTip1.InitialDelay = 500; - this.toolTip1.ReshowDelay = 100; + toolTip1.AutoPopDelay = 10000; + toolTip1.InitialDelay = 500; + toolTip1.ReshowDelay = 100; // // chkLeftSide // - this.chkLeftSide.AutoSize = true; - this.chkLeftSide.Location = new System.Drawing.Point(712, 29); - this.chkLeftSide.Name = "chkLeftSide"; - this.chkLeftSide.Size = new System.Drawing.Size(66, 17); - this.chkLeftSide.TabIndex = 19; - this.chkLeftSide.Text = "Left side"; - this.toolTip1.SetToolTip(this.chkLeftSide, "Width changes will be made on Left/Right side"); - this.chkLeftSide.UseVisualStyleBackColor = true; + chkLeftSide.AutoSize = true; + chkLeftSide.Location = new System.Drawing.Point(831, 33); + chkLeftSide.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkLeftSide.Name = "chkLeftSide"; + chkLeftSide.Size = new System.Drawing.Size(70, 19); + chkLeftSide.TabIndex = 19; + chkLeftSide.Text = "Left side"; + toolTip1.SetToolTip(chkLeftSide, "Width changes will be made on Left/Right side"); + chkLeftSide.UseVisualStyleBackColor = true; // // chkTopSide // - this.chkTopSide.AutoSize = true; - this.chkTopSide.Location = new System.Drawing.Point(712, 50); - this.chkTopSide.Name = "chkTopSide"; - this.chkTopSide.Size = new System.Drawing.Size(67, 17); - this.chkTopSide.TabIndex = 20; - this.chkTopSide.Text = "Top side"; - this.toolTip1.SetToolTip(this.chkTopSide, "Height changes will be made on Top/Bottom side"); - this.chkTopSide.UseVisualStyleBackColor = true; - // - // openDEVToolStripMenuItem - // - this.openDEVToolStripMenuItem.Name = "openDEVToolStripMenuItem"; - this.openDEVToolStripMenuItem.Size = new System.Drawing.Size(184, 22); - this.openDEVToolStripMenuItem.Text = "Open DEV"; - this.openDEVToolStripMenuItem.Visible = false; - this.openDEVToolStripMenuItem.Click += new System.EventHandler(this.openDEVToolStripMenuItem_Click); + chkTopSide.AutoSize = true; + chkTopSide.Location = new System.Drawing.Point(831, 58); + chkTopSide.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + chkTopSide.Name = "chkTopSide"; + chkTopSide.Size = new System.Drawing.Size(70, 19); + chkTopSide.TabIndex = 20; + chkTopSide.Text = "Top side"; + toolTip1.SetToolTip(chkTopSide, "Height changes will be made on Top/Bottom side"); + chkTopSide.UseVisualStyleBackColor = true; // // MainForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(784, 561); - this.Controls.Add(this.chkTopSide); - this.Controls.Add(this.chkLeftSide); - this.Controls.Add(this.btnBaseline); - this.Controls.Add(this.btnApply); - this.Controls.Add(this.btnExport); - this.Controls.Add(this.label5); - this.Controls.Add(this.vScroll); - this.Controls.Add(this.hScroll); - this.Controls.Add(this.miniList); - this.Controls.Add(this.panel1); - this.Controls.Add(this.label4); - this.Controls.Add(this.cbZoom); - this.Controls.Add(this.lblType); - this.Controls.Add(this.label2); - this.Controls.Add(this.label1); - this.Controls.Add(this.nudY); - this.Controls.Add(this.nudX); - this.Controls.Add(this.dotPanel); - this.Controls.Add(this.menuStrip1); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.menuStrip1; - this.MinimumSize = new System.Drawing.Size(800, 600); - this.Name = "MainForm"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "McBitFont"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); - this.Load += new System.EventHandler(this.Form1_Load); - ((System.ComponentModel.ISupportInitialize)(this.nudX)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudY)).EndInit(); - this.panel1.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(915, 647); + Controls.Add(chkTopSide); + Controls.Add(chkLeftSide); + Controls.Add(btnBaseline); + Controls.Add(btnApply); + Controls.Add(btnExport); + Controls.Add(label5); + Controls.Add(vScroll); + Controls.Add(hScroll); + Controls.Add(miniList); + Controls.Add(panel1); + Controls.Add(label4); + Controls.Add(cbZoom); + Controls.Add(lblType); + Controls.Add(label2); + Controls.Add(label1); + Controls.Add(nudY); + Controls.Add(nudX); + Controls.Add(dotPanel); + Controls.Add(menuStrip1); + Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); + MainMenuStrip = menuStrip1; + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + MinimumSize = new System.Drawing.Size(931, 686); + Name = "MainForm"; + StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + Text = "McBitFont"; + FormClosing += MainForm_FormClosing; + Load += Form1_Load; + ((System.ComponentModel.ISupportInitialize)nudX).EndInit(); + ((System.ComponentModel.ISupportInitialize)nudY).EndInit(); + panel1.ResumeLayout(false); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); + ResumeLayout(false); + PerformLayout(); } @@ -843,8 +786,6 @@ private System.Windows.Forms.ToolStripMenuItem ClearToolStripMenuItem; private System.Windows.Forms.CheckBox chkLeftSide; private System.Windows.Forms.CheckBox chkTopSide; - private System.Windows.Forms.ToolStripMenuItem saveDEVToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem openDEVToolStripMenuItem; } } diff --git a/McBitFont/Form1.cs b/McBitFont/Form1.cs index 4bc2635..4ce9f1a 100644 --- a/McBitFont/Form1.cs +++ b/McBitFont/Form1.cs @@ -1,21 +1,13 @@ using MessagePack; using System; using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Diagnostics; using System.Drawing; using System.Drawing.Drawing2D; using System.IO; using System.Linq; -using System.Reflection; using System.Runtime.InteropServices; -using System.Runtime.InteropServices.ComTypes; -using System.Runtime.Serialization.Formatters.Binary; using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; -using System.Windows.Forms.VisualStyles; namespace McBitFont { @@ -108,6 +100,8 @@ namespace McBitFont { if (Environment.GetCommandLineArgs().Length > 1) { loadProject(Environment.GetCommandLineArgs()[1]); } + + Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); } [DllImport("user32.dll")] @@ -635,29 +629,15 @@ namespace McBitFont { private void saveToolStripMenuItem_Click(object sender, EventArgs e) { checkModifiedFrame(); if (dlgSave.ShowDialog() == DialogResult.OK) { - SaveBlock sav; - sav.monospaced = monospaced; - sav.frames = frames; - sav.codepage = codepage; - sav.baseline = baseline; - BinaryFormatter formatter = new BinaryFormatter(); - using (Stream ms = File.OpenWrite(dlgSave.FileName)) { - formatter.Serialize(ms, sav); - ms.Close(); - } - prjModified = false; - prjName = Path.GetFileNameWithoutExtension(dlgSave.FileName); - prjFileName = dlgSave.FileName; - this.Text = "McBitFont " + version + " - " + prjName; + saveProject(dlgSave.FileName); } } private void loadProject(string filename) { SaveBlock sav; - BinaryFormatter formatter = new BinaryFormatter(); using (FileStream fs = File.Open(filename, FileMode.Open)) { - sav = (SaveBlock)formatter.Deserialize(fs); + sav = MessagePackSerializer.Deserialize(fs); fs.Close(); } monospaced = sav.monospaced; @@ -699,9 +679,9 @@ namespace McBitFont { sav.frames = frames; sav.codepage = codepage; sav.baseline = baseline; - BinaryFormatter formatter = new BinaryFormatter(); + using (Stream ms = File.OpenWrite(filename)) { - formatter.Serialize(ms, sav); + MessagePackSerializer.Serialize(ms, sav); ms.Close(); } prjModified = false; @@ -823,75 +803,6 @@ namespace McBitFont { dotPanel.Refresh(); } - private void saveJSONToolStripMenuItem_Click(object sender, EventArgs e) { - checkModifiedFrame(); - if (dlgSave.ShowDialog() == DialogResult.OK) { - SaveBlock sav; - sav.monospaced = monospaced; - sav.frames = frames; - sav.codepage = codepage; - sav.baseline = baseline; - using (Stream ms = File.OpenWrite(dlgSave.FileName)) { - // TODO: Serializer here - MessagePackSerializer.Serialize(ms, sav); - ms.Close(); - } - prjModified = false; - prjName = Path.GetFileNameWithoutExtension(dlgSave.FileName); - prjFileName = dlgSave.FileName; - this.Text = "McBitFont " + version + " - " + prjName; - } - } - - private void openDEVToolStripMenuItem_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) { - saveAsToolStripMenuItem.PerformClick(); - return; - } - } - if (dlgOpen.ShowDialog() == DialogResult.OK) { - SaveBlock sav; - - var filename = dlgOpen.FileName; - using (FileStream fs = File.Open(filename, FileMode.Open)) { - sav = MessagePackSerializer.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; - - prjFileName = filename; - prjName = Path.GetFileNameWithoutExtension(filename); - this.Text = "McBitFont " + version + " - " + prjName; - checkForAdd(); - fbuffer = false; - } - } - private void MainForm_FormClosing(object sender, FormClosingEventArgs e) { if (prjModified) { if (MessageBox.Show("The project is modified.\nAre you sure you want to quit?", "Are you sure?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) { diff --git a/McBitFont/Form1.resx b/McBitFont/Form1.resx index 398ee74..3b3c54d 100644 --- a/McBitFont/Form1.resx +++ b/McBitFont/Form1.resx @@ -1,17 +1,17 @@  - @@ -132,9 +132,6 @@ 336, 17 - - 436, 17 - diff --git a/McBitFont/McBitFont.csproj b/McBitFont/McBitFont.csproj index 8d5ff44..9ea1967 100644 --- a/McBitFont/McBitFont.csproj +++ b/McBitFont/McBitFont.csproj @@ -1,17 +1,7 @@ - - - + - Debug - AnyCPU - {7C01529E-4414-405F-9B57-19FA4AF8ED60} + net9.0-windows WinExe - McBitFont - McBitFont - v4.7.2 - 512 - true - true publish\ true Disk @@ -27,204 +17,22 @@ false false true - - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - + true + true icon_64.ico - - - ..\packages\MessagePack.3.1.3\lib\net472\MessagePack.dll - - - ..\packages\MessagePack.Annotations.3.1.3\lib\netstandard2.0\MessagePack.Annotations.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - - ..\packages\Microsoft.NET.StringTools.17.11.4\lib\net472\Microsoft.NET.StringTools.dll - - - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll - - - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - - - - - - - - - - - - - - Form - - - About.cs - - - Form - - - Export.cs - - - Form - - - Form1.cs - - - Form - - - New.cs - - - - - About.cs - - - Export.cs - - - Form1.cs - - - New.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + @@ -238,12 +46,4 @@ false - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/McBitFont/Properties/AssemblyInfo.cs b/McBitFont/Properties/AssemblyInfo.cs deleted file mode 100644 index cb38638..0000000 --- a/McBitFont/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Общие сведения об этой сборке предоставляются следующим набором -// набора атрибутов. Измените значения этих атрибутов для изменения сведений, -// связанных со сборкой. -[assembly: AssemblyTitle("McBitFont")] -[assembly: AssemblyDescription("McFLY's Bit Font and Image Editor")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("McBitFont")] -[assembly: AssemblyCopyright("© Anton Mukhin, 2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми -// для компонентов COM. Если необходимо обратиться к типу в этой сборке через -// COM, следует установить атрибут ComVisible в TRUE для этого типа. -[assembly: ComVisible(false)] - -// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM -[assembly: Guid("7c01529e-4414-405f-9b57-19fa4af8ed60")] - -// Сведения о версии сборки состоят из указанных ниже четырех значений: -// -// Основной номер версии -// Дополнительный номер версии -// Номер сборки -// Редакция -// -// Можно задать все значения или принять номера сборки и редакции по умолчанию -// используя "*", как показано ниже: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.7.0.0")] -[assembly: AssemblyFileVersion("1.7.0.0")] diff --git a/McBitFont/packages.config b/McBitFont/packages.config deleted file mode 100644 index bb9683a..0000000 --- a/McBitFont/packages.config +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file