Merge pull request #5 from shiftos-game/master

merge

1 files changed, 274 insertions, 235 deletions

diff --git a/ShiftOS.WinForms/Applications/Artpad.Designer.cs b/ShiftOS.WinForms/Applications/Artpad.Designer.cs
index 7b94c34..f30839a 100644
--- a/ShiftOS.WinForms/Applications/Artpad.Designer.cs
+++ b/ShiftOS.WinForms/Applications/Artpad.Designer.cs
@@ -50,7 +50,6 @@ namespace ShiftOS.WinForms.Applications
             this.pgcontents = new System.Windows.Forms.Panel();
             this.pnldrawingbackground = new System.Windows.Forms.Panel();
             this.pnlinitialcanvassettings = new System.Windows.Forms.Panel();
-            this.btncancel = new System.Windows.Forms.Button();
             this.btncreate = new System.Windows.Forms.Button();
             this.Label11 = new System.Windows.Forms.Label();
             this.lbltotalpixels = new System.Windows.Forms.Label();
@@ -205,6 +204,11 @@ namespace ShiftOS.WinForms.Applications
             this.Label4 = new System.Windows.Forms.Label();
             this.line6 = new System.Windows.Forms.Panel();
             this.pnltoolproperties = new System.Windows.Forms.Panel();
+            this.pnlmagnifiersettings = new System.Windows.Forms.Panel();
+            this.btnzoomout = new System.Windows.Forms.Button();
+            this.btnzoomin = new System.Windows.Forms.Button();
+            this.lblzoomlevel = new System.Windows.Forms.Label();
+            this.Label7 = new System.Windows.Forms.Label();
             this.pnleracertoolsettings = new System.Windows.Forms.Panel();
             this.Label28 = new System.Windows.Forms.Label();
             this.btneracersquare = new System.Windows.Forms.Button();
@@ -255,11 +259,6 @@ namespace ShiftOS.WinForms.Applications
             this.Label3 = new System.Windows.Forms.Label();
             this.Label2 = new System.Windows.Forms.Label();
             this.Label1 = new System.Windows.Forms.Label();
-            this.pnlmagnifiersettings = new System.Windows.Forms.Panel();
-            this.btnzoomout = new System.Windows.Forms.Button();
-            this.btnzoomin = new System.Windows.Forms.Button();
-            this.lblzoomlevel = new System.Windows.Forms.Label();
-            this.Label7 = new System.Windows.Forms.Label();
             this.pnlfloodfillsettings = new System.Windows.Forms.Panel();
             this.Label12 = new System.Windows.Forms.Label();
             this.Label15 = new System.Windows.Forms.Label();
@@ -292,12 +291,6 @@ namespace ShiftOS.WinForms.Applications
             this.btnpaintbrush = new System.Windows.Forms.Button();
             this.btntexttool = new System.Windows.Forms.Button();
             this.btneracer = new System.Windows.Forms.Button();
-            this.btnnew = new System.Windows.Forms.Button();
-            this.btnmagnify = new System.Windows.Forms.Button();
-            this.btnopen = new System.Windows.Forms.Button();
-            this.btnsave = new System.Windows.Forms.Button();
-            this.btnundo = new System.Windows.Forms.Button();
-            this.btnredo = new System.Windows.Forms.Button();
             this.line1 = new System.Windows.Forms.Panel();
             this.pnltoolpreview = new System.Windows.Forms.Panel();
             this.Label13 = new System.Windows.Forms.Label();
@@ -311,6 +304,22 @@ namespace ShiftOS.WinForms.Applications
             this.pullbottom = new System.Windows.Forms.Timer(this.components);
             this.pullside = new System.Windows.Forms.Timer(this.components);
             this.tmrsetupui = new System.Windows.Forms.Timer(this.components);
+            this.msTools = new System.Windows.Forms.MenuStrip();
+            this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gENNEWToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gENLOADToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gENSAVEToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.gENEXITToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.undoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.redoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.viewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.zoomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem5 = new System.Windows.Forms.ToolStripMenuItem();
+            this.moreControlsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.pgcontents.SuspendLayout();
             this.pnldrawingbackground.SuspendLayout();
             this.pnlinitialcanvassettings.SuspendLayout();
@@ -320,6 +329,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnlpallet.SuspendLayout();
             this.flowcolours.SuspendLayout();
             this.pnltoolproperties.SuspendLayout();
+            this.pnlmagnifiersettings.SuspendLayout();
             this.pnleracertoolsettings.SuspendLayout();
             this.pnlpixelplacersettings.SuspendLayout();
             this.pnlovaltoolsettings.SuspendLayout();
@@ -327,7 +337,6 @@ namespace ShiftOS.WinForms.Applications
             this.pnlpaintbrushtoolsettings.SuspendLayout();
             this.pnltexttoolsettings.SuspendLayout();
             this.pnlpixelsettersettings.SuspendLayout();
-            this.pnlmagnifiersettings.SuspendLayout();
             this.pnlfloodfillsettings.SuspendLayout();
             this.pnlsquaretoolsettings.SuspendLayout();
             this.pnlpencilsettings.SuspendLayout();
@@ -335,6 +344,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolpositioner.SuspendLayout();
             this.pnltoolpreview.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picpreview)).BeginInit();
+            this.msTools.SuspendLayout();
             this.SuspendLayout();
             // 
             // pgcontents
@@ -344,9 +354,9 @@ namespace ShiftOS.WinForms.Applications
             this.pgcontents.Controls.Add(this.pnlbottompanel);
             this.pgcontents.Controls.Add(this.pnltools);
             this.pgcontents.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.pgcontents.Location = new System.Drawing.Point(0, 0);
