From 1f359ce8a786a7475372765738ee8ed9e2d9e9a5 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Sat, 30 Mar 2024 12:22:01 +0100 Subject: [PATCH] MainForm - Add functionality to main menu exit button --- PCK-Studio/MainForm.Designer.cs | 45 +++++++++--------- PCK-Studio/MainForm.cs | 5 ++ PCK-Studio/MainForm.resx | 84 ++++++++++++++++----------------- 3 files changed, 70 insertions(+), 64 deletions(-) diff --git a/PCK-Studio/MainForm.Designer.cs b/PCK-Studio/MainForm.Designer.cs index 96210730..7f9e6d3e 100644 --- a/PCK-Studio/MainForm.Designer.cs +++ b/PCK-Studio/MainForm.Designer.cs @@ -88,6 +88,8 @@ this.saveToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.recentlyOpenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.quickChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.miscToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -144,8 +146,6 @@ this.imageList = new System.Windows.Forms.ImageList(this.components); this.previewPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); this.LittleEndianCheckBox = new MetroFramework.Controls.MetroCheckBox(); - this.recentlyOpenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); logoPictureBox = new System.Windows.Forms.PictureBox(); toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); @@ -174,6 +174,16 @@ toolStripSeparator1.Name = "toolStripSeparator1"; resources.ApplyResources(toolStripSeparator1, "toolStripSeparator1"); // + // toolStripSeparator2 + // + toolStripSeparator2.Name = "toolStripSeparator2"; + resources.ApplyResources(toolStripSeparator2, "toolStripSeparator2"); + // + // toolStripSeparator4 + // + toolStripSeparator4.Name = "toolStripSeparator4"; + resources.ApplyResources(toolStripSeparator4, "toolStripSeparator4"); + // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; @@ -555,6 +565,17 @@ resources.ApplyResources(this.closeToolStripMenuItem, "closeToolStripMenuItem"); this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); // + // recentlyOpenToolStripMenuItem + // + this.recentlyOpenToolStripMenuItem.Name = "recentlyOpenToolStripMenuItem"; + resources.ApplyResources(this.recentlyOpenToolStripMenuItem, "recentlyOpenToolStripMenuItem"); + // + // exitToolStripMenuItem + // + this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; + resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); + this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // // editToolStripMenuItem // this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -1074,26 +1095,6 @@ this.LittleEndianCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; this.LittleEndianCheckBox.UseSelectable = true; // - // recentlyOpenToolStripMenuItem - // - this.recentlyOpenToolStripMenuItem.Name = "recentlyOpenToolStripMenuItem"; - resources.ApplyResources(this.recentlyOpenToolStripMenuItem, "recentlyOpenToolStripMenuItem"); - // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - resources.ApplyResources(toolStripSeparator2, "toolStripSeparator2"); - // - // exitToolStripMenuItem - // - this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - resources.ApplyResources(this.exitToolStripMenuItem, "exitToolStripMenuItem"); - // - // toolStripSeparator4 - // - toolStripSeparator4.Name = "toolStripSeparator4"; - resources.ApplyResources(toolStripSeparator4, "toolStripSeparator4"); - // // MainForm // this.ApplyImageInvert = true; diff --git a/PCK-Studio/MainForm.cs b/PCK-Studio/MainForm.cs index 0e3430ab..3557770e 100644 --- a/PCK-Studio/MainForm.cs +++ b/PCK-Studio/MainForm.cs @@ -2296,5 +2296,10 @@ namespace PckStudio private void moveUpToolStripMenuItem_Click(object sender, EventArgs e) => moveFile(-1); [Obsolete] private void moveDownToolStripMenuItem_Click(object sender, EventArgs e) => moveFile(1); + + private void exitToolStripMenuItem_Click(object sender, EventArgs e) + { + Application.Exit(); + } } } \ No newline at end of file diff --git a/PCK-Studio/MainForm.resx b/PCK-Studio/MainForm.resx index 45a6c015..e8f30194 100644 --- a/PCK-Studio/MainForm.resx +++ b/PCK-Studio/MainForm.resx @@ -815,6 +815,18 @@ 202, 6 + + False + + + 183, 6 + + + False + + + 183, 6 + 202, 6 @@ -1255,7 +1267,7 @@ Open - 180, 22 + 160, 22 Full box support @@ -1322,24 +1334,12 @@ False - - False - - - 183, 6 - 186, 22 Recently open - - False - - - 183, 6 - 186, 22 @@ -1358,7 +1358,7 @@ iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACBnSURBVHhe7d0L + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAACBnSURBVHhe7d0L jHZrVdhxOCA3ERWp11agYNFiURG8QRURBKnQNkiwiSG9RHpRSmKtoE2aUysFSoIQxJhIFW3UVk/TViIX qVosF2nTSgtWY0Q4oNwvUoQjAqddjziF85013zcz395rP2vv3y/5J0YPOPO879lrve/seecWALBTt4ke GD0hek704ui3ot+L3hP93+iD0bui10e/Fv3r6J9Gj4k+JwIAGrh79L3Rr0RjuI8hfzX9dvSj0cOjW0cA @@ -1542,7 +1542,7 @@ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EAAACxABrSO9dQAAA6pJREFUeF7tms9vDVEYhouqpFZVRFpdd+cPkFphQeKPqIUfSVl0Y9OQWNpXE/ak + DgAACw4BQL7hQQAAA6pJREFUeF7tms9vDVEYhouqpFZVRFpdd+cPkFphQeKPqIUfSVl0Y9OQWNpXE/ak SEhYkEjZUFZERCxtCaKKWKDe787jpNftmTlzz4x0rvMkb3Lzzfu9c8690zkz0+lLJBKJRCKRqIOVlZUx 6Yb0WSqL9dyUxolrFhq4Tf6DFMtHaYzY5qBB2y9fFdeIbQ4adDeHvY8lYpsDA3dQDoY2B+XmwLgdlIOh zUG5OTBuB+VgaHNQbg6M20E5GNoclP8N2l/M+r3eKHc9IWNV6/d6I+x6QqYq1+/1RvH1hEy9cNj7KL6e @@ -1824,7 +1824,7 @@ iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAADnLSURBVHhe7d0J + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAADnLSURBVHhe7d0J vK5jvf/xZZ7nWQiNSJExM5kasI1FhjJFiqQUQhqdFKk4piISoaNShzLPY+JkTOZ5ZpvH///73extsX9r 77We8Xfd1+f9en3Oq7PsvfYa7uF67ue+r2sAQBFmV4up1dUmalv1VbWfOkgdqU5RZ6nL1DXq9kHdp54Y 1Kvq/w3qZTX4v7s71K3Kn+tidbb6gzpB/UJ9T31N+WvZSPlr89c4p5pEAQCAIUytFlWfVruoA9TR6s/q @@ -2585,7 +2585,7 @@ iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEirSURBVHhe7Z0J + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAEirSURBVHhe7Z0J uK7V3P9P0jyXJqVRhQiVuUFUKOF1vb1lqIhCRV5jhFIJRen18koyq5QoiSakuaQolWgeUCppHv3/3+85 jrP32b+99zPda7jvz+e6PhfX0z57P89a61lr3Wv4/WYAQJEsJjeUb5L7y+/L8+Xl8jp5l3xE/r/M+j34 vfg9XSb9Hv1e/Z7fKP0Z/FkAAAAgYBG5ufyMPEeWMLiPysflFfJwua1cQgIAAHQWD/pvlqfKR2U0eLZR @@ -2911,7 +2911,7 @@ iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL - EAAACxABrSO9dQAAAeRJREFUeF7tzjGOIzEMAEH//9N3SaEzwzLH2plAFTZEUq/jOI7jOI5f+beZM8/l + DgAACw4BQL7hQQAAAeRJREFUeF7tzjGOIzEMAEH//9N3SaEzwzLH2plAFTZEUq/jOI7jOI5f+beZM8/l n9s481z+uY0zz+Wf2zjzHP4VeRtnIt/HPyJv40zk+/hH5G2ciXwf/4i8jTOR/467kW/jG5H3cSfybXwj 8j7uRL6Nb0Tex53It/GNyL9jb+RlxsasWWYs8pw9kZcZG7NmmbHIc/ZEXmZszJplxiLP2RN5mbExa5YZ izxnT+RlxiK/5VnkZcYiz9kTeZmxyG95FnmZschz9kReZizyW55FXmYs8pw9kZcZi/yWZ5GXGYs8Z0/k @@ -7214,6 +7214,18 @@ System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + toolStripSeparator2 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + toolStripSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + toolStripSeparator3 @@ -7526,6 +7538,18 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + recentlyOpenToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + exitToolStripMenuItem + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + editToolStripMenuItem @@ -7724,30 +7748,6 @@ System.Windows.Forms.ImageList, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - recentlyOpenToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator2 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - exitToolStripMenuItem - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - toolStripSeparator4 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - MainForm