From 12c253ab76b8117a563b021e969262da13eaec9d Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sun, 30 Apr 2017 15:46:36 +0100 Subject: Half done the taskbars --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 11 ++ TimeHACK.Main/OS/Win95/Win95.cs | 33 ++++++ TimeHACK.Main/OS/Win95/Win95.resx | 2 +- .../Win95Apps/WinClassicAddressBook.Designer.cs | 45 ++++++++ .../OS/Win95/Win95Apps/WinClassicAddressBook.cs | 20 ++++ .../OS/Win95/Win95Apps/WinClassicAddressBook.resx | 120 +++++++++++++++++++++ .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 4 +- .../OS/Win95/Win95TaskBarItem.Designer.cs | 74 +++++++++++++ TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs | 29 +++++ TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx | 120 +++++++++++++++++++++ TimeHACK.Main/TimeHACK.Main.csproj | 18 ++++ TimeHACK.Main/TitleScreen.Designer.cs | 85 +++++++-------- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 184320 -> 185344 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 44544 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6253568 -> 4745728 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 171520 -> 177664 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6253568 -> 4745728 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 66781 -> 73570 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 13742 -> 13719 bytes ...ne.Template.Taskbars.Win95TaskBarItem.resources | Bin 0 -> 180 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 25 +++++ .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 5377 -> 5584 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 15081 bytes ...meHACK.OS.Win95.Win95Apps.WebChat1998.resources | Bin 14314 -> 14905 bytes ...Win95.Win95Apps.WinClassicAddressBook.resources | Bin 0 -> 180 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 145401 -> 145349 bytes .../TimeHACK.Properties.Resources.resources | Bin 4841958 -> 3330874 bytes .../obj/Release/TimeHACK.TitleScreen.resources | Bin 1074962 -> 1074962 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6253568 -> 4745728 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 171520 -> 177664 bytes 35 files changed, 552 insertions(+), 56 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx create mode 100644 TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 3fedcd1..d6fba17 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -41,6 +41,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); this.taskbar = new System.Windows.Forms.Panel(); + this.taskbarItems = new System.Windows.Forms.Panel(); this.taskbartime = new System.Windows.Forms.Label(); this.clockPanel = new System.Windows.Forms.Panel(); this.startbutton = new System.Windows.Forms.PictureBox(); @@ -158,6 +159,7 @@ // this.taskbar.BackColor = System.Drawing.Color.Silver; this.taskbar.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("taskbar.BackgroundImage"))); + this.taskbar.Controls.Add(this.taskbarItems); this.taskbar.Controls.Add(this.taskbartime); this.taskbar.Controls.Add(this.clockPanel); this.taskbar.Controls.Add(this.startbutton); @@ -167,6 +169,13 @@ this.taskbar.Size = new System.Drawing.Size(640, 28); this.taskbar.TabIndex = 2; // + // taskbarItems + // + this.taskbarItems.Location = new System.Drawing.Point(63, 3); + this.taskbarItems.Name = "taskbarItems"; + this.taskbarItems.Size = new System.Drawing.Size(506, 22); + this.taskbarItems.TabIndex = 5; + // // taskbartime // this.taskbartime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -1128,6 +1137,7 @@ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "Windows95"; + this.Tag = "ignoreFormOnTaskbar"; this.Text = "TimeHACKDesktop"; this.Load += new System.EventHandler(this.Desktop_Load); this.panel1.ResumeLayout(false); @@ -1237,5 +1247,6 @@ private System.Windows.Forms.ToolStripMenuItem windowManagerTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; + private System.Windows.Forms.Panel taskbarItems; } } \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 194815f..8b6e381 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -6,6 +6,7 @@ using System.Media; using System.Windows.Forms; using TimeHACK.Engine; using TimeHACK.Engine.Template; +using TimeHACK.Engine.Template.Taskbars; using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; @@ -20,6 +21,7 @@ namespace TimeHACK.OS.Win95 public List nonimportantapps = new List(); public WinClassic webchat; public WinClassic ie; + public TaskBarController tb = new TaskBarController(); public int currentappcount = 0; @@ -59,6 +61,9 @@ 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); } private void fontLoad() @@ -118,6 +123,7 @@ namespace TimeHACK.OS.Win95 private void taskbartime_Click(object sender, EventArgs e) { //TODO: Set Up Year Codes + // We are actually thinking about not having save code because it would be nice if we could save tons of data! } // Set the Clock @@ -237,9 +243,36 @@ namespace TimeHACK.OS.Win95 { WinClassicWordPad wp = new WinClassicWordPad(); WinClassic app = wm.startWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true); + AddTaskBarItem(app, (int)app.Tag, "Wordpad", Properties.Resources.Win95IconWordpad); + MessageBox.Show(app.Tag.ToString()); app.BringToFront(); startmenu.Hide(); } + + public void AddTaskBarItem(Form Application, int ApplicationID, string ApplicationName, Image ApplicationIcon) + { + taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems); + Application.FormClosing += new FormClosingEventHandler(UpdateTaskbarFromClosedApplication); + } + + public void UpdateTaskbarFromClosedApplication(object sender, FormClosingEventArgs e) + { + UpdateTaskbar(); + } + + public void UpdateTaskbar() + { + // Clears out all the items on the taskbar + taskbarItems.Controls.Clear(); + + // Loops through all the Applications which are open + + foreach (Form form in tb.GetAllOpenApps()) + { + // Calls that "AddToTaskbar" thing + taskbarItems = tb.AddTaskbarItem95((int)form.Tag, form.Text, (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems); + } + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index 3038697..ae3e1b6 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -330,7 +330,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAARABAQEQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAATABAQEwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs new file mode 100644 index 0000000..09f32df --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.Designer.cs @@ -0,0 +1,45 @@ +namespace TimeHACK.OS.Win95.Win95Apps +{ + partial class WinClassicAddressBook + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // WinClassicAddressBook + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Name = "WinClassicAddressBook"; + this.Size = new System.Drawing.Size(260, 264); + this.ResumeLayout(false); + + } + + #endregion + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs new file mode 100644 index 0000000..3934fa7 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.OS.Win95.Win95Apps +{ + public partial class WinClassicAddressBook : UserControl + { + public WinClassicAddressBook() + { + InitializeComponent(); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicAddressBook.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index 217de42..4ddb045 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -17,8 +17,8 @@ namespace TimeHACK.OS.Win95.Win95Apps WindowManager wm = new WindowManager(); bool btnBoldSelected = true; - bool btnItalicSelected; - bool btnUnderlineSelected; + bool btnItalicSelected = true; + bool btnUnderlineSelected = true; bool doBold; bool doItalic; bool doUnderline; diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs new file mode 100644 index 0000000..e369909 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs @@ -0,0 +1,74 @@ +namespace TimeHACK.Engine.Template.Taskbars +{ + partial class Win95TaskBarItem + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.progPic = new System.Windows.Forms.PictureBox(); + this.progName = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.progPic)).BeginInit(); + this.SuspendLayout(); + // + // progPic + // + this.progPic.Location = new System.Drawing.Point(3, 3); + this.progPic.Name = "progPic"; + this.progPic.Size = new System.Drawing.Size(28, 24); + this.progPic.TabIndex = 0; + this.progPic.TabStop = false; + // + // progName + // + this.progName.AutoSize = true; + this.progName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.progName.Location = new System.Drawing.Point(37, 3); + this.progName.Name = "progName"; + this.progName.Size = new System.Drawing.Size(60, 24); + this.progName.TabIndex = 1; + this.progName.Text = "label1"; + // + // Win95TaskBarItem + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.progName); + this.Controls.Add(this.progPic); + this.Name = "Win95TaskBarItem"; + this.Size = new System.Drawing.Size(193, 30); + this.Load += new System.EventHandler(this.Win95TaskBarItem_Load); + ((System.ComponentModel.ISupportInitialize)(this.progPic)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.PictureBox progPic; + private System.Windows.Forms.Label progName; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs new file mode 100644 index 0000000..9cff376 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace TimeHACK.Engine.Template.Taskbars +{ + public partial class Win95TaskBarItem : UserControl + { + public Win95TaskBarItem() + { + InitializeComponent(); + progName.Font = new Font(TitleScreen.pfc.Families[0], 16f, FontStyle.Regular, GraphicsUnit.Point, ((0))); + this.BackColor = Color.Silver; + } + + private void Win95TaskBarItem_Load(object sender, EventArgs e) + { + progName.Text = (string)this.Tag; + progPic.Image = this.BackgroundImage; + this.BackgroundImage = null; + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 24d2004..e3fec35 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -143,6 +143,12 @@ Win95Notepad.cs + + UserControl + + + WinClassicAddressBook.cs + UserControl @@ -173,6 +179,12 @@ WinClassicWordPad.cs + + UserControl + + + Win95TaskBarItem.cs + @@ -198,6 +210,9 @@ Win95Notepad.cs + + WinClassicAddressBook.cs + WinClassicDownloader.cs @@ -213,6 +228,9 @@ WinClassicWordPad.cs + + Win95TaskBarItem.cs + ResXFileCodeGenerator Designer diff --git a/TimeHACK.Main/TitleScreen.Designer.cs b/TimeHACK.Main/TitleScreen.Designer.cs index 2777027..0437c60 100644 --- a/TimeHACK.Main/TitleScreen.Designer.cs +++ b/TimeHACK.Main/TitleScreen.Designer.cs @@ -38,15 +38,15 @@ this.Exit = new System.Windows.Forms.Button(); this.NewGame = new System.Windows.Forms.Button(); this.panel2 = new System.Windows.Forms.Panel(); + this.VM_Height = new System.Windows.Forms.NumericUpDown(); + this.VM_Width = new System.Windows.Forms.NumericUpDown(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.startbutton = new System.Windows.Forms.PictureBox(); - this.VM_Width = new System.Windows.Forms.NumericUpDown(); - this.VM_Height = new System.Windows.Forms.NumericUpDown(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).BeginInit(); this.SuspendLayout(); // // gameversion @@ -153,23 +153,27 @@ this.panel2.Size = new System.Drawing.Size(800, 28); this.panel2.TabIndex = 10; // - // pictureBox1 - // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(612, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(187, 28); - this.pictureBox1.TabIndex = 13; - this.pictureBox1.TabStop = false; - // - // startbutton + // VM_Height // - this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image"))); - this.startbutton.Location = new System.Drawing.Point(2, 4); - this.startbutton.Name = "startbutton"; - this.startbutton.Size = new System.Drawing.Size(279, 22); - this.startbutton.TabIndex = 12; - this.startbutton.TabStop = false; + this.VM_Height.Location = new System.Drawing.Point(668, 5); + this.VM_Height.Maximum = new decimal(new int[] { + 2160, + 0, + 0, + 0}); + this.VM_Height.Minimum = new decimal(new int[] { + 480, + 0, + 0, + 0}); + this.VM_Height.Name = "VM_Height"; + this.VM_Height.Size = new System.Drawing.Size(50, 20); + this.VM_Height.TabIndex = 15; + this.VM_Height.Value = new decimal(new int[] { + 480, + 0, + 0, + 0}); // // VM_Width // @@ -193,27 +197,23 @@ 0, 0}); // - // VM_Height + // pictureBox1 // - this.VM_Height.Location = new System.Drawing.Point(668, 5); - this.VM_Height.Maximum = new decimal(new int[] { - 2160, - 0, - 0, - 0}); - this.VM_Height.Minimum = new decimal(new int[] { - 480, - 0, - 0, - 0}); - this.VM_Height.Name = "VM_Height"; - this.VM_Height.Size = new System.Drawing.Size(50, 20); - this.VM_Height.TabIndex = 15; - this.VM_Height.Value = new decimal(new int[] { - 480, - 0, - 0, - 0}); + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(612, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(187, 28); + this.pictureBox1.TabIndex = 13; + this.pictureBox1.TabStop = false; + // + // startbutton + // + this.startbutton.Image = ((System.Drawing.Image)(resources.GetObject("startbutton.Image"))); + this.startbutton.Location = new System.Drawing.Point(2, 4); + this.startbutton.Name = "startbutton"; + this.startbutton.Size = new System.Drawing.Size(279, 22); + this.startbutton.TabIndex = 12; + this.startbutton.TabStop = false; // // TitleScreen // @@ -230,14 +230,15 @@ this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.MaximizeBox = false; this.Name = "TitleScreen"; + this.Tag = "ignoreFormOnTaskbar"; this.Text = "TimeHACK Launcher"; this.Load += new System.EventHandler(this.TitleScreen_Load); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.VM_Width)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.VM_Height)).EndInit(); this.ResumeLayout(false); } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 7abf3fb..1d4ab6d 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index eca10d6..7ffb8c2 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 737cfee..ddbeda2 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - NQTTPlxuFMrJVeSnR5t5M2K8zzWe/bw5YOHMNAJkiHc= + 8uy+aFyvMmLVqAMHWbz13IPmO849S13YRvcJwJZtvec= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 58afd01..744f9ba 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index bedb5ef..8ce0efa 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - QwYlduEQxBXK0sy4D6me10tiFd2GZ0ehgLK09v8NbBw= + 3W/k/4BvUj41ypVV5E0C47NOSTHVPLeYHynB/jwp5NY= - + - HBghz/KOIZLR+PwJD6XppAFuGDgdpxkb7cnXeYWbN4A= + Vd+ZWuO2vOZccstndvrua728ILkqXPDJNBNKs/x5tpM= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index f62eab1..83ae3cf 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 58afd01..744f9ba 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index ef9e3e3..6fc8d54 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -bbef24231b31ba1c9a8c1b5e4dda3e7c01140ae8 +bd1d1c63b79dd7c408aa04f15f2411b26c1651aa diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index d728cb5..1971b71 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index 0abf700..3e46118 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources b/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 456e6e9..f5a0764 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -40,3 +40,28 @@ C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK. C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.Win95Notepad.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources C:\Users\Liam\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.application +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.pdb +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.Win95Notepad.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index ba9cd3c..b38d387 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index d9d71c0..7bd3230 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources index 0ae036b..7d689a4 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources index bd4ae26..813ae27 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index 02eb237..b9c9d04 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources index 4fda140..43f5d49 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources and b/TimeHACK.Main/obj/Release/TimeHACK.TitleScreen.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 737cfee..ddbeda2 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - NQTTPlxuFMrJVeSnR5t5M2K8zzWe/bw5YOHMNAJkiHc= + 8uy+aFyvMmLVqAMHWbz13IPmO849S13YRvcJwJZtvec= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 58afd01..744f9ba 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index bedb5ef..8ce0efa 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - QwYlduEQxBXK0sy4D6me10tiFd2GZ0ehgLK09v8NbBw= + 3W/k/4BvUj41ypVV5E0C47NOSTHVPLeYHynB/jwp5NY= - + - HBghz/KOIZLR+PwJD6XppAFuGDgdpxkb7cnXeYWbN4A= + Vd+ZWuO2vOZccstndvrua728ILkqXPDJNBNKs/x5tpM= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index f62eab1..83ae3cf 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From e0c8a9521719dcb6d702d489fed05ea28c6afe94 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Mon, 1 May 2017 09:54:13 +0100 Subject: Fully working taskbar! IT WORKS! --- .vs/TimeHACK/v15/.suo | Bin 162304 -> 165888 bytes TimeHACK.Engine/TaskBarController.cs | 21 ++++++++++++++++--- TimeHACK.Engine/WindowManager.cs | 17 ++++++++------- TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes TimeHACK.Main/OS/Win95/Win95.cs | 23 ++++++++++++++------- .../OS/Win95/Win95Apps/WinClassicWordPad.cs | 2 +- .../OS/Win95/Win95TaskBarItem.Designer.cs | 3 +++ TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs | 12 ++++++++++- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 185344 -> 185344 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 46592 -> 48640 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4745728 -> 4746240 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +++--- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 177664 -> 179712 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4745728 -> 4746240 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 4 ++-- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 5584 -> 5584 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 15081 -> 15081 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4745728 -> 4746240 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +++--- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 177664 -> 179712 bytes 26 files changed, 68 insertions(+), 30 deletions(-) (limited to 'TimeHACK.Main') diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 64a9c6d..257094b 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/TaskBarController.cs b/TimeHACK.Engine/TaskBarController.cs index a24d73e..3ede876 100644 --- a/TimeHACK.Engine/TaskBarController.cs +++ b/TimeHACK.Engine/TaskBarController.cs @@ -10,9 +10,10 @@ namespace TimeHACK.Engine { public class TaskBarController { + public static int AvalibleApplicationID; - public Panel AddTaskbarItem95(int ApplicationID, string ApplicationName, Image ApplicationIcon, UserControl taskbar_item, Panel oldPanel) + public Panel AddTaskbarItem95(string ApplicationID, string ApplicationName, Image ApplicationIcon, UserControl taskbar_item, Panel oldPanel) { Panel returnPanel = oldPanel; @@ -31,13 +32,27 @@ namespace TimeHACK.Engine List
AppsList = new List(); foreach (Form form in Application.OpenForms) { - if ((string)form.Tag != "ignoreFormOnTaskbar") + if (form.Tag.ToString() != "ignoreFormOnTaskbar") { AppsList.Add(form); } } - return AppsList; } + + public void FocusAppFromID(string ApplicationID) + { + + foreach (Form form in Application.OpenForms) + { + if (form.Tag.ToString() == ApplicationID) + { + form.Show(); + form.BringToFront(); + form.Focus(); + return; + } + } + } } } diff --git a/TimeHACK.Engine/WindowManager.cs b/TimeHACK.Engine/WindowManager.cs index a3baf42..6bb7cc5 100644 --- a/TimeHACK.Engine/WindowManager.cs +++ b/TimeHACK.Engine/WindowManager.cs @@ -10,7 +10,6 @@ namespace TimeHACK.Engine { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); - public WinClassic startWin95(UserControl content, String title, Image icon, Boolean MaxButton, Boolean MinButton) { // Setup Window @@ -54,14 +53,18 @@ namespace TimeHACK.Engine // Time for the taskbar - // Convert an image to an icon - Bitmap theBitmap = new Bitmap(icon, new Size(icon.Width, icon.Height)); - IntPtr Hicon = theBitmap.GetHicon();// Get an Hicon for myBitmap. - Icon newIcon = Icon.FromHandle(Hicon);// Create a new icon from the handle. + // Convert an image to an icon (for the taskbar) + if (icon != null) + { + Bitmap theBitmap = new Bitmap(icon, new Size(icon.Width, icon.Height)); + IntPtr Hicon = theBitmap.GetHicon(); // Get an Hicon for myBitmap. + Icon newIcon = Icon.FromHandle(Hicon); // Create a new icon from the handle. + app.Icon = newIcon; + } + // Set some values (for the taskbar) app.Tag = TaskBarController.AvalibleApplicationID; - app.Text = title; - app.Icon = newIcon; + app.Text = title; // Show the app app.Show(); diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 1d4ab6d..7f8ea89 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb index 7ffb8c2..36a9e06 100644 Binary files a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 0cb0ac1..c981e8d 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 1d4ab6d..7f8ea89 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb index 7ffb8c2..36a9e06 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 8b6e381..d0ea75e 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -63,7 +63,8 @@ namespace TimeHACK.OS.Win95 this.SendToBack(); // THIS IS TESTING STUFF HERE: - taskbarItems = tb.AddTaskbarItem95(0, "Test app", Properties.Resources.Win95IconWordpad, (UserControl)new Win95TaskBarItem(), taskbarItems); + taskbarItems = tb.AddTaskbarItem95("0", "Test app", Properties.Resources.Win95IconWordpad, (UserControl)new Win95TaskBarItem(), taskbarItems); + UpdateTaskbar(); } private void fontLoad() @@ -157,9 +158,15 @@ namespace TimeHACK.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { - nonimportantapps.Add(wm.startWin95(new Win95Notepad(), "Notepad", Properties.Resources.Win95IconNotepad, true, true)); + Win95Notepad wp = new Win95Notepad(); + WinClassic app = wm.startWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); + AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); + + nonimportantapps.Add(app); nonimportantapps[nonimportantapps.Count - 1].BringToFront(); nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); + + app.BringToFront(); startmenu.Hide(); } private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) @@ -185,6 +192,7 @@ namespace TimeHACK.OS.Win95 { if (ie != null) { wm.startInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", Properties.Resources.Win95Warning); return; } ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); @@ -243,19 +251,18 @@ namespace TimeHACK.OS.Win95 { WinClassicWordPad wp = new WinClassicWordPad(); WinClassic app = wm.startWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true); - AddTaskBarItem(app, (int)app.Tag, "Wordpad", Properties.Resources.Win95IconWordpad); - MessageBox.Show(app.Tag.ToString()); + AddTaskBarItem(app, app.Tag.ToString(), "Wordpad", Properties.Resources.Win95IconWordpad); app.BringToFront(); startmenu.Hide(); } - public void AddTaskBarItem(Form Application, int ApplicationID, string ApplicationName, Image ApplicationIcon) + public void AddTaskBarItem(Form Application, string ApplicationID, string ApplicationName, Image ApplicationIcon) { taskbarItems = tb.AddTaskbarItem95(ApplicationID, ApplicationName, ApplicationIcon, (UserControl)new Win95TaskBarItem(), taskbarItems); - Application.FormClosing += new FormClosingEventHandler(UpdateTaskbarFromClosedApplication); + Application.FormClosed += new FormClosedEventHandler(UpdateTaskbarFromClosedApplication); } - public void UpdateTaskbarFromClosedApplication(object sender, FormClosingEventArgs e) + public void UpdateTaskbarFromClosedApplication(object sender, FormClosedEventArgs e) { UpdateTaskbar(); } @@ -270,7 +277,7 @@ namespace TimeHACK.OS.Win95 foreach (Form form in tb.GetAllOpenApps()) { // Calls that "AddToTaskbar" thing - taskbarItems = tb.AddTaskbarItem95((int)form.Tag, form.Text, (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems); + taskbarItems = tb.AddTaskbarItem95(form.Tag.ToString(), form.Text.ToString(), (Image)form.Icon.ToBitmap(), (UserControl)new Win95TaskBarItem(), taskbarItems); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index 4ddb045..84ef3f6 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -122,7 +122,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void aboutWordpadToolStripMenuItem_Click(object sender, EventArgs e) { - wm.startAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.WinClassicWordpad); + wm.startAboutBox95("Wordpad", "Microsoft Wordpad", Properties.Resources.Win95IconWordpad); } private void newToolStripMenuItem_Click(object sender, EventArgs e) diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs index e369909..71ccfde 100644 --- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.Designer.cs @@ -40,6 +40,7 @@ this.progPic.Size = new System.Drawing.Size(28, 24); this.progPic.TabIndex = 0; this.progPic.TabStop = false; + this.progPic.Click += new System.EventHandler(this.Win95TaskBarItem_Click); // // progName // @@ -50,6 +51,7 @@ this.progName.Size = new System.Drawing.Size(60, 24); this.progName.TabIndex = 1; this.progName.Text = "label1"; + this.progName.Click += new System.EventHandler(this.Win95TaskBarItem_Click); // // Win95TaskBarItem // @@ -60,6 +62,7 @@ this.Name = "Win95TaskBarItem"; this.Size = new System.Drawing.Size(193, 30); this.Load += new System.EventHandler(this.Win95TaskBarItem_Load); + this.Click += new System.EventHandler(this.Win95TaskBarItem_Click); ((System.ComponentModel.ISupportInitialize)(this.progPic)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs index 9cff376..b193e38 100644 --- a/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs +++ b/TimeHACK.Main/OS/Win95/Win95TaskBarItem.cs @@ -7,11 +7,14 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TimeHACK.Engine; namespace TimeHACK.Engine.Template.Taskbars { public partial class Win95TaskBarItem : UserControl { + TaskBarController tb = new TaskBarController(); + public string ApplicationID; public Win95TaskBarItem() { InitializeComponent(); @@ -23,7 +26,14 @@ namespace TimeHACK.Engine.Template.Taskbars { progName.Text = (string)this.Tag; progPic.Image = this.BackgroundImage; - this.BackgroundImage = null; + ApplicationID = (TaskBarController.AvalibleApplicationID - 1).ToString(); + this.BackgroundImage = null; + this.Width = (progName.Left + progName.Width); + } + + private void Win95TaskBarItem_Click(object sender, EventArgs e) + { + tb.FocusAppFromID(ApplicationID); } } } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 1d4ab6d..7f8ea89 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 7ffb8c2..36a9e06 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index ddbeda2..9a72a8c 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 8uy+aFyvMmLVqAMHWbz13IPmO849S13YRvcJwJZtvec= + MogLkly8o29+HiFdmWdLvNHup6ECnNEXO5xar+eRrkk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 744f9ba..8df6c3c 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 8ce0efa..fc5bb53 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 3W/k/4BvUj41ypVV5E0C47NOSTHVPLeYHynB/jwp5NY= + uxpf8NhSMW6oUbvhDYwWdOuHSvGyaOBKOjune3J1TWI= @@ -75,7 +75,7 @@ - Vd+ZWuO2vOZccstndvrua728ILkqXPDJNBNKs/x5tpM= + JyvdaF3QH9nthGE+gEnNgeCrSKbp9QVXusT5M3v1wIc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 83ae3cf..56cabac 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 744f9ba..8df6c3c 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index f5a0764..1fc4110 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -51,11 +51,13 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.O I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.Win95Notepad.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache @@ -63,5 +65,3 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.e I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources -I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index b38d387..a27d824 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 7bd3230..b18a14d 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index ddbeda2..9a72a8c 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 8uy+aFyvMmLVqAMHWbz13IPmO849S13YRvcJwJZtvec= + MogLkly8o29+HiFdmWdLvNHup6ECnNEXO5xar+eRrkk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 744f9ba..8df6c3c 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 8ce0efa..fc5bb53 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 3W/k/4BvUj41ypVV5E0C47NOSTHVPLeYHynB/jwp5NY= + uxpf8NhSMW6oUbvhDYwWdOuHSvGyaOBKOjune3J1TWI= @@ -75,7 +75,7 @@ - Vd+ZWuO2vOZccstndvrua728ILkqXPDJNBNKs/x5tpM= + JyvdaF3QH9nthGE+gEnNgeCrSKbp9QVXusT5M3v1wIc= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 83ae3cf..56cabac 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From e557e46076e0fe44fb03633665ae40c7d7444461 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Mon, 1 May 2017 10:02:13 +0100 Subject: Added taskbar to common applications --- .vs/TimeHACK/v15/.suo | Bin 165888 -> 163328 bytes TimeHACK.Main/OS/Win95/Win95.cs | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) (limited to 'TimeHACK.Main') diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 257094b..801d8c8 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index d0ea75e..63c493a 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -172,20 +172,33 @@ namespace TimeHACK.OS.Win95 private void windowManagerTestToolStripMenuItem_Click(object sender, EventArgs e) { TestApp test = new TestApp(); - wm.startWin95(test, "TestApp", null, true, true); + WinClassic app = wm.startWin95(test, "TestApp", null, true, true); + AddTaskBarItem(app, app.Tag.ToString(), "TestApp", null); + app.BringToFront(); + startmenu.Hide(); } private void downloaderTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicDownloader opendownload = new WinClassicDownloader(); - wm.startWin95(opendownload, "Downloader", null, false, true); + WinClassic app = wm.startWin95(opendownload, "Downloader", null, false, true); opendownload.appName.Text = "Downloading: Survive The Day"; + + AddTaskBarItem(app, app.Tag.ToString(), "Downloader", null); + + app.BringToFront(); + startmenu.Hide(); } private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicInstaller openinstaller = new WinClassicInstaller(); - wm.startWin95(openinstaller, "Installer", null, false, true); + WinClassic app = wm.startWin95(openinstaller, "Installer", null, false, true); + + AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); + + app.BringToFront(); + startmenu.Hide(); } private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) @@ -212,6 +225,7 @@ namespace TimeHACK.OS.Win95 { if (ie != null) { wm.startInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", Properties.Resources.Win95Warning); return; } ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + AddTaskBarItem(ie, ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); @@ -220,6 +234,7 @@ namespace TimeHACK.OS.Win95 WinClassicInstaller inst = new WinClassicInstaller(); inst.installname.Text = "Web Chat 1998"; WinClassic app = wm.startWin95(inst, "Web Chat Setup", null, true, true); + AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); app.BringToFront(); startmenu.Hide(); } @@ -229,12 +244,18 @@ namespace TimeHACK.OS.Win95 private void infoboxTestToolStripMenuItem_Click(object sender, EventArgs e) { - wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info); + WinClassic app = wm.startInfobox95("AShifter's Infobox", "This is the very first TimeHACK Infobox. It's really easy to call, too! \n Just use wm.startInfobox95(String title, String text, Image erroricon)!", Properties.Resources.Win95Info); + + app.BringToFront(); + startmenu.Hide(); } private void WebChatToolStripMenuItem_Click(object sender, EventArgs e) { WebChat1998 wc = new WebChat1998(); WinClassic app = wm.startWin95(wc, "Web Chat 1998", null, true, true); + + AddTaskBarItem(app, app.Tag.ToString(), "Web Chat 1998", null); + app.BringToFront(); startmenu.Hide(); } -- cgit v1.2.3 From 0a7c2d4dc020b58dacf1d0cf50403d101f176d72 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Mon, 1 May 2017 10:15:32 +0100 Subject: Trying to fix conficts II --- .vs/TimeHACK/v15/.suo | Bin 162816 -> 163328 bytes TimeHACK.Main/OS/Win95/Win95.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'TimeHACK.Main') diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 196d511..1448558 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 63c493a..1e68101 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -158,7 +158,7 @@ namespace TimeHACK.OS.Win95 private void NotePadToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Notepad wp = new Win95Notepad(); + WinClassicNotepad wp = new WinClassicNotepad(); WinClassic app = wm.startWin95(wp, "Notepad", Properties.Resources.Win95IconNotepad, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); -- cgit v1.2.3