+            this.pgcontents.Location = new System.Drawing.Point(0, 24);
             this.pgcontents.Name = "pgcontents";
-            this.pgcontents.Size = new System.Drawing.Size(802, 598);
+            this.pgcontents.Size = new System.Drawing.Size(802, 574);
             this.pgcontents.TabIndex = 20;
             // 
             // pnldrawingbackground
@@ -365,7 +375,6 @@ namespace ShiftOS.WinForms.Applications
             // pnlinitialcanvassettings
             // 
             this.pnlinitialcanvassettings.BackColor = System.Drawing.Color.White;
-            this.pnlinitialcanvassettings.Controls.Add(this.btncancel);
             this.pnlinitialcanvassettings.Controls.Add(this.btncreate);
             this.pnlinitialcanvassettings.Controls.Add(this.Label11);
             this.pnlinitialcanvassettings.Controls.Add(this.lbltotalpixels);
@@ -373,28 +382,17 @@ namespace ShiftOS.WinForms.Applications
             this.pnlinitialcanvassettings.Controls.Add(this.Label10);
             this.pnlinitialcanvassettings.Controls.Add(this.txtnewcanvaswidth);
             this.pnlinitialcanvassettings.Controls.Add(this.Label9);
-            this.pnlinitialcanvassettings.Location = new System.Drawing.Point(223, 178);
+            this.pnlinitialcanvassettings.Location = new System.Drawing.Point(144, 137);
             this.pnlinitialcanvassettings.Name = "pnlinitialcanvassettings";
-            this.pnlinitialcanvassettings.Size = new System.Drawing.Size(223, 100);
+            this.pnlinitialcanvassettings.Size = new System.Drawing.Size(326, 160);
             this.pnlinitialcanvassettings.TabIndex = 1;
             // 
-            // btncancel
-            // 
-            this.btncancel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btncancel.Location = new System.Drawing.Point(7, 66);
-            this.btncancel.Name = "btncancel";
-            this.btncancel.Size = new System.Drawing.Size(102, 28);
-            this.btncancel.TabIndex = 7;
-            this.btncancel.Text = "Cancel";
-            this.btncancel.UseVisualStyleBackColor = true;
-            this.btncancel.Click += new System.EventHandler(this.btncancel_Click);
-            // 
             // btncreate
             // 
             this.btncreate.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btncreate.Location = new System.Drawing.Point(114, 66);
+            this.btncreate.Location = new System.Drawing.Point(196, 93);
             this.btncreate.Name = "btncreate";
-            this.btncreate.Size = new System.Drawing.Size(102, 28);
+            this.btncreate.Size = new System.Drawing.Size(115, 50);
             this.btncreate.TabIndex = 6;
             this.btncreate.Text = "Create";
             this.btncreate.UseVisualStyleBackColor = true;
@@ -403,19 +401,19 @@ namespace ShiftOS.WinForms.Applications
             // Label11
             // 
             this.Label11.AutoSize = true;
-            this.Label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label11.Location = new System.Drawing.Point(124, 9);
+            this.Label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 14F);
+            this.Label11.Location = new System.Drawing.Point(200, 7);
             this.Label11.Name = "Label11";
-            this.Label11.Size = new System.Drawing.Size(88, 20);
+            this.Label11.Size = new System.Drawing.Size(106, 24);
             this.Label11.TabIndex = 5;
             this.Label11.Text = "Total Pixels";
             // 
             // lbltotalpixels
             // 
-            this.lbltotalpixels.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lbltotalpixels.Location = new System.Drawing.Point(114, 30);
+            this.lbltotalpixels.Font = new System.Drawing.Font("Microsoft Sans Serif", 22F);
+            this.lbltotalpixels.Location = new System.Drawing.Point(181, 31);
             this.lbltotalpixels.Name = "lbltotalpixels";
-            this.lbltotalpixels.Size = new System.Drawing.Size(106, 29);
+            this.lbltotalpixels.Size = new System.Drawing.Size(143, 56);
             this.lbltotalpixels.TabIndex = 4;
             this.lbltotalpixels.Text = "0";
             this.lbltotalpixels.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -424,21 +422,22 @@ namespace ShiftOS.WinForms.Applications
             // 
             this.txtnewcanvasheight.BackColor = System.Drawing.Color.White;
             this.txtnewcanvasheight.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.txtnewcanvasheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtnewcanvasheight.Location = new System.Drawing.Point(59, 37);
+            this.txtnewcanvasheight.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+            this.txtnewcanvasheight.Location = new System.Drawing.Point(82, 93);
             this.txtnewcanvasheight.MaxLength = 4;
             this.txtnewcanvasheight.Name = "txtnewcanvasheight";
-            this.txtnewcanvasheight.Size = new System.Drawing.Size(54, 22);
+            this.txtnewcanvasheight.Size = new System.Drawing.Size(54, 26);
             this.txtnewcanvasheight.TabIndex = 3;
+            this.txtnewcanvasheight.Text = "0";
             this.txtnewcanvasheight.TextChanged += new System.EventHandler(this.txtnewcanvaswidth_TextChanged);
             // 
             // Label10
             // 
             this.Label10.AutoSize = true;
-            this.Label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label10.Location = new System.Drawing.Point(8, 40);
+            this.Label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+            this.Label10.Location = new System.Drawing.Point(7, 91);
             this.Label10.Name = "Label10";
