diff --git a/.vs/TimeHACK/v14/.suo b/.vs/TimeHACK/v14/.suo index bf0397d..b91f27a 100644 Binary files a/.vs/TimeHACK/v14/.suo and b/.vs/TimeHACK/v14/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index e70d90e..194815f 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -178,7 +178,7 @@ private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) private void InternetExplorerToolStripMenuItem_Click(object sender, EventArgs e) { 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", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); + ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); @@ -197,7 +197,7 @@ private void desktopicons_Click(object sender, EventArgs e) if (objListViewItem.Text == "Internet Explorer") { 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", (Image)resources.GetObject("InternetExplorerToolStripMenuItem.Image"), true, true); + ie = wm.startWin95(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); ie.BringToFront(); ie.FormClosing += new FormClosingEventHandler(InternetExplorer4_Closing); startmenu.Hide(); @@ -236,7 +236,7 @@ private void InternetExplorer4_Closing(object sender, FormClosingEventArgs e) private void WordPadToolStripMenuItem_Click(object sender, EventArgs e) { WinClassicWordPad wp = new WinClassicWordPad(); - WinClassic app = wm.startWin95(wp, "Wordpad", null, true, true); + WinClassic app = wm.startWin95(wp, "Wordpad", Properties.Resources.Win95IconWordpad, true, true); app.BringToFront(); startmenu.Hide(); } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs index 6ff7833..390614d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Notepad.cs @@ -21,7 +21,7 @@ public Win95Notepad() item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); item.BackColor = Color.Silver; item.BackgroundImage = Properties.Resources.sliversilver; - item.BackgroundImageLayout = ImageLayout.None; + item.BackgroundImageLayout = ImageLayout.Center; item.DisplayStyle = ToolStripItemDisplayStyle.Text; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs index f270eac..217de42 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.cs @@ -30,7 +30,7 @@ public WinClassicWordPad() item.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((0))); item.BackColor = Color.Silver; item.BackgroundImage = Properties.Resources.sliversilver; - item.BackgroundImageLayout = ImageLayout.None; + item.BackgroundImageLayout = ImageLayout.Center; item.DisplayStyle = ToolStripItemDisplayStyle.Text; } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index d3e1e6a..de33587 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -293,6 +293,16 @@ internal static System.Drawing.Bitmap Win95Error { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95IconIE4 { + get { + object obj = ResourceManager.GetObject("Win95IconIE4", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -303,6 +313,26 @@ internal static System.Drawing.Bitmap Win95IconNotepad { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95IconNotepad_2 { + get { + object obj = ResourceManager.GetObject("Win95IconNotepad_2", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95IconWordpad { + get { + object obj = ResourceManager.GetObject("Win95IconWordpad", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/TimeHACK.Main/Properties/Resources.resx b/TimeHACK.Main/Properties/Resources.resx index c5cbf16..971c572 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -309,4 +309,31 @@ ..\Resources\WinClassic\WinClassicWordpad.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsIAAA7CARUoSoAAAACVSURBVDhPlZELEsQgDEI9em7uBhVN2HTtvhmqotBf+4/e + s36ih6mIrgcmARX2CdaJE/brnn+LJZhvYFo3czeFp3/W0U9UYWgjfiq4honsr5I6/EZewDDG8sBNMwgY + iAUvQMG5+7VA9vcTBENKzPCB4T284ikYTFNKao1SH3IBwHwdqIroJ7hJxvxJGf+Hy2RJLLrR2gerBkDv + 4H+zGwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP + YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy + BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX + VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ + aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== + + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/WinClassic/WinClassicWordpad.png b/TimeHACK.Main/Resources/WinClassic/WinClassicWordpad.png index 0d06025..031a041 100644 Binary files a/TimeHACK.Main/Resources/WinClassic/WinClassicWordpad.png and b/TimeHACK.Main/Resources/WinClassic/WinClassicWordpad.png differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index 497db02..737cfee 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - UQjZ3Gfvu3tMhC+d45c8WvCsn6EdObB6G1RAnCcgpgs= + NQTTPlxuFMrJVeSnR5t5M2K8zzWe/bw5YOHMNAJkiHc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 7398160..58afd01 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 2957b13..bedb5ef 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - CZVZ6e1uQishA7C+soeoEECq35ekniZWzNaXTtNGSxg= + QwYlduEQxBXK0sy4D6me10tiFd2GZ0ehgLK09v8NbBw= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index c111b16..f62eab1 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/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index 497db02..737cfee 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - UQjZ3Gfvu3tMhC+d45c8WvCsn6EdObB6G1RAnCcgpgs= + NQTTPlxuFMrJVeSnR5t5M2K8zzWe/bw5YOHMNAJkiHc= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 2957b13..bedb5ef 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,14 +56,14 @@ - + - CZVZ6e1uQishA7C+soeoEECq35ekniZWzNaXTtNGSxg= + QwYlduEQxBXK0sy4D6me10tiFd2GZ0ehgLK09v8NbBw= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index 7398160..58afd01 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/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index a15f729..d728cb5 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 646c7fa..0abf700 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/TempPE/Properties.Resources.Designer.cs.dll b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll index 804f05d..664b7f8 100644 Binary files a/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll and b/TimeHACK.Main/obj/Release/TempPE/Properties.Resources.Designer.cs.dll differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index e23acf2..456e6e9 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -39,3 +39,4 @@ 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.WinClassicDownloader.resources 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 diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 42df215..ba9cd3c 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.OS.Win95.Win95Apps.WinClassicWordPad.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.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 9113c65..bd4ae26 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 396986f..02eb237 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 497db02..737cfee 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - UQjZ3Gfvu3tMhC+d45c8WvCsn6EdObB6G1RAnCcgpgs= + NQTTPlxuFMrJVeSnR5t5M2K8zzWe/bw5YOHMNAJkiHc= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 7398160..58afd01 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 2957b13..bedb5ef 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - CZVZ6e1uQishA7C+soeoEECq35ekniZWzNaXTtNGSxg= + QwYlduEQxBXK0sy4D6me10tiFd2GZ0ehgLK09v8NbBw= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index c111b16..f62eab1 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