diff options
25 files changed, 329 insertions, 383 deletions
diff --git a/TimeHACK.Engine/FileAssociation.cs b/TimeHACK.Engine/FileAssociation.cs deleted file mode 100644 index 25fe895..0000000 --- a/TimeHACK.Engine/FileAssociation.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Runtime.InteropServices; -using Microsoft.Win32; - -namespace TimeHACK.Engine -{ - public class FileAssociation - { - // Associate file extension with progID, description, icon and application - public static void Associate(string extension, - string progID, string description, string icon, string application) - { - Registry.ClassesRoot.CreateSubKey(extension).SetValue("", progID); - if (progID != null && progID.Length > 0) - using (RegistryKey key = Registry.ClassesRoot.CreateSubKey(progID)) - { - if (description != null) - key.SetValue("", description); - if (icon != null) - key.CreateSubKey("DefaultIcon").SetValue("", ToShortPathName(icon)); - if (application != null) - key.CreateSubKey(@"Shell\Open\Command").SetValue("", - ToShortPathName(application) + " \"%1\""); - } - } - - // Return true if extension already associated in registry - public static bool IsAssociated(string extension) - { - return (Registry.ClassesRoot.OpenSubKey(extension, false) != null); - } - - [DllImport("Kernel32.dll")] - private static extern uint GetShortPathName(string lpszLongPath, - [Out] StringBuilder lpszShortPath, uint cchBuffer); - - // Return short path format of a file name - private static string ToShortPathName(string longName) - { - StringBuilder s = new StringBuilder(1000); - uint iSize = (uint)s.Capacity; - uint iRet = GetShortPathName(longName, s, iSize); - return s.ToString(); - } - } -} diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index cd8bb2f..0cacf69 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using Newtonsoft.Json; using System.Diagnostics; +using System.Windows.Forms; namespace TimeHACK.Engine { @@ -14,8 +15,7 @@ namespace TimeHACK.Engine public static Save CurrentSave { get; set; } public static FileSystemFolderInfo filesystemflinfo { get; set; } public static bool DevMode = false; - - public static FileAssociation IconChanger = new FileAssociation(); + public static Form troubleshooter; public static Theme currentTheme { get; set; } @@ -96,21 +96,31 @@ namespace TimeHACK.Engine public static bool LoadSave() { - // ON A FINAL RELEASE USE THE "FINAL RELEASE THINGS" - #region Final Release Things - //Read base64 string from file - //string b64 = File.ReadAllText(Path.Combine(ProfileDirectory, ProfileFile)); - //Get Unicode byte array - //byte[] bytes = Convert.FromBase64String(b64); - //Decode the Unicode - //string json = Encoding.UTF8.GetString(bytes); - //Deserialize save object. - #endregion - // USE THE THINGS IN THE "DEVELOPER THINGS" FOR A DEVELOPMENT RELEASE - #region Developer Things - string json = File.ReadAllText(Path.Combine(ProfileDirectory, ProfileFile)); - #endregion - CurrentSave = JsonConvert.DeserializeObject<Save>(json); + try + { + // ON A FINAL RELEASE USE THE "FINAL RELEASE THINGS" + #region Final Release Things + //Read base64 string from file + //string b64 = File.ReadAllText(Path.Combine(ProfileDirectory, ProfileFile)); + //Get Unicode byte array + //byte[] bytes = Convert.FromBase64String(b64); + //Decode the Unicode + //string json = Encoding.UTF8.GetString(bytes); + //Deserialize save object. + #endregion + // USE THE THINGS IN THE "DEVELOPER THINGS" FOR A DEVELOPMENT RELEASE + #region Developer Things + string json = File.ReadAllText(Path.Combine(ProfileDirectory, ProfileFile)); + #endregion + CurrentSave = JsonConvert.DeserializeObject<Save>(json); + + } catch + { + MessageBox.Show("WARNING! It looks like this save is corrupt!"); + MessageBox.Show("We will now open the Save troubleshooter"); + + troubleshooter.ShowDialog(); + } return true; } @@ -161,12 +171,14 @@ namespace TimeHACK.Engine Directory.CreateDirectory(ProfileFileSystemDirectory); SaveDirectoryInfo(ProfileFileSystemDirectory, false, "My Computer", false); - SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95", true); + SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95 (C:)", true); if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true); if (CurrentSave.CurrentOS != "95") SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true); + SaveDirectoryInfo(Path.Combine(ProfileProgramsDirectory, "Accessories"), false, "Accessories", true); SaveDirectoryInfo(ProfileProgramsDirectory, true, "Program Files", true); SaveDirectoryInfo(ProfileWindowsDirectory, true, "Windows", true); + CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Accessories", "wordpad.exe"), "wordpad"); CreateWindowsDirectory(); } @@ -179,8 +191,8 @@ namespace TimeHACK.Engine SaveDirectoryInfo(Path.Combine(ProfileWindowsDirectory, "Help"), true, "Help", true); SaveDirectoryInfo(Path.Combine(ProfileWindowsDirectory, "Temp"), true, "Temp", true); - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "calc.exe"), "Calculator"); - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "explorer.exe"), "windowsexplorer"); + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "calc.exe"), "calc"); + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "explorer.exe"), "explorer"); } public static void CreateWindowsFile(string filepath, string contents) diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index f58b7cc..2f4073d 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -15,7 +15,7 @@ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> - <Optimize>false</Optimize> + <Optimize>true</Optimize> <OutputPath>bin\Debug\</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> @@ -48,7 +48,6 @@ <Compile Include="BSODCreator.cs" /> <None Include="packages.config" /> <None Include="Resources\WinClassic\Window\pjBg6mKP.bin" /> - <Compile Include="FileAssociation.cs" /> <Compile Include="FileDialogBoxManager.cs" /> <Compile Include="Paintbrush.cs" /> <Compile Include="SaveSystem.cs" /> diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 15f4feb..b77e2db 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -62,7 +62,6 @@ namespace TimeHACK.OS.Win95 this.SystemToolsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DiskDefragmenterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ScanDiskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AddressBookToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CalculatorToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.HyperTerminalToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ImagingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -244,7 +243,7 @@ namespace TimeHACK.OS.Win95 this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(145, 311); + this.startmenuitems.Size = new System.Drawing.Size(145, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -285,7 +284,6 @@ namespace TimeHACK.OS.Win95 this.CommunicationsToolStripMenuItem, this.MultimediaToolStripMenuItem, this.SystemToolsToolStripMenuItem, - this.AddressBookToolStripMenuItem, this.CalculatorToolStripMenuItem, this.HyperTerminalToolStripMenuItem, this.ImagingToolStripMenuItem, @@ -435,18 +433,6 @@ namespace TimeHACK.OS.Win95 this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.ScanDiskToolStripMenuItem.Text = "ScanDisk"; // - // AddressBookToolStripMenuItem - // - this.AddressBookToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.AddressBookToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; - this.AddressBookToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; - this.AddressBookToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.Image"))); - this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; - this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28); - this.AddressBookToolStripMenuItem.Text = "Address Book"; - this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); - // // CalculatorToolStripMenuItem // this.CalculatorToolStripMenuItem.BackColor = System.Drawing.Color.Silver; @@ -1211,7 +1197,6 @@ namespace TimeHACK.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem SystemToolsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem DiskDefragmenterToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ScanDiskToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem AddressBookToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CalculatorToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem HyperTerminalToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ImagingToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 34500ab..5327033 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -121,9 +121,12 @@ namespace TimeHACK.OS.Win95 nonimportantapps[nonimportantapps.Count - 1].BringToFront(); nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); + + app.BringToFront(); } + } private void fontLoad() @@ -354,16 +357,7 @@ namespace TimeHACK.OS.Win95 private void AddressBookToolStripMenuItem_Click(object sender, EventArgs e) { - WinClassicAddressBook ab = new WinClassicAddressBook(); - WinClassic app = wm.StartWin95(ab, "Address Book", Properties.Resources.WinClassicAddressBook, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook); - nonimportantapps.Add(app); - nonimportantapps[nonimportantapps.Count - 1].BringToFront(); - nonimportantapps[nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(NonImportantApp_Closing); - - app.BringToFront(); - startmenu.Hide(); } private void WindowsExplorerToolStripMenuItem1_Click(object sender, EventArgs e) diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index ba695aa..5e1c35e 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -121,48 +121,6 @@ <value>17, 17</value> </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> - <data name="InternetExplorerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC -</value> - </data> - <data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= -</value> - </data> - <data name="OutlookExpressToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC -</value> - </data> - <data name="WindowsExplorerToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC -</value> - </data> - <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= -</value> - </data> <data name="InternetConnectionWizardToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N @@ -236,14 +194,6 @@ oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC </value> </data> - <data name="AddressBookToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAG1JREFUOE/N - j1sOgCAQAzk6N/exdqRsAuqH0THNrm2DWP5DrXVxyQ5mWRc6FLO/Wa5WYBKyZyLfn9EBoMJwl65vwA4p - e+EGDkXneJ8coODcM+TSvV9wwmfu5C8jPOZA7YCMleT0KAu68kN9TikrCNOnE4xyRLMAAAAASUVORK5C - YII= -</value> - </data> <data name="CalculatorToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -308,6 +258,41 @@ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== </value> </data> + <data name="InternetExplorerToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC +</value> + </data> + <data name="MSDOSPromptToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= +</value> + </data> + <data name="OutlookExpressToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC +</value> + </data> + <data name="WindowsExplorerToolStripMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC +</value> + </data> <data name="downloaderTestToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -343,6 +328,13 @@ 4AAABIQCQUtXaBsAAAAASUVORK5CYII= </value> </data> + <data name="FindToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= +</value> + </data> <data name="FilesOrFoldersToolStripMenuItem.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -382,7 +374,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAbABAQGwAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAbgBAQG4AQEBIAEAASABAAT/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/IE4Sites/IE4NoPage.resx b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx index a167a19..5f61137 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/IE4Sites/IE4NoPage.resx @@ -117,7 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <data name="String1" xml:space="preserve"> + <data name="string1" xml:space="preserve"> <value>testy</value> </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs index 7e4c69f..bd614eb 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.Designer.cs @@ -93,7 +93,7 @@ this.newToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.newToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.newToolStripMenuItem.Text = "New"; // // openToolStripMenuItem @@ -102,7 +102,7 @@ this.openToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.openToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.openToolStripMenuItem.Text = "Open..."; this.openToolStripMenuItem.Click += new System.EventHandler(this.openToolStripMenuItem_Click); // @@ -112,7 +112,7 @@ this.saveToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.saveToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -122,7 +122,7 @@ this.saveAsToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.saveAsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.saveAsToolStripMenuItem.Text = "Save As..."; // // pageSetupToolStripMenuItem @@ -131,7 +131,7 @@ this.pageSetupToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.pageSetupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.pageSetupToolStripMenuItem.Name = "pageSetupToolStripMenuItem"; - this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.pageSetupToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.pageSetupToolStripMenuItem.Text = "Page Setup..."; // // printToolStripMenuItem @@ -140,7 +140,7 @@ this.printToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.printToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; - this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.printToolStripMenuItem.Text = "Print"; // // exitToolStripMenuItem @@ -149,7 +149,7 @@ this.exitToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; this.exitToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(142, 22); this.exitToolStripMenuItem.Text = "Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -357,7 +357,7 @@ private System.Windows.Forms.ToolStripMenuItem printToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; - private System.Windows.Forms.TextBox mainText; + public System.Windows.Forms.TextBox mainText; private System.Windows.Forms.ToolStripMenuItem undoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cutToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index 3cc9ad9..26d376d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -28,9 +28,8 @@ /// </summary> private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicWindowsExplorer)); this.program = new System.Windows.Forms.Panel(); + this.mainView = new System.Windows.Forms.ListView(); this.diskView = new System.Windows.Forms.TreeView(); this.MenuStrip1 = new System.Windows.Forms.MenuStrip(); this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -41,7 +40,6 @@ this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.RenameToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PropertiesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CloseToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.EditToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.UndoCtrlZToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -86,7 +84,6 @@ this.Button1 = new System.Windows.Forms.Button(); this.Label1 = new System.Windows.Forms.Label(); this.txtSave = new System.Windows.Forms.TextBox(); - this.mainView = new System.Windows.Forms.ListView(); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); @@ -95,6 +92,7 @@ // program // this.program.BackColor = System.Drawing.Color.Silver; + this.program.Controls.Add(this.mainView); this.program.Controls.Add(this.diskView); this.program.Controls.Add(this.MenuStrip1); this.program.Controls.Add(this.toprightcorner); @@ -102,22 +100,32 @@ this.program.Controls.Add(this.bottomleftcorner); this.program.Controls.Add(this.topleftcorner); this.program.Controls.Add(this.pnlSave); - this.program.Controls.Add(this.mainView); this.program.Dock = System.Windows.Forms.DockStyle.Fill; this.program.Location = new System.Drawing.Point(0, 0); this.program.Name = "program"; this.program.Size = new System.Drawing.Size(704, 517); this.program.TabIndex = 13; // + // mainView + // + this.mainView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.mainView.Location = new System.Drawing.Point(215, 27); + this.mainView.Name = "mainView"; + this.mainView.Size = new System.Drawing.Size(486, 444); + this.mainView.TabIndex = 10; + this.mainView.UseCompatibleStateImageBehavior = false; + this.mainView.View = System.Windows.Forms.View.List; + this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); + // // diskView // - this.diskView.ImageList = new System.Windows.Forms.ImageList(); this.diskView.Location = new System.Drawing.Point(3, 27); this.diskView.Name = "diskView"; this.diskView.Size = new System.Drawing.Size(213, 444); this.diskView.TabIndex = 13; - this.diskView.Visible = true; - this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(diskView_AfterSelect); + this.diskView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.diskView_AfterSelect); // // MenuStrip1 // @@ -140,7 +148,6 @@ this.CreateShortcutToolStripMenuItem, this.DeleteToolStripMenuItem, this.RenameToolStripMenuItem, - this.PropertiesToolStripMenuItem, this.CloseToolStripMenuItem}); this.FileToolStripMenuItem.Name = "FileToolStripMenuItem"; this.FileToolStripMenuItem.Size = new System.Drawing.Size(37, 20); @@ -154,7 +161,7 @@ this.TextDocumentToolStripMenuItem, this.BitmapImageToolStripMenuItem}); this.CreateShortcutToolStripMenuItem.Name = "CreateShortcutToolStripMenuItem"; - this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.CreateShortcutToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.CreateShortcutToolStripMenuItem.Text = "New"; // // FolderToolStripMenuItem @@ -185,26 +192,21 @@ // DeleteToolStripMenuItem // this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"; - this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.DeleteToolStripMenuItem.Text = "Delete"; this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click); // // RenameToolStripMenuItem // this.RenameToolStripMenuItem.Name = "RenameToolStripMenuItem"; - this.RenameToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.RenameToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.RenameToolStripMenuItem.Text = "Rename"; - // - // PropertiesToolStripMenuItem - // - this.PropertiesToolStripMenuItem.Name = "PropertiesToolStripMenuItem"; - this.PropertiesToolStripMenuItem.Size = new System.Drawing.Size(127, 22); - this.PropertiesToolStripMenuItem.Text = "Properties"; + this.RenameToolStripMenuItem.Click += new System.EventHandler(this.RenameToolStripMenuItem_Click); // // CloseToolStripMenuItem // this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem"; - this.CloseToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.CloseToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.CloseToolStripMenuItem.Text = "Close"; this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); // @@ -529,19 +531,6 @@ this.txtSave.Size = new System.Drawing.Size(542, 20); this.txtSave.TabIndex = 15; // - // mainView - // - this.mainView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.mainView.Location = new System.Drawing.Point(215, 27); - this.mainView.Name = "mainView"; - this.mainView.Size = new System.Drawing.Size(486, 444); - this.mainView.TabIndex = 10; - this.mainView.UseCompatibleStateImageBehavior = false; - this.mainView.View = System.Windows.Forms.View.List; - this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); - // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -573,7 +562,6 @@ internal System.Windows.Forms.ToolStripMenuItem BitmapImageToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem DeleteToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem RenameToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem PropertiesToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CloseToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem EditToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem UndoCtrlZToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 98dc4ff..1b12fbc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -11,6 +11,7 @@ using static TimeHACK.Engine.SaveSystem; using System.IO; using TimeHACK.Engine; using Newtonsoft.Json; +using TimeHACK.Engine.Template; namespace TimeHACK.OS.Win95.Win95Apps { @@ -21,10 +22,10 @@ namespace TimeHACK.OS.Win95.Win95Apps public string onlyViewExtension = ""; string ToReplaceWith = ProfileDirectory; - string currentDirectory = Path.Combine(ProfileDirectory, "folders/computer"); + string currentDirectory = Path.Combine(ProfileDirectory, "folders", "Computer"); string oldLabelText; int fileType = 6; - string attemptedDirectory = ""; + //string attemptedDirectory = ""; WindowManager wm = new WindowManager(); public WinClassicWindowsExplorer() @@ -80,37 +81,39 @@ namespace TimeHACK.OS.Win95.Win95Apps string label = ReadDataFile(str, false); if (label == "") { - this.mainView.Items.Add(Path.GetFileName(str)); - this.mainView.FindItemWithText(Path.GetFileName(str)).Tag = Path.GetFileName(str); + ListViewItem itm = this.mainView.Items.Add(Path.GetFileName(str)); + itm.ImageKey = str; } else { - this.mainView.Items.Add(label, 1).ImageIndex = 1; - this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str); + ListViewItem itm = this.mainView.Items.Add(label); + itm.ImageKey = str; } } foreach (string str in Directory.GetFiles(currentDirectory)) { - // Get app Icon + // Get the app Icon - int AppIcon = 2; + //int AppIcon = 2; - switch (new FileInfo(str).Extension) - { - case ".exe": - string contents; + //switch (new FileInfo(str).Extension) + //{ + // case ".exe": + // string contents; + + // contents = File.ReadAllText(str); + + // switch (contents.ToLower()) + // { + // case "calc": + // AppIcon = 3; + // break; + // case "explorer": + // AppIcon = 4; + // break; + // } + // break; + //} - contents = File.ReadAllText(str); - switch (contents.ToLower()) - { - case "calculator": - AppIcon = 3; - break; - case "windowsexplorer": - AppIcon = 4; - break; - } - break; - } if (IsFileOpenDialog == true || IsFileSaveDialog == true) { @@ -118,12 +121,14 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (new FileInfo(str).Extension == onlyViewExtension) { - this.mainView.Items.Add(Path.GetFileName(str), AppIcon); + ListViewItem itm = this.mainView.Items.Add(Path.GetFileName(str)); + itm.Tag = str; } } } else { if (!(Path.GetFileName(str) == "_data.info")) { - this.mainView.Items.Add(Path.GetFileName(str), AppIcon); + ListViewItem itm = this.mainView.Items.Add(Path.GetFileName(str)); + itm.Tag = str; } } } @@ -133,6 +138,68 @@ namespace TimeHACK.OS.Win95.Win95Apps } } + void OpenFile(string fileDir) + { + try + { + ReturnType(new FileInfo(fileDir).Extension); + switch (fileType) + { + case 1: + WinClassicNotepad np = new WinClassicNotepad(); + np.mainText.Text = FileDialogBoxManager.ReadTextFile(fileDir); + WinClassic app = wm.StartWin95(np, "Notepad", Properties.Resources.Win95IconNotepad, true, true); + + Program.AddTaskbarItem(app, app.Tag.ToString(), "Notepad", Properties.Resources.Win95IconNotepad); + + break; + case 12: + OpenApplication(FileDialogBoxManager.ReadTextFile(fileDir)); + break; + } + } catch { + } + + } + + void OpenApplication(string appname) + { + switch (appname.ToLower()) + { + case "explorer": + Engine.Template.WinClassic app = wm.StartWin95(new WinClassicWindowsExplorer(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true); + Program.AddTaskbarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); + break; + case "calc": + Engine.Template.WinClassic appCalc = wm.StartWin95(new WinClassicCalculator(), "Calculator", Properties.Resources.WinClassicCalc, true, true); + Program.AddTaskbarItem(appCalc, appCalc.Tag.ToString(), "Calculator", Properties.Resources.WinClassicCalc); + + Program.nonimportantapps.Add(appCalc); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront(); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing); + + break; + case "wordpad": + Engine.Template.WinClassic appWP = wm.StartWin95(new WinClassicWordPad(), "Wordpad", Properties.Resources.WinClassicWordpad, true, true); + Program.AddTaskbarItem(appWP, appWP.Tag.ToString(), "Wordpad", Properties.Resources.WinClassicWordpad); + + Program.nonimportantapps.Add(appWP); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront(); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing); + + break; + case "addressbook": + WinClassic appAdBk = wm.StartWin95(new WinClassicAddressBook(), "Address Book", Properties.Resources.WinClassicAddressBook, true, true); + Program.AddTaskbarItem(appAdBk, appAdBk.Tag.ToString(), "Address Book", Properties.Resources.WinClassicAddressBook); + + Program.nonimportantapps.Add(appAdBk); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].BringToFront(); + Program.nonimportantapps[Program.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(Program.NonImportantApp_Closing); + + break; + } + } + string ReturnType(string extension) { string returnVal = ""; fileType = 1; @@ -429,6 +496,8 @@ namespace TimeHACK.OS.Win95.Win95Apps // IsFileDialog = False //End Sub void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { + diskView.ImageList = new ImageList(); + diskView.ImageList.Images.Add(Properties.Resources.Win95DesktopIcon); diskView.ImageList.Images.Add(Properties.Resources.Win95HardDiskIcon); diskView.ImageList.Images.Add(Properties.Resources.WinClassicFolderSmall); @@ -438,19 +507,25 @@ namespace TimeHACK.OS.Win95.Win95Apps diskView.ImageList.Images.Add(Properties.Resources.Win95ComputerIcon); diskView.ImageList.Images.Add(Properties.Resources.Win95NetworkIcon); diskView.ImageList.Images.Add(Properties.Resources.Win95RecycleIcon); + program.BringToFront(); + int loc = 0; TreeNode[] folders = new TreeNode[new DirectoryInfo(currentDirectory).GetDirectories().Length]; foreach (DirectoryInfo folder in new DirectoryInfo(currentDirectory).GetDirectories()) { if (folder.GetDirectories().Length > 0) { + string label = ReadDataFile(folder.FullName, false); TreeNode[] tn = createSubDirNodes(folder); - folders[loc] = new TreeNode(folder.Name, 2, 3, tn); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3, tn); + folders[loc].Tag = folder.FullName; } else { - folders[loc] = new TreeNode(folder.Name, 2, 3); + string label = ReadDataFile(folder.FullName, false); + folders[loc] = new TreeNode(label ?? folder.Name, 2, 3); + folders[loc].Tag = folder.FullName; } loc++; } @@ -463,13 +538,19 @@ namespace TimeHACK.OS.Win95.Win95Apps desktoparray[1] = new TreeNode("Network Neighborhood", 7, 7); desktoparray[2] = new TreeNode("Recycle Bin", 8, 8); diskView.Nodes.Add(new TreeNode("Desktop", 0, 0, desktoparray)); + + //diskView.Items.Add("My Computer", 0); Application.DoEvents(); + RefreshAll(); + if (FileDialogBoxManager.IsInOpenDialog) { IsFileOpenDialog = true; - } else if (FileDialogBoxManager.IsInSaveDialog) { + } + else if (FileDialogBoxManager.IsInSaveDialog) + { IsFileSaveDialog = true; } @@ -477,12 +558,14 @@ namespace TimeHACK.OS.Win95.Win95Apps { pnlSave.Show(); Button1.Text = "Open"; - } else { + } + else + { if (IsFileSaveDialog == true) { pnlSave.Show(); Button1.Text = "Save"; - } + } } onlyViewExtension = FileDialogBoxManager.OnlyViewExtension; @@ -492,22 +575,32 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if ((string)mainView.FocusedItem.Tag != "") { // If it isn't a file - GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); - } else { // If it is a file - if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) - { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; - } + if (mainView.FocusedItem.Tag == null) + { // If it isn't a file + GoToDir(Path.Combine(currentDirectory, mainView.FocusedItem.ImageKey.ToString())); + } + else + { // If it is a file + if (IsFileOpenDialog == true || IsFileSaveDialog == true) + { + if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) + { + Program.WindowsExplorerReturnPath = Path.Combine(currentDirectory, txtSave.Text); + } - FileDialogBoxManager.IsInOpenDialog = false; - FileDialogBoxManager.IsInSaveDialog = false; + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; - ((Form)this.TopLevelControl).Close(); + ((Form)this.TopLevelControl).Close(); + } + else + { + OpenFile((string)mainView.FocusedItem.Tag); + } } - } catch { - + } catch (Exception ex) { + MessageBox.Show(ex.Message); } } @@ -515,10 +608,30 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if (diskView.SelectedNode.Text == "My Computer") { - GoToDir(ProfileFileSystemDirectory); - } + if (diskView.SelectedNode != null) + { + if (diskView.SelectedNode.Text == "My Computer") + { + GoToDir(ProfileFileSystemDirectory); + } + else if (diskView.SelectedNode.Text == "(C:)") + { + GoToDir(ProfileMyComputerDirectory); + } + else + { + if (diskView.SelectedNode.Tag != null) + { + // It is a directory: + try + { + GoToDir(diskView.SelectedNode.Tag.ToString()); + } + catch { } + } + } + } } catch { } } @@ -550,9 +663,9 @@ namespace TimeHACK.OS.Win95.Win95Apps bool OpenFile = false; if (mainView.FocusedItem != null) { - if ((string)mainView.FocusedItem.Tag != "") + if ((string)mainView.FocusedItem.Tag == "") { // If it isn't a file - GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); + GoToDir(Path.Combine(currentDirectory, mainView.FocusedItem.Tag.ToString())); } else OpenFile = true; // If it is a file } @@ -565,10 +678,10 @@ namespace TimeHACK.OS.Win95.Win95Apps } else { - if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) + if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + Program.WindowsExplorerReturnPath = Path.Combine(currentDirectory, txtSave.Text); } @@ -588,23 +701,29 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if (!File.Exists(Path.Combine(currentDirectory, mainView.FocusedItem.Text))) + if (!FileOrDirectoryExists(Path.Combine(currentDirectory, mainView.FocusedItem.Text))) { wm.StartInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info); } else { - Directory.Delete(currentDirectory + mainView.FocusedItem.Text, true); + if (Directory.Exists(Path.Combine(currentDirectory, mainView.FocusedItem.Text))) Directory.Delete(Path.Combine(currentDirectory, mainView.FocusedItem.Text), true); + else File.Delete(Path.Combine(currentDirectory, mainView.FocusedItem.Text)); RefreshAll(); } } catch { - + RefreshAll(); } } + internal static bool FileOrDirectoryExists(string path) + { + return (Directory.Exists(path) || File.Exists(path)); + } + private void CloseToolStripMenuItem_Click(object sender, EventArgs e) { ((Form)this.TopLevelControl).Close(); @@ -661,12 +780,16 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (fold.GetDirectories().Length > 0) { + string label = ReadDataFile(fold.FullName, false); TreeNode[] tn = createSubDirNodes(fold); - toReturn[loc] = new TreeNode(fold.Name, 2, 3, tn); + toReturn[loc] = new TreeNode(label ?? fold.Name, 2, 3, tn); + toReturn[loc].Tag = fold.FullName; } else { - toReturn[loc] = new TreeNode(fold.Name, 2, 3); + string label = ReadDataFile(fold.FullName, false); + toReturn[loc] = new TreeNode(label ?? fold.Name, 2, 3); + toReturn[loc].Tag = fold.FullName; } loc++; } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index 8ebe617..bb70361 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -117,129 +117,7 @@ <resheader name="writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> - <metadata name="icons.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>312, 18</value> - </metadata> - <data name="icons.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> - <value> - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIADAc0AAPsAQAC7AEA - AuwBAAPsNAAC7AH/AQAB7AH/AQAB7AH/AQAB7AH/AewzAAHsAQcBAgYHAewCBwLsMgAB7AUHBewBBwLs - MgAB7Av/Auw+AALsNAAB/wgHAewBAAHsNAAB/wfsAf8B7DYAAf8BAAIGAv8BAAEGAf8B7DYAAf8BAAEG - A/8BAAEGAf8B7DYAAf8BAAH+Av8BAAIGAf8B7DYAAf8BAAYGAf8B7DYAAf8H7AH/Aew2AAHsCP8B7DcA - CewyAAHtDRQB8jEADQcB9wFtAfIwAAIHATMEBwHtAm0BEgFtAe0B9wHsARQwAAcHAe8E9wHvAfcB7AEU - AgAL7AUAAfAIbQHzBAACBg0EAQANBwHvAewBFAIAAewB/wEHAfsBBwH7AQcB+wEHAfsB7AUAAe8BBwb/ - AewB8gQAAQYB/wwGAQQCAAEHCxQBbQGSARQBAAHsAf8BBwH7AQcB+wEHAfsBBwH7AQcBAAHsBAAB7wEH - Bv8B7AHyBAABBgH+AQYBAAH/AQAB/wEAAf8BAAL/AQcBAAEEAgAB8ArxAfcBbQGSAfMBAAHsAf8B+wEH - AfsBBwH7AQcB+wEHAewGAAHvAQcG/wHsAfIEAAEGAf8MBgEEAgAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/ - AfsBBwH7AQcB+wEHAfsBBwH7AgABBwQAAe8BBwb/AewB8gQAAQYB/gEGAQAB/wEAAf8BAAH/AQAB/wEA - Af8BAAEEAgAB8AHxAQQC/AGGAuwBFAH8Ac8B9wHsAe8BAAHsCf8B7AEAAfwB/wEHAwAB7wEHBv8B7AHy - BAABBgH/DAYBBAIAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHsAfIEAAEG - Af4BAAcHBAYBBAIAAfAB8QEEAfwBBwG8AbUBBAGFAfwBzwH3AewB7wIAAewB/wH7AQcB7AL/AfwB/wH8 - Av8FAAHvAQcE/wIRAQ4B8gQAAQYB/wEABv8BBwQGAQQCAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHs - Af8BBwH7AQcB7AL/AfwC/wEAAewEAAHvAQcE/wHsAfcB8AUAAQYB/ggABAYBBAIAAfAB8QEKBwQBzwH3 - AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwERAfMGAAEGAf8B/gH/Af4B/wH+Af8B/gH/ - Af4B/wH+Af8BBgIAAfAB8Qj3AQcB9wHsAe8DAAHsBP8C7AH/FwAOBgIAAf8BvAnxAbwB7AHvBAAE7CsA - Af8BBwn3AZIB8jEAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGAAQMGAAGA - AQEGAAHABwABwAcAAcAHAAHABwAB8AcAAfAHAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHw - AQEGAAHwAQEGAAH4AQMHAAEBBv8CAAb/AgAB4AEBAv8BgAEBAgABwAEBAcABDwQAAcABAQHAAQ8CAAGA - AQABgAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEBAQABCQHAAQ8CAAGAAQECAAHAAQ8CAAGAAQEBAAEB - AcABDwIAAYABAQGAAQEBwAEPAgABgAEBAYABAQHAAR8CAAGAAQEBgAEDAcABPwIAAYABAQHAAR8C/wGA - AQEBgAEBAeEBvwT/AcABAQb/Cw== -</value> - </data> <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <value>17, 17</value> </metadata> - <metadata name="iconsList.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>409, 17</value> - </metadata> - <data name="iconsList.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> - <value> - AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w - LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADG - CwAAAk1TRnQBSQFMAgEBBQEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo - AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA - AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 - AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA - AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm - AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM - AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA - ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz - AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ - AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM - AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA - AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA - AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ - AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ - AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA - AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm - ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ - Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz - AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA - AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM - AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM - ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM - Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA - AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM - AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ - AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz - AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm - AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw - AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wIADAc0AAPsAQAC7AEA - AuwBAAPsNAAC7AH/AQAB7AH/AQAB7AH/AQAB7AH/AewzAAHsAQcBAgYHAewCBwLsMgAB7AUHBewBBwLs - MgAB7Av/Auw+AALsNAAB/wgHAewBAAHsNAAB/wfsAf8B7DYAAf8BAAIGAv8BAAEGAf8B7DYAAf8BAAEG - A/8BAAEGAf8B7DYAAf8BAAH+Av8BAAIGAf8B7DYAAf8BAAYGAf8B7DYAAf8H7AH/Aew2AAHsCP8B7DcA - CewyAAHtDRQB8jEADQcB9wFtAfIwAAIHATMEBwHtAm0BEgFtAe0B9wHsARQwAAcHAe8E9wHvAfcB7AEU - AgAL7AUAAfAIbQHzBAACBg0EAQANBwHvAewBFAIAAewB/wEHAfsBBwH7AQcB+wEHAfsB7AUAAe8BBwb/ - AewB8gQAAQYB/wwGAQQCAAEHCxQBbQGSARQBAAHsAf8BBwH7AQcB+wEHAfsBBwH7AQcBAAHsBAAB7wEH - Bv8B7AHyBAABBgH+AQYBAAH/AQAB/wEAAf8BAAL/AQcBAAEEAgAB8ArxAfcBbQGSAfMBAAHsAf8B+wEH - AfsBBwH7AQcB+wEHAewGAAHvAQcG/wHsAfIEAAEGAf8MBgEEAgAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/ - AfsBBwH7AQcB+wEHAfsBBwH7AgABBwQAAe8BBwb/AewB8gQAAQYB/gEGAQAB/wEAAf8BAAH/AQAB/wEA - Af8BAAEEAgAB8AHxAQQC/AGGAuwBFAH8Ac8B9wHsAe8BAAHsCf8B7AEAAfwB/wEHAwAB7wEHBv8B7AHy - BAABBgH/DAYBBAIAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHsAfIEAAEG - Af4BAAcHBAYBBAIAAfAB8QEEAfwBBwG8AbUBBAGFAfwBzwH3AewB7wIAAewB/wH7AQcB7AL/AfwB/wH8 - Av8FAAHvAQcE/wIRAQ4B8gQAAQYB/wEABv8BBwQGAQQCAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHs - Af8BBwH7AQcB7AL/AfwC/wEAAewEAAHvAQcE/wHsAfcB8AUAAQYB/ggABAYBBAIAAfAB8QEKBwQBzwH3 - AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwERAfMGAAEGAf8B/gH/Af4B/wH+Af8B/gH/ - Af4B/wH+Af8BBgIAAfAB8Qj3AQcB9wHsAe8DAAHsBP8C7AH/FwAOBgIAAf8BvAnxAbwB7AHvBAAE7CsA - Af8BBwn3AZIB8jEAAUIBTQE+BwABPgMAASgDAAFAAwABIAMAAQEBAAEBBgABARYAA/8BAAGAAQMGAAGA - AQEGAAHABwABwAcAAcAHAAHABwAB8AcAAfAHAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHwAQEGAAHw - AQEGAAHwAQEGAAH4AQMHAAEBBv8CAAb/AgAB4AEBAv8BgAEBAgABwAEBAcABDwQAAcABAQHAAQ8CAAGA - AQABgAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEBAQABCQHAAQ8CAAGAAQECAAHAAQ8CAAGAAQEBAAEB - AcABDwIAAYABAQGAAQEBwAEPAgABgAEBAYABAQHAAR8CAAGAAQEBgAEDAcABPwIAAYABAQHAAR8C/wGA - AQEBgAEBAeEBvwT/AcABAQb/Cw== -</value> - </data> </root>
\ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs index 465e375..710c51c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWordPad.Designer.cs @@ -508,9 +508,6 @@ } #endregion - - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.ToolStripMenuItem helloToolStripMenuItem; private System.Windows.Forms.MenuStrip topmenu; private System.Windows.Forms.ToolStripMenuItem fileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs index 7eb3196..7eb3196 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.Designer.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs index 482d54c..482d54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx index 1af7de1..1af7de1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewContact.resx diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs index c7efcd0..c7efcd0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.Designer.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs index 705fd0d..705fd0d 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx index 1af7de1..1af7de1 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/FRMWinClassicAddressBookNewFolder.resx diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.Designer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs index 41107e8..41107e8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.Designer.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs index 95ee509..95ee509 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.cs diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.resx b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.resx index e1c367e..e1c367e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/AddressBook/WinClassicAddressBook.resx +++ b/TimeHACK.Main/OS/Win98/Win98Apps/AddressBook/WinClassicAddressBook.resx diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 086c084..9534c6d 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -13,6 +13,7 @@ using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.Engine; using TimeHACK.Engine.Template; using System.Drawing; +using TimeHACK.SaveDialogs; namespace TimeHACK { @@ -58,6 +59,8 @@ namespace TimeHACK //MySaveData = (TimeHACK.Engine.GameSave.SaveData)JsonConvert.DeserializeObject(TheJSON, MySaveData.GetType()); //MessageBox.Show(MySaveData.OS.ToString()); + + Engine.SaveSystem.troubleshooter = new SaveFileTroubleShooter(); Application.EnableVisualStyles(); Application.Run(title); } diff --git a/TimeHACK.Main/SaveDialogs/LoadGameDialog.Designer.cs b/TimeHACK.Main/SaveDialogs/LoadGameDialog.Designer.cs index 4d8691d..cacfe9e 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameDialog.Designer.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameDialog.Designer.cs @@ -48,7 +48,8 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(360, -1); + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button3.Location = new System.Drawing.Point(364, 0); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.TabIndex = 0; @@ -58,6 +59,7 @@ // // button1 // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button1.Location = new System.Drawing.Point(441, 0); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(75, 23); diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs index bcd60d1..5ec84be 100644 --- a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs @@ -61,7 +61,30 @@ namespace TimeHACK.SaveDialogs // Read the main.save file json = File.ReadAllText(Path.Combine(SaveSystem.ProfileDirectory, "main.save")); - savedata = Newtonsoft.Json.JsonConvert.DeserializeObject<Save>(json); + try + { + savedata = Newtonsoft.Json.JsonConvert.DeserializeObject<Save>(json); + + } catch + { + WriteToLog("ISSUE FOUND! File main.save is unreadable"); + + WriteToLog("Sorry, there is no repairing it easily, your data will be lost"); + + if (Directory.Exists(Path.Combine(SaveSystem.ProfileDirectory, "main.backup"))) Directory.Delete(Path.Combine(SaveSystem.ProfileDirectory, "main.backup")); + + File.Copy(Path.Combine(SaveSystem.ProfileDirectory, "main.save"), Path.Combine(SaveSystem.ProfileDirectory, "main.backup")); + SaveSystem.NewGame(); + + // Make sure the username is set + + SaveSystem.CurrentSave.Username = SaveSystem.ProfileName; + + WriteToLog($"The corrupt file has been stored in {Path.Combine(SaveSystem.ProfileDirectory, "main.backup")}"); + + EndScan(true); + } + // Check the values @@ -107,7 +130,7 @@ namespace TimeHACK.SaveDialogs // Set the main.save file to the resolved one - File.WriteAllText(Path.Combine(SaveSystem.ProfileDirectory, "main.save"), Newtonsoft.Json.JsonConvert.SerializeObject(savedata)); + File.WriteAllText(Path.Combine(SaveSystem.ProfileDirectory, "main.save"), Newtonsoft.Json.JsonConvert.SerializeObject(savedata, Newtonsoft.Json.Formatting.Indented)); textBox1.Text = log; } else { diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 2e26c66..dbb1ff1 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -50,7 +50,7 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> + <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> @@ -254,10 +254,10 @@ <Compile Include="OS\Win95\Win95.Designer.cs"> <DependentUpon>Win95.cs</DependentUpon> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewContact.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.Designer.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewContact.Designer.cs"> <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon> </Compile> <Compile Include="OS\Win95\Win95Apps\WebChat1998.cs"> @@ -266,16 +266,16 @@ <Compile Include="OS\Win95\Win95Apps\WebChat1998.Designer.cs"> <DependentUpon>WebChat1998.cs</DependentUpon> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewFolder.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.Designer.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewFolder.Designer.cs"> <DependentUpon>FRMWinClassicAddressBookNewFolder.cs</DependentUpon> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\WinClassicAddressBook.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.Designer.cs"> + <Compile Include="OS\Win98\Win98Apps\AddressBook\WinClassicAddressBook.Designer.cs"> <DependentUpon>WinClassicAddressBook.cs</DependentUpon> </Compile> <Compile Include="GlobalPrograms\WinClassicDownloader.cs"> @@ -400,7 +400,7 @@ <DependentUpon>Win95.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> - <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewContact.resx"> + <EmbeddedResource Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewContact.resx"> <DependentUpon>FRMWinClassicAddressBookNewContact.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="OS\Win95\Win95Apps\WebChat1998.resx"> @@ -408,10 +408,10 @@ <Generator>ResXFileCodeGenerator</Generator> <LastGenOutput>WebChat19981.Designer.cs</LastGenOutput> </EmbeddedResource> - <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\FRMWinClassicAddressBookNewFolder.resx"> + <EmbeddedResource Include="OS\Win98\Win98Apps\AddressBook\FRMWinClassicAddressBookNewFolder.resx"> <DependentUpon>FRMWinClassicAddressBookNewFolder.cs</DependentUpon> </EmbeddedResource> - <EmbeddedResource Include="OS\Win95\Win95Apps\AddressBook\WinClassicAddressBook.resx"> + <EmbeddedResource Include="OS\Win98\Win98Apps\AddressBook\WinClassicAddressBook.resx"> <DependentUpon>WinClassicAddressBook.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="GlobalPrograms\WinClassicDownloader.resx"> |