-            this.Label10.Size = new System.Drawing.Size(50, 16);
+            this.Label10.Size = new System.Drawing.Size(74, 25);
             this.Label10.TabIndex = 2;
             this.Label10.Text = "Height:";
             // 
@@ -446,21 +445,22 @@ namespace ShiftOS.WinForms.Applications
             // 
             this.txtnewcanvaswidth.BackColor = System.Drawing.Color.White;
             this.txtnewcanvaswidth.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.txtnewcanvaswidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.txtnewcanvaswidth.Location = new System.Drawing.Point(59, 9);
+            this.txtnewcanvaswidth.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F);
+            this.txtnewcanvaswidth.Location = new System.Drawing.Point(82, 41);
             this.txtnewcanvaswidth.MaxLength = 4;
             this.txtnewcanvaswidth.Name = "txtnewcanvaswidth";
-            this.txtnewcanvaswidth.Size = new System.Drawing.Size(54, 22);
+            this.txtnewcanvaswidth.Size = new System.Drawing.Size(54, 26);
             this.txtnewcanvaswidth.TabIndex = 1;
+            this.txtnewcanvaswidth.Text = "0";
             this.txtnewcanvaswidth.TextChanged += new System.EventHandler(this.txtnewcanvaswidth_TextChanged);
             // 
             // Label9
             // 
             this.Label9.AutoSize = true;
-            this.Label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label9.Location = new System.Drawing.Point(8, 12);
+            this.Label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F);
+            this.Label9.Location = new System.Drawing.Point(7, 39);
             this.Label9.Name = "Label9";
-            this.Label9.Size = new System.Drawing.Size(45, 16);
+            this.Label9.Size = new System.Drawing.Size(69, 25);
             this.Label9.TabIndex = 0;
             this.Label9.Text = "Width:";
             // 
@@ -477,7 +477,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnlpalettesize.Controls.Add(this.Label42);
             this.pnlpalettesize.Controls.Add(this.txtcolorpalletwidth);
             this.pnlpalettesize.Controls.Add(this.Label43);
-            this.pnlpalettesize.Location = new System.Drawing.Point(207, 178);
+            this.pnlpalettesize.Location = new System.Drawing.Point(144, 303);
             this.pnlpalettesize.Name = "pnlpalettesize";
             this.pnlpalettesize.Size = new System.Drawing.Size(259, 100);
             this.pnlpalettesize.TabIndex = 2;
@@ -604,7 +604,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnlbottompanel.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.pnlbottompanel.Location = new System.Drawing.Point(120, 474);
             this.pnlbottompanel.Name = "pnlbottompanel";
-            this.pnlbottompanel.Size = new System.Drawing.Size(682, 124);
+            this.pnlbottompanel.Size = new System.Drawing.Size(682, 100);
             this.pnlbottompanel.TabIndex = 1;
             // 
             // pnlpallet
@@ -618,15 +618,15 @@ namespace ShiftOS.WinForms.Applications
             this.pnlpallet.Controls.Add(this.line6);
             this.pnlpallet.Location = new System.Drawing.Point(457, 0);
             this.pnlpallet.Name = "pnlpallet";
-            this.pnlpallet.Size = new System.Drawing.Size(225, 124);
+            this.pnlpallet.Size = new System.Drawing.Size(225, 100);
             this.pnlpallet.TabIndex = 0;
             // 
             // label44
             // 
             this.label44.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label44.Location = new System.Drawing.Point(0, 24);
+            this.label44.Location = new System.Drawing.Point(0, 16);
             this.label44.Name = "label44";
-            this.label44.Size = new System.Drawing.Size(225, 27);
+            this.label44.Size = new System.Drawing.Size(225, 11);
             this.label44.TabIndex = 13;
             this.label44.Text = "Left click to select, right click to change color";
             this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -762,7 +762,7 @@ namespace ShiftOS.WinForms.Applications
             this.flowcolours.Controls.Add(this.colourpallet127);
             this.flowcolours.Controls.Add(this.colourpallet128);
             this.flowcolours.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.flowcolours.Location = new System.Drawing.Point(0, 51);
+            this.flowcolours.Location = new System.Drawing.Point(0, 27);
             this.flowcolours.Name = "flowcolours";
             this.flowcolours.Padding = new System.Windows.Forms.Padding(1, 1, 0, 0);
             this.flowcolours.Size = new System.Drawing.Size(225, 73);
@@ -2054,9 +2054,9 @@ namespace ShiftOS.WinForms.Applications
             this.Label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label4.Location = new System.Drawing.Point(0, 1);
             this.Label4.Name = "Label4";
-            this.Label4.Size = new System.Drawing.Size(225, 23);
+            this.Label4.Size = new System.Drawing.Size(225, 15);
             this.Label4.TabIndex = 11;
-            this.Label4.Text = "Colours";
+            this.Label4.Text = "Colors";
             this.Label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // line6
@@ -2070,6 +2070,7 @@ namespace ShiftOS.WinForms.Applications
             // 
             // pnltoolproperties
             // 
+            this.pnltoolproperties.Controls.Add(this.pnlmagnifiersettings);
             this.pnltoolproperties.Controls.Add(this.pnleracertoolsettings);
             this.pnltoolproperties.Controls.Add(this.pnlpixelplacersettings);
             this.pnltoolproperties.Controls.Add(this.pnlovaltoolsettings);
@@ -2077,7 +2078,6 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolproperties.Controls.Add(this.pnlpaintbrushtoolsettings);
             this.pnltoolproperties.Controls.Add(this.pnltexttoolsettings);
             this.pnltoolproperties.Controls.Add(this.pnlpixelsettersettings);
