Small adjustments

2 files changed, 22 insertions, 16 deletions

diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs
index 1e68101..2cb9880 100644
--- a/TimeHACK.Main/OS/Win95/Win95.cs
+++ b/TimeHACK.Main/OS/Win95/Win95.cs
@@ -62,9 +62,11 @@ namespace TimeHACK.OS.Win95
             //nonimportantapps.Capacity = 100;
             this.SendToBack();
 
-            // THIS IS TESTING STUFF HERE:
-            taskbarItems = tb.AddTaskbarItem95("0", "Test app", Properties.Resources.Win95IconWordpad, (UserControl)new Win95TaskBarItem(), taskbarItems);
+            // Update the taskbar
             UpdateTaskbar();
+
+            // Bring to this the front
+            this.BringToFront();
         }
 
         private void fontLoad()
@@ -273,6 +275,11 @@ namespace TimeHACK.OS.Win95
             WinClassicWordPad wp = new WinClassicWordPad();
             WinClassic app = wm.startWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true);
             AddTaskBarItem(app, app.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad);
+
+            nonimportantapps.Add(app);
+            nonimportantapps[nonimportantapps.Count - 1].BringToFront();
+            nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing);
+
             app.BringToFront();
             startmenu.Hide();
         }
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
index d59f803..04145dd 100644
--- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
+++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs
@@ -175,7 +175,7 @@
             this.undoToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.undoToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
-            this.undoToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.undoToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.undoToolStripMenuItem.Text = "Undo";
             this.undoToolStripMenuItem.Click += new System.EventHandler(this.undoToolStripMenuItem_Click);
             // 
@@ -185,7 +185,7 @@
             this.cutToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.cutToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
-            this.cutToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.cutToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.cutToolStripMenuItem.Text = "Cut";
             this.cutToolStripMenuItem.Click += new System.EventHandler(this.cutToolStripMenuItem_Click);
             // 
@@ -195,7 +195,7 @@
             this.copyToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.copyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
-            this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.copyToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.copyToolStripMenuItem.Text = "Copy";
             this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
             // 
@@ -205,7 +205,7 @@
             this.pasteToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.pasteToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
-            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.pasteToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.pasteToolStripMenuItem.Text = "Paste";
             this.pasteToolStripMenuItem.Click += new System.EventHandler(this.pasteToolStripMenuItem_Click);
             // 
@@ -215,7 +215,7 @@
             this.deleteToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.deleteToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem";
-            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.deleteToolStripMenuItem.Text = "Delete";
             this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click);
             // 
@@ -225,7 +225,7 @@
             this.selectAllToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.selectAllToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem";
-            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.selectAllToolStripMenuItem.Text = "Select All";
             this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click);
             // 
@@ -235,7 +235,7 @@
             this.timeDateToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver;
             this.timeDateToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.timeDateToolStripMenuItem.Name = "timeDateToolStripMenuItem";
-            this.timeDateToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.timeDateToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.timeDateToolStripMenuItem.Text = "Time/Date";
             this.timeDateToolStripMenuItem.Click += new System.EventHandler(this.timeDateToolStripMenuItem_Click);
             // 
@@ -246,7 +246,7 @@
             this.wordWrapToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
             this.wordWrapToolStripMenuItem.CheckOnClick = true;
             this.wordWrapToolStripMenuItem.Name = "wordWrapToolStripMenuItem";
-            this.wordWrapToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+            this.wordWrapToolStripMenuItem.Size = new System.Drawing.Size(134, 22);
             this.wordWrapToolStripMenuItem.Text = "Word Wrap";
             this.wordWrapToolStripMenuItem.Click += new System.EventHandler(this.wordWrapToolStripMenuItem_Click);
             // 
@@ -317,25 +317,24 @@
             // 
             // mainText
             // 
-            this.mainText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.mainText.Dock = System.Windows.Forms.DockStyle.Fill;
             this.mainText.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.mainText.Location = new System.Drawing.Point(0, 27);
+            this.mainText.Location = new System.Drawing.Point(0, 24);
             this.mainText.MaxLength = 131072;
             this.mainText.Multiline = true;
             this.mainText.Name = "mainText";
             this.mainText.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.mainText.Size = new System.Drawing.Size(401, 207);
+            this.mainText.Size = new System.Drawing.Size(401, 210);
             this.mainText.TabIndex = 1;
             this.mainText.WordWrap = false;
             // 
-            // Win95Notepad
+            // WinClassicNotepad
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.mainText);
             this.Controls.Add(this.menuStrip1);
-            this.Name = "Win95Notepad";
+            this.Name = "WinClassicNotepad";
             this.Size = new System.Drawing.Size(401, 234);
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();