-            this.pnltoolproperties.Controls.Add(this.pnlmagnifiersettings);
             this.pnltoolproperties.Controls.Add(this.pnlfloodfillsettings);
             this.pnltoolproperties.Controls.Add(this.pnlsquaretoolsettings);
             this.pnltoolproperties.Controls.Add(this.pnlpencilsettings);
@@ -2090,6 +2090,60 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolproperties.Size = new System.Drawing.Size(457, 100);
             this.pnltoolproperties.TabIndex = 1;
             // 
+            // pnlmagnifiersettings
+            // 
+            this.pnlmagnifiersettings.Controls.Add(this.btnzoomout);
+            this.pnlmagnifiersettings.Controls.Add(this.btnzoomin);
+            this.pnlmagnifiersettings.Controls.Add(this.lblzoomlevel);
+            this.pnlmagnifiersettings.Controls.Add(this.Label7);
+            this.pnlmagnifiersettings.Location = new System.Drawing.Point(78, 50);
+            this.pnlmagnifiersettings.Name = "pnlmagnifiersettings";
+            this.pnlmagnifiersettings.Size = new System.Drawing.Size(67, 44);
+            this.pnlmagnifiersettings.TabIndex = 6;
+            this.pnlmagnifiersettings.Visible = false;
+            // 
+            // btnzoomout
+            // 
+            this.btnzoomout.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnzoomout.Location = new System.Drawing.Point(16, 33);
+            this.btnzoomout.Name = "btnzoomout";
+            this.btnzoomout.Size = new System.Drawing.Size(129, 56);
+            this.btnzoomout.TabIndex = 11;
+            this.btnzoomout.Text = "-";
+            this.btnzoomout.UseVisualStyleBackColor = true;
+            this.btnzoomout.Click += new System.EventHandler(this.btnzoomout_Click);
+            // 
+            // btnzoomin
+            // 
+            this.btnzoomin.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnzoomin.Location = new System.Drawing.Point(313, 33);
+            this.btnzoomin.Name = "btnzoomin";
+            this.btnzoomin.Size = new System.Drawing.Size(129, 56);
+            this.btnzoomin.TabIndex = 10;
+            this.btnzoomin.Text = "+";
+            this.btnzoomin.UseVisualStyleBackColor = true;
+            this.btnzoomin.Click += new System.EventHandler(this.btnzoomin_Click);
+            // 
+            // lblzoomlevel
+            // 
+            this.lblzoomlevel.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.lblzoomlevel.Location = new System.Drawing.Point(151, 33);
+            this.lblzoomlevel.Name = "lblzoomlevel";
+            this.lblzoomlevel.Size = new System.Drawing.Size(156, 56);
+            this.lblzoomlevel.TabIndex = 1;
+            this.lblzoomlevel.Text = "1X";
+            this.lblzoomlevel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // Label7
+            // 
+            this.Label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.Label7.Location = new System.Drawing.Point(6, 3);
+            this.Label7.Name = "Label7";
+            this.Label7.Size = new System.Drawing.Size(444, 23);
+            this.Label7.TabIndex = 0;
+            this.Label7.Text = "Magnifier Settings";
+            this.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
             // pnleracertoolsettings
             // 
             this.pnleracertoolsettings.Controls.Add(this.Label28);
@@ -2120,7 +2174,7 @@ namespace ShiftOS.WinForms.Applications
             this.btneracersquare.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadsquarerubberselected;
             this.btneracersquare.FlatAppearance.BorderSize = 0;
             this.btneracersquare.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btneracersquare.Location = new System.Drawing.Point(75, 21);
+            this.btneracersquare.Location = new System.Drawing.Point(75, 15);
             this.btneracersquare.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
             this.btneracersquare.Name = "btneracersquare";
             this.btneracersquare.Size = new System.Drawing.Size(60, 50);
@@ -2134,7 +2188,7 @@ namespace ShiftOS.WinForms.Applications
             this.btneracercircle.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadcirclerubber;
             this.btneracercircle.FlatAppearance.BorderSize = 0;
             this.btneracercircle.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btneracercircle.Location = new System.Drawing.Point(9, 21);
+            this.btneracercircle.Location = new System.Drawing.Point(9, 15);
             this.btneracercircle.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
             this.btneracercircle.Name = "btneracercircle";
             this.btneracercircle.Size = new System.Drawing.Size(60, 50);
@@ -2146,9 +2200,9 @@ namespace ShiftOS.WinForms.Applications
             // Label24
             // 
             this.Label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label24.Location = new System.Drawing.Point(141, 29);
+            this.Label24.Location = new System.Drawing.Point(141, 25);
             this.Label24.Name = "Label24";
-            this.Label24.Size = new System.Drawing.Size(314, 38);
+            this.Label24.Size = new System.Drawing.Size(314, 35);
             this.Label24.TabIndex = 15;
             this.Label24.Text = "Choose a shape and size for your eracer then rub out unwanted parts of your drawi" +
     "ng with the mouse.";
@@ -2159,7 +2213,7 @@ namespace ShiftOS.WinForms.Applications
             this.txteracersize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txteracersize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.txteracersize.ForeColor = System.Drawing.Color.Black;
-            this.txteracersize.Location = new System.Drawing.Point(198, 70);
+            this.txteracersize.Location = new System.Drawing.Point(198, 69);
             this.txteracersize.Name = "txteracersize";
             this.txteracersize.Size = new System.Drawing.Size(73, 26);
             this.txteracersize.TabIndex = 12;
@@ -2180,7 +2234,7 @@ namespace ShiftOS.WinForms.Applications
             this.Label27.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.Label27.Location = new System.Drawing.Point(6, 3);
             this.Label27.Name = "Label27";
-            this.Label27.Size = new System.Drawing.Size(444, 23);
+            this.Label27.Size = new System.Drawing.Size(444, 18);
             this.Label27.TabIndex = 0;
             this.Label27.Text = "Eraser Tool Settings";
             this.Label27.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -2661,60 +2715,6 @@ namespace ShiftOS.WinForms.Applications
             this.Label1.Text = "Pixel Setter Settings";
             this.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
-            // pnlmagnifiersettings
-            // 
-            this.pnlmagnifiersettings.Controls.Add(this.btnzoomout);
-            this.pnlmagnifiersettings.Controls.Add(this.btnzoomin);
-            this.pnlmagnifiersettings.Controls.Add(this.lblzoomlevel);
-            this.pnlmagnifiersettings.Controls.Add(this.Label7);
-            this.pnlmagnifiersettings.Location = new System.Drawing.Point(78, 50);
-            this.pnlmagnifiersettings.Name = "pnlmagnifiersettings";
-            this.pnlmagnifiersettings.Size = new System.Drawing.Size(67, 44);
-            this.pnlmagnifiersettings.TabIndex = 6;
-            this.pnlmagnifiersettings.Visible = false;
-            // 
-            // btnzoomout
-            // 
-            this.btnzoomout.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnzoomout.Location = new System.Drawing.Point(16, 33);
-            this.btnzoomout.Name = "btnzoomout";
-            this.btnzoomout.Size = new System.Drawing.Size(129, 56);
-            this.btnzoomout.TabIndex = 11;
-            this.btnzoomout.Text = "-";
-            this.btnzoomout.UseVisualStyleBackColor = true;
-            this.btnzoomout.Click += new System.EventHandler(this.btnzoomout_Click);
-            // 
-            // btnzoomin
-            // 
-            this.btnzoomin.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnzoomin.Location = new System.Drawing.Point(313, 33);
-            this.btnzoomin.Name = "btnzoomin";
-            this.btnzoomin.Size = new System.Drawing.Size(129, 56);
-            this.btnzoomin.TabIndex = 10;
-            this.btnzoomin.Text = "+";
-            this.btnzoomin.UseVisualStyleBackColor = true;
-            this.btnzoomin.Click += new System.EventHandler(this.btnzoomin_Click);
-            // 
-            // lblzoomlevel
-            // 
-            this.lblzoomlevel.Font = new System.Drawing.Font("Microsoft Sans Serif", 36F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblzoomlevel.Location = new System.Drawing.Point(151, 33);
-            this.lblzoomlevel.Name = "lblzoomlevel";
-            this.lblzoomlevel.Size = new System.Drawing.Size(156, 56);
-            this.lblzoomlevel.TabIndex = 1;
-            this.lblzoomlevel.Text = "1X";
-            this.lblzoomlevel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
-            // Label7
-            // 
-            this.Label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.Label7.Location = new System.Drawing.Point(6, 3);
-            this.Label7.Name = "Label7";
-            this.Label7.Size = new System.Drawing.Size(444, 23);
-            this.Label7.TabIndex = 0;
-            this.Label7.Text = "Magnifier Settings";
-            this.Label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            // 
             // pnlfloodfillsettings
             // 
             this.pnlfloodfillsettings.Controls.Add(this.Label12);
@@ -2933,7 +2933,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnltools.Dock = System.Windows.Forms.DockStyle.Left;
             this.pnltools.Location = new System.Drawing.Point(0, 0);
             this.pnltools.Name = "pnltools";
-            this.pnltools.Size = new System.Drawing.Size(120, 598);
+            this.pnltools.Size = new System.Drawing.Size(120, 574);
             this.pnltools.TabIndex = 0;
             // 
             // pnltoolpositioner
@@ -2946,18 +2946,12 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolpositioner.Controls.Add(this.btnsquare);
             this.pnltoolpositioner.Controls.Add(this.btnlinetool);
             this.pnltoolpositioner.Controls.Add(this.btnpaintbrush);
-            this.pnltoolpositioner.Controls.Add(this.btntexttool);
             this.pnltoolpositioner.Controls.Add(this.btneracer);
-            this.pnltoolpositioner.Controls.Add(this.btnnew);
-            this.pnltoolpositioner.Controls.Add(this.btnmagnify);
-            this.pnltoolpositioner.Controls.Add(this.btnopen);
-            this.pnltoolpositioner.Controls.Add(this.btnsave);
-            this.pnltoolpositioner.Controls.Add(this.btnundo);
-            this.pnltoolpositioner.Controls.Add(this.btnredo);
+            this.pnltoolpositioner.Controls.Add(this.btntexttool);
             this.pnltoolpositioner.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pnltoolpositioner.Location = new System.Drawing.Point(0, 0);
             this.pnltoolpositioner.Name = "pnltoolpositioner";
-            this.pnltoolpositioner.Size = new System.Drawing.Size(119, 498);
+            this.pnltoolpositioner.Size = new System.Drawing.Size(119, 474);
             this.pnltoolpositioner.TabIndex = 2;
             // 
             // btnpixelsetter
@@ -3090,7 +3084,7 @@ namespace ShiftOS.WinForms.Applications
             this.btntexttool.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.btntexttool.FlatAppearance.BorderSize = 0;
             this.btntexttool.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btntexttool.Location = new System.Drawing.Point(6, 230);
+            this.btntexttool.Location = new System.Drawing.Point(62, 230);
             this.btntexttool.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
             this.btntexttool.Name = "btntexttool";
             this.btntexttool.Size = new System.Drawing.Size(50, 50);
@@ -3106,7 +3100,7 @@ namespace ShiftOS.WinForms.Applications
             this.btneracer.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
             this.btneracer.FlatAppearance.BorderSize = 0;
             this.btneracer.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btneracer.Location = new System.Drawing.Point(62, 230);
+            this.btneracer.Location = new System.Drawing.Point(6, 230);
             this.btneracer.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
             this.btneracer.Name = "btneracer";
             this.btneracer.Size = new System.Drawing.Size(50, 50);
@@ -3116,109 +3110,13 @@ namespace ShiftOS.WinForms.Applications
             this.btneracer.UseVisualStyleBackColor = true;
             this.btneracer.Click += new System.EventHandler(this.btneracer_Click);
             // 
-            // btnnew
-            // 
-            this.btnnew.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadnew;
-            this.btnnew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnnew.FlatAppearance.BorderSize = 0;
-            this.btnnew.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnnew.Location = new System.Drawing.Point(6, 286);
-            this.btnnew.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnnew.Name = "btnnew";
-            this.btnnew.Size = new System.Drawing.Size(50, 50);
-            this.btnnew.TabIndex = 6;
-            this.btnnew.Tag = "nobuttonskin";
-            this.btnnew.Text = " ";
-            this.btnnew.UseVisualStyleBackColor = true;
-            this.btnnew.Click += new System.EventHandler(this.btnnew_Click);
-            // 
-            // btnmagnify
-            // 
-            this.btnmagnify.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadmagnify;
-            this.btnmagnify.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnmagnify.FlatAppearance.BorderSize = 0;
-            this.btnmagnify.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnmagnify.Location = new System.Drawing.Point(62, 286);
-            this.btnmagnify.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnmagnify.Name = "btnmagnify";
-            this.btnmagnify.Size = new System.Drawing.Size(50, 50);
-            this.btnmagnify.TabIndex = 3;
-            this.btnmagnify.Tag = "nobuttonskin";
-            this.btnmagnify.Text = " ";
-            this.btnmagnify.UseVisualStyleBackColor = true;
-            this.btnmagnify.Click += new System.EventHandler(this.btnmagnify_Click);
-            // 
-            // btnopen
-            // 
-            this.btnopen.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadopen;
-            this.btnopen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnopen.FlatAppearance.BorderSize = 0;
-            this.btnopen.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnopen.Location = new System.Drawing.Point(6, 342);
-            this.btnopen.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnopen.Name = "btnopen";
-            this.btnopen.Size = new System.Drawing.Size(50, 50);
-            this.btnopen.TabIndex = 10;
-            this.btnopen.Tag = "nobuttonskin";
-            this.btnopen.Text = " ";
-            this.btnopen.UseVisualStyleBackColor = true;
-            this.btnopen.Click += new System.EventHandler(this.btnopen_Click);
-            // 
-            // btnsave
-            // 
-            this.btnsave.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadsave;
-            this.btnsave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnsave.FlatAppearance.BorderSize = 0;
-            this.btnsave.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnsave.Location = new System.Drawing.Point(62, 342);
-            this.btnsave.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnsave.Name = "btnsave";
-            this.btnsave.Size = new System.Drawing.Size(50, 50);
-            this.btnsave.TabIndex = 5;
-            this.btnsave.Tag = "nobuttonskin";
-            this.btnsave.Text = " ";
-            this.btnsave.UseVisualStyleBackColor = true;
-            this.btnsave.Click += new System.EventHandler(this.btnsave_Click);
-            // 
-            // btnundo
-            // 
-            this.btnundo.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadundo;
-            this.btnundo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnundo.FlatAppearance.BorderSize = 0;
-            this.btnundo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnundo.Location = new System.Drawing.Point(6, 398);
-            this.btnundo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnundo.Name = "btnundo";
-            this.btnundo.Size = new System.Drawing.Size(50, 50);
-            this.btnundo.TabIndex = 8;
-            this.btnundo.Tag = "nobuttonskin";
-            this.btnundo.Text = " ";
-            this.btnundo.UseVisualStyleBackColor = true;
-            this.btnundo.Click += new System.EventHandler(this.btnundo_Click);
-            // 
-            // btnredo
-            // 
-            this.btnredo.BackgroundImage = global::ShiftOS.WinForms.Properties.Resources.ArtPadredo;
-            this.btnredo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.btnredo.FlatAppearance.BorderSize = 0;
-            this.btnredo.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.btnredo.Location = new System.Drawing.Point(62, 398);
-            this.btnredo.Margin = new System.Windows.Forms.Padding(6, 6, 0, 0);
-            this.btnredo.Name = "btnredo";
-            this.btnredo.Size = new System.Drawing.Size(50, 50);
-            this.btnredo.TabIndex = 9;
-            this.btnredo.Tag = "nobuttonskin";
-            this.btnredo.Text = " ";
-            this.btnredo.UseVisualStyleBackColor = true;
-            this.btnredo.Click += new System.EventHandler(this.btnredo_Click);
-            // 
             // line1
             // 
             this.line1.BackColor = System.Drawing.Color.Black;
             this.line1.Dock = System.Windows.Forms.DockStyle.Right;
             this.line1.Location = new System.Drawing.Point(119, 0);
             this.line1.Name = "line1";
-            this.line1.Size = new System.Drawing.Size(1, 498);
+            this.line1.Size = new System.Drawing.Size(1, 474);
             this.line1.TabIndex = 1;
             // 
             // pnltoolpreview
@@ -3229,7 +3127,7 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolpreview.Controls.Add(this.line4);
             this.pnltoolpreview.Controls.Add(this.line2);
             this.pnltoolpreview.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pnltoolpreview.Location = new System.Drawing.Point(0, 498);
+            this.pnltoolpreview.Location = new System.Drawing.Point(0, 474);
             this.pnltoolpreview.Name = "pnltoolpreview";
             this.pnltoolpreview.Size = new System.Drawing.Size(120, 100);
             this.pnltoolpreview.TabIndex = 0;
@@ -3305,11 +3203,140 @@ namespace ShiftOS.WinForms.Applications
             // 
             this.tmrsetupui.Tick += new System.EventHandler(this.tmrsetupui_Tick);
             // 
+            // msTools
+            // 
+            this.msTools.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.fileToolStripMenuItem,
+            this.editToolStripMenuItem,
+            this.viewToolStripMenuItem});
+            this.msTools.Location = new System.Drawing.Point(0, 0);
+            this.msTools.Name = "msTools";
+            this.msTools.Size = new System.Drawing.Size(802, 24);
+            this.msTools.TabIndex = 3;
+            this.msTools.Text = "menuStrip1";
+            // 
+            // fileToolStripMenuItem
+            // 
+            this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.gENNEWToolStripMenuItem,
+            this.gENLOADToolStripMenuItem,
+            this.gENSAVEToolStripMenuItem,
+            this.gENEXITToolStripMenuItem});
+            this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
+            this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20);
+            this.fileToolStripMenuItem.Text = "File";
+            // 
+            // gENNEWToolStripMenuItem
+            // 
+            this.gENNEWToolStripMenuItem.Name = "gENNEWToolStripMenuItem";
+            this.gENNEWToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.gENNEWToolStripMenuItem.Text = "{GEN_NEW}";
+            this.gENNEWToolStripMenuItem.Click += new System.EventHandler(this.btnnew_Click);
+            // 
+            // gENLOADToolStripMenuItem
+            // 
+            this.gENLOADToolStripMenuItem.Name = "gENLOADToolStripMenuItem";
+            this.gENLOADToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.gENLOADToolStripMenuItem.Text = "{GEN_LOAD}";
+            this.gENLOADToolStripMenuItem.Click += new System.EventHandler(this.btnopen_Click);
+            // 
+            // gENSAVEToolStripMenuItem
+            // 
+            this.gENSAVEToolStripMenuItem.Name = "gENSAVEToolStripMenuItem";
+            this.gENSAVEToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.gENSAVEToolStripMenuItem.Text = "{GEN_SAVE}";
+            this.gENSAVEToolStripMenuItem.Click += new System.EventHandler(this.btnsave_Click);
+            // 
+            // gENEXITToolStripMenuItem
+            // 
+            this.gENEXITToolStripMenuItem.Name = "gENEXITToolStripMenuItem";
+            this.gENEXITToolStripMenuItem.Size = new System.Drawing.Size(140, 22);
+            this.gENEXITToolStripMenuItem.Text = "{GEN_EXIT}";
+            // 
+            // editToolStripMenuItem
+            // 
+            this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.undoToolStripMenuItem,
+            this.redoToolStripMenuItem});
+            this.editToolStripMenuItem.Name = "editToolStripMenuItem";
+            this.editToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
+            this.editToolStripMenuItem.Text = "Edit";
+            // 
+            // undoToolStripMenuItem
+            // 
+            this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
+            this.undoToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
+            this.undoToolStripMenuItem.Text = "Undo";
+            this.undoToolStripMenuItem.Click += new System.EventHandler(this.btnundo_Click);
+            // 
+            // redoToolStripMenuItem
+            // 
+            this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
+            this.redoToolStripMenuItem.Size = new System.Drawing.Size(100, 22);
+            this.redoToolStripMenuItem.Text = "Redo";
+            this.redoToolStripMenuItem.Click += new System.EventHandler(this.btnredo_Click);
+            // 
+            // viewToolStripMenuItem
+            // 
+            this.viewToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.zoomToolStripMenuItem});
+            this.viewToolStripMenuItem.Name = "viewToolStripMenuItem";
+            this.viewToolStripMenuItem.Size = new System.Drawing.Size(42, 20);
+            this.viewToolStripMenuItem.Text = "View";
+            // 
+            // zoomToolStripMenuItem
+            // 
+            this.zoomToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem2,
+            this.toolStripMenuItem3,
+            this.toolStripMenuItem4,
+            this.toolStripMenuItem5,
+            this.moreControlsToolStripMenuItem});
+            this.zoomToolStripMenuItem.Name = "zoomToolStripMenuItem";
+            this.zoomToolStripMenuItem.Size = new System.Drawing.Size(101, 22);
+            this.zoomToolStripMenuItem.Text = "Zoom";
+            // 
+            // toolStripMenuItem2
+            // 
+            this.toolStripMenuItem2.Name = "toolStripMenuItem2";
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(138, 22);
+            this.toolStripMenuItem2.Text = "25%";
+            this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
+            // 
+            // toolStripMenuItem3
+            // 
+            this.toolStripMenuItem3.Name = "toolStripMenuItem3";
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(138, 22);
+            this.toolStripMenuItem3.Text = "50%";
+            this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
+            // 
+            // toolStripMenuItem4
+            // 
+            this.toolStripMenuItem4.Name = "toolStripMenuItem4";
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(138, 22);
+            this.toolStripMenuItem4.Text = "100%";
+            this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
+            // 
+            // toolStripMenuItem5
+            // 
+            this.toolStripMenuItem5.Name = "toolStripMenuItem5";
+            this.toolStripMenuItem5.Size = new System.Drawing.Size(138, 22);
+            this.toolStripMenuItem5.Text = "200%";
+            this.toolStripMenuItem5.Click += new System.EventHandler(this.toolStripMenuItem5_Click);
+            // 
+            // moreControlsToolStripMenuItem
+            // 
+            this.moreControlsToolStripMenuItem.Name = "moreControlsToolStripMenuItem";
+            this.moreControlsToolStripMenuItem.Size = new System.Drawing.Size(138, 22);
+            this.moreControlsToolStripMenuItem.Text = "More controls";
+            this.moreControlsToolStripMenuItem.Click += new System.EventHandler(this.btnmagnify_Click);
+            // 
             // Artpad
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.pgcontents);
+            this.Controls.Add(this.msTools);
             this.MinimumSize = new System.Drawing.Size(502, 398);
             this.Name = "Artpad";
             this.Size = new System.Drawing.Size(802, 598);
@@ -3327,6 +3354,7 @@ namespace ShiftOS.WinForms.Applications
             this.flowcolours.ResumeLayout(false);
             this.pnltoolproperties.ResumeLayout(false);
             this.pnltoolproperties.PerformLayout();
+            this.pnlmagnifiersettings.ResumeLayout(false);
             this.pnleracertoolsettings.ResumeLayout(false);
             this.pnleracertoolsettings.PerformLayout();
             this.pnlpixelplacersettings.ResumeLayout(false);
@@ -3340,7 +3368,6 @@ namespace ShiftOS.WinForms.Applications
             this.pnltexttoolsettings.PerformLayout();
             this.pnlpixelsettersettings.ResumeLayout(false);
             this.pnlpixelsettersettings.PerformLayout();
-            this.pnlmagnifiersettings.ResumeLayout(false);
             this.pnlfloodfillsettings.ResumeLayout(false);
             this.pnlsquaretoolsettings.ResumeLayout(false);
             this.pnlsquaretoolsettings.PerformLayout();
@@ -3349,7 +3376,10 @@ namespace ShiftOS.WinForms.Applications
             this.pnltoolpositioner.ResumeLayout(false);
             this.pnltoolpreview.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.picpreview)).EndInit();
+            this.msTools.ResumeLayout(false);
+            this.msTools.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
         internal System.Windows.Forms.Panel pgcontents;
@@ -3369,7 +3399,6 @@ namespace ShiftOS.WinForms.Applications
         internal System.Windows.Forms.Button btnpixelsettersetpixel;
         internal System.Windows.Forms.TextBox txtpixelsetterycoordinate;
         internal System.Windows.Forms.TextBox txtpixelsetterxcoordinate;
-        internal System.Windows.Forms.Button btnmagnify;
         internal System.Windows.Forms.Panel colourpallet32;
         internal System.Windows.Forms.Panel colourpallet31;
         internal System.Windows.Forms.Panel colourpallet30;
@@ -3415,7 +3444,6 @@ namespace ShiftOS.WinForms.Applications
         internal System.Windows.Forms.Label lblpixelplacerhelp;
         internal System.Windows.Forms.Label Label6;
         internal System.Windows.Forms.Label Label5;
-        internal System.Windows.Forms.Button btnnew;
         internal System.Windows.Forms.FlowLayoutPanel flowcolours;
         internal System.Windows.Forms.Button btnpencil;
         internal System.Windows.Forms.Panel pnlpencilsettings;
@@ -3454,10 +3482,6 @@ namespace ShiftOS.WinForms.Applications
         internal System.Windows.Forms.Label lbltoolselected;
         internal System.Windows.Forms.Panel line4;
         internal System.Windows.Forms.Panel line2;
-        internal System.Windows.Forms.Button btnopen;
-        internal System.Windows.Forms.Button btnsave;
-        internal System.Windows.Forms.Button btnundo;
-        internal System.Windows.Forms.Button btnredo;
         internal System.Windows.Forms.Button btneracer;
         internal System.Windows.Forms.Button btnlinetool;
         internal System.Windows.Forms.Panel pnllinetoolsettings;
@@ -3503,7 +3527,6 @@ namespace ShiftOS.WinForms.Applications
         internal System.Windows.Forms.TextBox txtcolorpalletwidth;
         internal System.Windows.Forms.Label Label43;
         internal System.Windows.Forms.Panel pnlinitialcanvassettings;
-        internal System.Windows.Forms.Button btncancel;
         internal System.Windows.Forms.Button btncreate;
         internal System.Windows.Forms.Label Label11;
         internal System.Windows.Forms.Label lbltotalpixels;
@@ -3616,5 +3639,21 @@ namespace ShiftOS.WinForms.Applications
         internal System.Windows.Forms.Timer pullside;
         private System.Windows.Forms.Timer tmrsetupui;
         private System.Windows.Forms.Label label44;
+        private System.Windows.Forms.MenuStrip msTools;
+        private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem gENNEWToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem gENLOADToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem gENSAVEToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem gENEXITToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem redoToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem viewToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem zoomToolStripMenuItem;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem3;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem4;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem5;
+        private System.Windows.Forms.ToolStripMenuItem moreControlsToolStripMenuItem;
     }
 }
\ No newline at end of file