From b58ee3f47ecf886e8a177d6a1fde7685ba6505e1 Mon Sep 17 00:00:00 2001 From: Aren Date: Thu, 1 Jun 2017 10:34:10 +0200 Subject: Add Histacom.AU to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 299313b..4a781a8 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,8 @@ TimeHACK's documentation can be found on the TimeHACK Wiki: https://github.com/T ## Other Repositories * A completely discontinued project called "HistacomVB". The idea of it being that it was the old game except being built upon. In the end, however, we stopped it because having "HistacomVB" and "TimeHACK" was unnecessary. If you REALLY want to see the repo, click here: http://www.github.com/TimeHACKDevs/HistacomVB +* An unofficial project called "Histacom.AU". +This is a rewrite of Histacom in Python, and has a place [here](https://github.com/TimeHACKDevs/histacom-au) ## License TimeHACK is licensed under the [MIT license](https://github.com/TimeHACKDevs/TimeHACK/blob/master/LICENSE). All code committed to the TimeHACK repository becomes the property of the TimeHACK Development Team, and will **not** be removed upon request. -- cgit v1.2.3 From cf7392f930598bbbdf50cbb3a4f2bf91a2b44022 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Fri, 2 Jun 2017 15:06:52 +0100 Subject: Added my File Explorer It also has a File Open and File Save thing configured for the Notepad --- .vs/TimeHACK/v15/.suo | Bin 138240 -> 167424 bytes TimeHACK.Engine/SaveSystem.cs | 1 + TimeHACK.Engine/Template/Win9XBSOD.Designer.cs | 110 +++++++++++---------- TimeHACK.Engine/Template/Win9XBSOD.cs | 5 + TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll | Bin 190464 -> 191488 bytes TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb | Bin 62976 -> 67072 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 189440 -> 189952 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache | 2 +- ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 17085 -> 17085 bytes TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll | Bin 190464 -> 191488 bytes TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb | Bin 62976 -> 67072 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2532 -> 2531 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 17117 -> 17117 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 189440 -> 189952 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes .../OS/Win95/Win95Apps/WinClassicNotepad.cs | 4 +- .../WinClassicWindowsExplorer.Designer.cs | 24 ++++- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 48 +++++++-- .../Win95/Win95Apps/WinClassicWindowsExplorer.resx | 55 ++++++++++- TimeHACK.Main/TitleScreen.cs | 16 +++ TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 189440 -> 189952 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4834816 -> 4838400 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 265728 -> 267776 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4834816 -> 4838400 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 6661 -> 6660 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 26715 -> 26715 bytes ...HACK.OS.Win95.Win95Apps.WinClassicIE4.resources | Bin 2832 -> 2884 bytes ...5.Win95Apps.WinClassicWindowsExplorer.resources | Bin 3097 -> 5894 bytes ...K.WinClassicForms.WinClassicInstaller.resources | Bin 1369 -> 1383 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4834816 -> 4838400 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 265728 -> 267776 bytes 37 files changed, 206 insertions(+), 79 deletions(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 79079eb..2abdad5 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 1b37cf3..82a0e5e 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -11,6 +11,7 @@ namespace TimeHACK.Engine public static class SaveSystem { public static Save CurrentSave { get; private set; } + public static FileSystemFolderInfo filesystemflinfo { get; set; } public static Boolean DevMode = false; public static string GameDirectory diff --git a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs index d6795df..67f596a 100644 --- a/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs +++ b/TimeHACK.Engine/Template/Win9XBSOD.Designer.cs @@ -1,33 +1,33 @@ -namespace TimeHACK.Engine.Template -{ - partial class Win9XBSOD - { - /// - /// 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 Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { +namespace TimeHACK.Engine.Template +{ + partial class Win9XBSOD + { + /// + /// 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 Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { this.label1 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); @@ -38,23 +38,25 @@ // // label1 // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.None; this.label1.AutoSize = true; this.label1.BackColor = System.Drawing.Color.Silver; - this.label1.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Blue; - this.label1.Location = new System.Drawing.Point(444, 0); + this.label1.Location = new System.Drawing.Point(549, 185); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(147, 28); + this.label1.Size = new System.Drawing.Size(138, 31); this.label1.TabIndex = 0; this.label1.Text = " Windows "; // // textBox1 // + this.textBox1.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox1.BackColor = System.Drawing.Color.Blue; this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox1.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox1.ForeColor = System.Drawing.Color.White; - this.textBox1.Location = new System.Drawing.Point(0, 54); + this.textBox1.Location = new System.Drawing.Point(186, 272); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; @@ -66,11 +68,12 @@ // // textBox2 // + this.textBox2.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox2.BackColor = System.Drawing.Color.Blue; this.textBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox2.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox2.ForeColor = System.Drawing.Color.White; - this.textBox2.Location = new System.Drawing.Point(0, 141); + this.textBox2.Location = new System.Drawing.Point(205, 377); this.textBox2.Multiline = true; this.textBox2.Name = "textBox2"; this.textBox2.ReadOnly = true; @@ -82,11 +85,12 @@ // // textBox3 // + this.textBox3.Anchor = System.Windows.Forms.AnchorStyles.None; this.textBox3.BackColor = System.Drawing.Color.Blue; this.textBox3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.textBox3.Font = new System.Drawing.Font("Perfect DOS VGA 437", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.textBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.textBox3.ForeColor = System.Drawing.Color.White; - this.textBox3.Location = new System.Drawing.Point(332, 248); + this.textBox3.Location = new System.Drawing.Point(439, 506); this.textBox3.Multiline = true; this.textBox3.Name = "textBox3"; this.textBox3.ReadOnly = true; @@ -101,9 +105,10 @@ this.panel1.Controls.Add(this.textBox3); this.panel1.Controls.Add(this.textBox1); this.panel1.Controls.Add(this.textBox2); - this.panel1.Location = new System.Drawing.Point(this.Width - 475, this.Height - 141); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(950, 282); + this.panel1.Size = new System.Drawing.Size(1280, 720); this.panel1.TabIndex = 3; // // Win9XBSOD @@ -115,21 +120,22 @@ this.Controls.Add(this.panel1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.Name = "Win9XBSOD"; - this.Tag = "gnoreFormOnTaskbar"; + this.Tag = "ignoreFormOnTaskbar"; this.Text = "Win9XBSOD"; + this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.Win9XBSOD_FormClosed); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Win9XBSOD_KeyDown); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.ResumeLayout(false); - } - - #endregion - - internal System.Windows.Forms.Label label1; - internal System.Windows.Forms.TextBox textBox1; - internal System.Windows.Forms.TextBox textBox2; - internal System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.Panel panel1; - } + } + + #endregion + + internal System.Windows.Forms.Label label1; + internal System.Windows.Forms.TextBox textBox1; + internal System.Windows.Forms.TextBox textBox2; + internal System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.Panel panel1; + } } \ No newline at end of file diff --git a/TimeHACK.Engine/Template/Win9XBSOD.cs b/TimeHACK.Engine/Template/Win9XBSOD.cs index 519315e..acf5e07 100644 --- a/TimeHACK.Engine/Template/Win9XBSOD.cs +++ b/TimeHACK.Engine/Template/Win9XBSOD.cs @@ -29,5 +29,10 @@ namespace TimeHACK.Engine.Template this.Close(); } } + + private void Win9XBSOD_FormClosed(object sender, FormClosedEventArgs e) + { + + } } } diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll index c0b8adc..90aa6d0 100644 Binary files a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll and b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb index 993040c..72eb867 100644 Binary files a/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb and b/TimeHACK.Engine/bin/Debug/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index f873219..d64a2d8 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 39d11b7..83015dd 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/Debug/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache index fc241b3..2a875f4 100644 --- a/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Debug/CoreCompileInputs.cache @@ -1 +1 @@ -34172df9cedd638ac7a23f9204409797a1d64c7b +ce9c5da841ac94441144344852958905f2496327 diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache index 97183e6..9f7772d 100644 Binary files a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll index c0b8adc..90aa6d0 100644 Binary files a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll and b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb b/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb index 993040c..72eb867 100644 Binary files a/TimeHACK.Engine/obj/Debug/TimeHACK.Engine.pdb and b/TimeHACK.Engine/obj/Debug/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 e6e04ba..ae4ed12 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index 2e60c1a..bde10d3 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index f873219..d64a2d8 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 39d11b7..83015dd 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/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index a5472a3..e08e6ec 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using TimeHACK.Engine; using static TimeHACK.Engine.FileDialogBoxManager; +using System.IO; namespace TimeHACK.OS.Win95.Win95Apps { @@ -93,7 +94,8 @@ namespace TimeHACK.OS.Win95.Win95Apps private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - + ActivateSaveFileDialog(".txt"); + File.WriteAllText(Program.OpenFileExplorerAsDialogAndReturnGivenPath(), mainText.Text); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index a423686..2f0829f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -94,6 +94,7 @@ this.LinkLabel1 = new System.Windows.Forms.LinkLabel(); this.Label3 = new System.Windows.Forms.Label(); this.Label2 = new System.Windows.Forms.Label(); + this.iconsList = new System.Windows.Forms.ImageList(this.components); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); @@ -218,8 +219,9 @@ // 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 // @@ -236,8 +238,9 @@ // 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); // // EditToolStripMenuItem // @@ -552,6 +555,7 @@ // Button1 // this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.Button1.Location = new System.Drawing.Point(772, 3); this.Button1.Name = "Button1"; this.Button1.Size = new System.Drawing.Size(75, 23); @@ -583,14 +587,15 @@ 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.LargeImageList = this.icons; + this.mainView.LargeImageList = this.iconsList; this.mainView.Location = new System.Drawing.Point(222, 54); this.mainView.Name = "mainView"; this.mainView.Size = new System.Drawing.Size(631, 417); - this.mainView.SmallImageList = this.icons; - this.mainView.StateImageList = this.icons; + this.mainView.SmallImageList = this.iconsList; + this.mainView.StateImageList = this.iconsList; 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); // // pnlHidden @@ -638,6 +643,14 @@ this.Label2.TabIndex = 0; this.Label2.Text = "This directory is hidden"; // + // iconsList + // + this.iconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconsList.ImageStream"))); + this.iconsList.TransparentColor = System.Drawing.Color.Transparent; + this.iconsList.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); + this.iconsList.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); + this.iconsList.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); + // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -724,5 +737,6 @@ internal System.Windows.Forms.Label Label1; internal System.Windows.Forms.TextBox txtSave; internal System.Windows.Forms.ImageList icons; + private System.Windows.Forms.ImageList iconsList; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 6ad1bb1..573c9d7 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -64,11 +64,10 @@ namespace TimeHACK.OS.Win95.Win95Apps String ReadDataFile(String reqDirectory, Boolean returnYesIfProtected = false) { String Val = ""; String directoryFileInfo; - directoryFileInfo = File.ReadAllText(reqDirectory); + directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info")); FileSystemFolderInfo toRead = new FileSystemFolderInfo(); toRead = JsonConvert.DeserializeObject(directoryFileInfo); - MessageBox.Show(toRead.label); if (returnYesIfProtected == true) { if (toRead.Isprotected == true) @@ -100,10 +99,10 @@ namespace TimeHACK.OS.Win95.Win95Apps String label = ReadDataFile(str, false); if (label == "") { - this.mainView.Items.Add(Path.GetFileName(str), 1); + this.mainView.Items.Add(Path.GetFileName(str)); this.mainView.FindItemWithText(Path.GetFileName(str)).Tag = Path.GetFileName(str); } else { - this.mainView.Items.Add(label, 1); + this.mainView.Items.Add(label, 1).ImageIndex = 1; this.mainView.FindItemWithText(label).Tag = Path.GetFileName(str); } } @@ -428,11 +427,12 @@ namespace TimeHACK.OS.Win95.Win95Apps // IsFileDialog = False //End Sub void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { - icons.Images.Add(Properties.Resources.WinClassicFolder); - icons.Images.Add(Properties.Resources.WinClassicComputer); + //icons.Images.Add(Properties.Resources.WinClassicFolder); + //icons.Images.Add(Properties.Resources.WinClassicComputer); program.BringToFront(); dirLbl.Text = "folders"; diskView.Items.Add("My Computer", 0); + Application.DoEvents(); CheckLbl(); RefreshAll(); if (FileDialogBoxManager.IsInOpenDialog) @@ -447,8 +447,11 @@ namespace TimeHACK.OS.Win95.Win95Apps pnlSave.Show(); Button1.Text = "Open"; } else { - pnlSave.Show(); - Button1.Text = "Save"; + if (IsFileSaveDialog == true) + { + pnlSave.Show(); + Button1.Text = "Save"; + } } onlyViewExtension = FileDialogBoxManager.OnlyViewExtension; @@ -546,9 +549,10 @@ namespace TimeHACK.OS.Win95.Win95Apps if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; } + FileDialogBoxManager.IsInOpenDialog = false; FileDialogBoxManager.IsInSaveDialog = false; @@ -556,5 +560,31 @@ namespace TimeHACK.OS.Win95.Win95Apps ((Form)this.TopLevelControl).Close(); } } + + private void DeleteToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (!File.Exists(currentDirectory + mainView.FocusedItem.Text)) + { + wm.startInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info); + } + else + { + Directory.Delete(currentDirectory + mainView.FocusedItem.Text, true); + + RefreshAll(); + } + } catch + { + + } + + } + + private void CloseToolStripMenuItem_Click(object sender, EventArgs e) + { + ((Form)this.TopLevelControl).Close(); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index 55cb7ea..359ed6e 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAARgBAAEYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -173,4 +173,57 @@ 17, 17 + + 409, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w + LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 + CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + 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/wEAAe0NFAHyMQANBwH3 + AW0B8jAAAgcBMwQHAe0CbQESAW0B7QH3AewBFDAABwcB7wT3Ae8B9wHsARQCAAvsBQAB8AhtAfMUAA0H + Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B+AHyFQABBwsUAW0BkgEUAQAB7AH/ + AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AfgB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 + AQcB+wEHAfsBBwHsBgAB7wEHBv8B+AHyFQAB8AHxAQQHoQG1AfcB+AHvAQAB7AH/AfsBBwH7AQcB+wEH + AfsBBwH7AgABBwQAAe8BBwb/AfgB8hUAAfAB8QEEAvwBhgL4ARQB/AHPAfcB+AHvAQAB7An/AewBAAH8 + Af8BBwMAAe8BBwb/AfgB8hUAAfAB8QEEAfwB6gHsAv8B+AH8Ac8B9wH4Ae8BAAzsAv8EAAHvAQcG/wH4 + AfIVAAHwAfEBBAH8AQcB7gG1AQQBhQH8Ac8B9wH4Ae8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH + BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wH4Ae8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv + AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AfgB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER + AfMXAAHwAfEI9wEHAfcB+AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA + AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8CAAEBBP8EAAT/BAAB4AEBAv8EAAHA + AQEBwAEPBAABwAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEAAYABAQHAAQ8CAAGAAQEBAAEJAcABDwIA + AYABAQIAAcABDwIAAYABAQEAAQEBwAEPAgABgAEBAYABAQHAAQ8CAAGAAQEBgAEBAcABHwIAAYABAQGA + AQMBwAE/AgABgAEBAcABHwL/AgABgAEBAeEBvwL/AgABwAEBBP8CAAs= + + \ No newline at end of file diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 1b3c52c..ea512e4 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -166,6 +166,22 @@ namespace TimeHACK frm95.Close(); frm95 = null; + try + { + // Time to close all the game applications + foreach (Form frm in Application.OpenForms) + { + if (frm.Tag.ToString() != "ignoreFormOnTaskbar") + { + frm.Close(); + } + } + } catch { + + } + + + // If VM Mode is not enabled if (vm_mode.Checked != true) { diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index f873219..d64a2d8 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 39d11b7..83015dd 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 27f7ad6..e093b17 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - tqcU7kIBg+iSygTjllqLFFURbdNeO1xDOBjh+ang0bM= + 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 99f4f67..5bda568 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 be9fcac..6d7fb48 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - kqatPPBK/G/VmlkO4NNuIOwfrJwVd6mbz/yROC011EA= + A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= - + - UDnzq1bid2StNY4fmq7VKMqaq81ginmz76HAKIpmlnQ= + aCU7tXzb1lHJzz5blBXKbootl0x5lYwecxfgepykISk= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 88e3e5c..499a9f3 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 99f4f67..5bda568 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.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 44161f9..7c6da71 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 4175df5..924a917 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.WinClassicIE4.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources index ed371f5..15a3c57 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources index 299ae0e..8515583 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources index 4f16f96..efaafcd 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources and b/TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index 27f7ad6..e093b17 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - tqcU7kIBg+iSygTjllqLFFURbdNeO1xDOBjh+ang0bM= + 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 99f4f67..5bda568 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 be9fcac..6d7fb48 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - kqatPPBK/G/VmlkO4NNuIOwfrJwVd6mbz/yROC011EA= + A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= - + - UDnzq1bid2StNY4fmq7VKMqaq81ginmz76HAKIpmlnQ= + aCU7tXzb1lHJzz5blBXKbootl0x5lYwecxfgepykISk= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 88e3e5c..499a9f3 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 1b6c41b0a471ba27a8c9bacf1ecf1c01d144f319 Mon Sep 17 00:00:00 2001 From: IBMPCDOS5 Date: Fri, 2 Jun 2017 10:28:03 -0500 Subject: Lots of changes Revamped Alex's Wibdows Explorer, added an about page, and minor start menu changes, (Changing NotePad to Notepad, Shutdown... to Shut Down...) --- .vs/TimeHACK/v15/.suo | Bin 167424 -> 147456 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 189952 -> 189952 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 62976 -> 60928 bytes .../obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9510 -> 9224 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 155443 -> 155664 bytes .../TimeHACK.Engine.Template.WinClassic.resources | Bin 4593 -> 4593 bytes .../TimeHACK.Engine.csproj.FileListAbsolute.txt | 12 +++++ .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 17117 -> 23531 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 189952 -> 189952 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 62976 -> 60928 bytes TimeHACK.Main/OS/Win95/Win95.Designer.cs | 30 +++++------ TimeHACK.Main/OS/Win95/Win95.resx | 36 ++++++------- .../WinClassicWindowsExplorer.Designer.cs | 60 +++++++++++---------- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 8 ++- .../Win95/Win95Apps/WinClassicWindowsExplorer.resx | 22 ++++---- TimeHACK.Main/Properties/Resources.Designer.cs | 10 ++++ TimeHACK.Main/Properties/Resources.resx | 9 ++-- TimeHACK.Main/TimeHACK.Main.csproj | 1 + TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 189952 -> 189952 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 62976 -> 60928 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4838400 -> 6351872 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 6 +-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 267776 -> 265728 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4838400 -> 6351872 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 35191 -> 35191 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 14715 -> 13951 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 12800 -> 12800 bytes ...ne.Template.Taskbars.Win95TaskBarItem.resources | Bin 722 -> 722 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 32 +++++++++++ .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 6660 -> 6660 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 26715 -> 36781 bytes ...5.Win95Apps.WinClassicWindowsExplorer.resources | Bin 5894 -> 5894 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 149816 -> 149868 bytes .../obj/Release/TimeHACK.OS.Win98.Win98.resources | Bin 15851 -> 15903 bytes .../TimeHACK.Properties.Resources.resources | Bin 3341612 -> 4854305 bytes .../obj/Release/TimeHACK.TitleScreen.resources | Bin 1074962 -> 1074962 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4838400 -> 6351872 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 6 +-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 267776 -> 265728 bytes TimeHACK.main/Resources/WinClassicAbout95.png | Bin 0 -> 1360 bytes 45 files changed, 153 insertions(+), 87 deletions(-) create mode 100644 TimeHACK.main/Resources/WinClassicAbout95.png diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 2abdad5..07822d1 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index d64a2d8..0f29eb5 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 83015dd..836f9aa 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/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 2a875f4..f0935fb 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -ce9c5da841ac94441144344852958905f2496327 +70c156ff3024b3195d032c0fa9911ccdb28d2037 diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index e421fcc..534e944 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index db7dda3..999bbc4 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources index 690267a..bb123eb 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt index 6199732..6389a48 100644 --- a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt +++ b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt @@ -82,3 +82,15 @@ C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engi C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.dll +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\TimeHACK.Engine.pdb +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\bin\Release\Newtonsoft.Json.dll +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csprojResolveAssemblyReference.cache +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Properties.Resources.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Win9XBSOD.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.AboutBox95.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.Infobox95.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.Template.WinClassic.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.csproj.GenerateResource.Cache +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.dll +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Engine\obj\Release\TimeHACK.Engine.pdb diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index ae4ed12..32dc664 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index bde10d3..24fb04e 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index d64a2d8..0f29eb5 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 83015dd..836f9aa 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.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 8c37e83..69733c6 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -243,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(141, 292); + this.startmenuitems.Size = new System.Drawing.Size(145, 292); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -272,7 +272,7 @@ namespace TimeHACK.OS.Win95 this.ProgramsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem @@ -488,7 +488,7 @@ namespace TimeHACK.OS.Win95 this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); - this.NotePadToolStripMenuItem.Text = "NotePad"; + this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // // OnlineRegistrationToolStripMenuItem @@ -511,7 +511,7 @@ namespace TimeHACK.OS.Win95 this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); - this.PaintToolStripMenuItem.Text = "Paint"; + this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem // @@ -745,7 +745,7 @@ namespace TimeHACK.OS.Win95 this.DocumentsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // windowManagerTestToolStripMenuItem @@ -753,7 +753,7 @@ namespace TimeHACK.OS.Win95 this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage"))); this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); // @@ -762,7 +762,7 @@ namespace TimeHACK.OS.Win95 this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage"))); this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -771,7 +771,7 @@ namespace TimeHACK.OS.Win95 this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage"))); this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -788,7 +788,7 @@ namespace TimeHACK.OS.Win95 this.SettingsToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -834,7 +834,7 @@ namespace TimeHACK.OS.Win95 this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -883,7 +883,7 @@ namespace TimeHACK.OS.Win95 this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem @@ -896,7 +896,7 @@ namespace TimeHACK.OS.Win95 this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem @@ -908,7 +908,7 @@ namespace TimeHACK.OS.Win95 this.SuspendToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(134, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(138, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem @@ -920,8 +920,8 @@ namespace TimeHACK.OS.Win95 this.ShutdownToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Silver; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(134, 36); - this.ShutdownToolStripMenuItem.Text = "Shutdown..."; + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(138, 36); + this.ShutdownToolStripMenuItem.Text = "Shut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // // ossidestartmenu diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index fd14645..3cb2089 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -205,7 +205,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC @@ -222,7 +222,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF TkSuQmCC @@ -239,7 +239,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC @@ -248,7 +248,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + wAAADsABataJCQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA @@ -258,7 +258,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB @@ -277,7 +277,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== @@ -322,77 +322,77 @@ iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + wQAADsEBuJFr7QAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw 4AAABIQCQUtXaBsAAAAASUVORK5CYII= @@ -407,7 +407,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAUABAQFAAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAVABAQFQAQEBIAEAASABAAT/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/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index 2f0829f..aafe999 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -90,11 +90,11 @@ this.Label1 = new System.Windows.Forms.Label(); this.txtSave = new System.Windows.Forms.TextBox(); this.mainView = new System.Windows.Forms.ListView(); + this.iconsList = new System.Windows.Forms.ImageList(this.components); this.pnlHidden = new System.Windows.Forms.Panel(); this.LinkLabel1 = new System.Windows.Forms.LinkLabel(); this.Label3 = new System.Windows.Forms.Label(); this.Label2 = new System.Windows.Forms.Label(); - this.iconsList = new System.Windows.Forms.ImageList(this.components); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); @@ -118,7 +118,7 @@ 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(874, 517); + this.program.Size = new System.Drawing.Size(704, 517); this.program.TabIndex = 13; // // diskView @@ -130,6 +130,7 @@ this.diskView.TabIndex = 13; this.diskView.UseCompatibleStateImageBehavior = false; this.diskView.View = System.Windows.Forms.View.List; + this.diskView.Visible = false; this.diskView.DoubleClick += new System.EventHandler(this.diskView_DoubleClick); // // icons @@ -144,7 +145,7 @@ // this.btnGo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnGo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnGo.Location = new System.Drawing.Point(819, 20); + this.btnGo.Location = new System.Drawing.Point(646, 22); this.btnGo.Name = "btnGo"; this.btnGo.Size = new System.Drawing.Size(55, 28); this.btnGo.TabIndex = 12; @@ -164,7 +165,7 @@ this.HelpToolStripMenuItem}); this.MenuStrip1.Location = new System.Drawing.Point(0, 0); this.MenuStrip1.Name = "MenuStrip1"; - this.MenuStrip1.Size = new System.Drawing.Size(874, 24); + this.MenuStrip1.Size = new System.Drawing.Size(704, 24); this.MenuStrip1.TabIndex = 6; this.MenuStrip1.Text = "MenuStrip1"; // @@ -194,32 +195,32 @@ // FolderToolStripMenuItem // this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // // ShortcutToolStripMenuItem // this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem"; - this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.ShortcutToolStripMenuItem.Text = "Shortcut"; // // TextDocumentToolStripMenuItem // this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.TextDocumentToolStripMenuItem.Text = "Text Document"; // // BitmapImageToolStripMenuItem // this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem"; - this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.BitmapImageToolStripMenuItem.Text = "Bitmap Image"; // // DeleteToolStripMenuItem // this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"; - this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.DeleteToolStripMenuItem.Text = "Delete"; this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click); // @@ -238,7 +239,7 @@ // CloseToolStripMenuItem // this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem"; - this.CloseToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.CloseToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.CloseToolStripMenuItem.Text = "Close"; this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); // @@ -412,7 +413,7 @@ this.DisconnectNetworkDriveToolStripMenuItem, this.GoToToolStripMenuItem}); this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"; - this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20); this.ToolsToolStripMenuItem.Text = "Tools"; // // FindToolStripMenuItem @@ -488,11 +489,12 @@ this.AboutWindows95ToolStripMenuItem.Name = "AboutWindows95ToolStripMenuItem"; this.AboutWindows95ToolStripMenuItem.Size = new System.Drawing.Size(174, 22); this.AboutWindows95ToolStripMenuItem.Text = "About Windows 95"; + this.AboutWindows95ToolStripMenuItem.Click += new System.EventHandler(this.AboutWindows95ToolStripMenuItem_Click); // // toprightcorner // this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.toprightcorner.Location = new System.Drawing.Point(870, 0); + this.toprightcorner.Location = new System.Drawing.Point(700, 0); this.toprightcorner.Name = "toprightcorner"; this.toprightcorner.Size = new System.Drawing.Size(4, 4); this.toprightcorner.TabIndex = 6; @@ -513,7 +515,7 @@ "Online Services"}); this.dirLbl.Location = new System.Drawing.Point(11, 27); this.dirLbl.Name = "dirLbl"; - this.dirLbl.Size = new System.Drawing.Size(802, 21); + this.dirLbl.Size = new System.Drawing.Size(629, 21); this.dirLbl.TabIndex = 7; this.dirLbl.Text = "My Computer"; // @@ -521,7 +523,7 @@ // this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(870, 513); + this.bottomrightcorner.Location = new System.Drawing.Point(700, 513); this.bottomrightcorner.Name = "bottomrightcorner"; this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); this.bottomrightcorner.TabIndex = 4; @@ -556,7 +558,7 @@ // this.Button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.Button1.Location = new System.Drawing.Point(772, 3); + this.Button1.Location = new System.Drawing.Point(608, 1); this.Button1.Name = "Button1"; this.Button1.Size = new System.Drawing.Size(75, 23); this.Button1.TabIndex = 17; @@ -579,7 +581,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.txtSave.Location = new System.Drawing.Point(60, 3); this.txtSave.Name = "txtSave"; - this.txtSave.Size = new System.Drawing.Size(706, 20); + this.txtSave.Size = new System.Drawing.Size(542, 20); this.txtSave.TabIndex = 15; // // mainView @@ -588,9 +590,9 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.mainView.LargeImageList = this.iconsList; - this.mainView.Location = new System.Drawing.Point(222, 54); + this.mainView.Location = new System.Drawing.Point(11, 54); this.mainView.Name = "mainView"; - this.mainView.Size = new System.Drawing.Size(631, 417); + this.mainView.Size = new System.Drawing.Size(690, 417); this.mainView.SmallImageList = this.iconsList; this.mainView.StateImageList = this.iconsList; this.mainView.TabIndex = 10; @@ -598,6 +600,14 @@ this.mainView.View = System.Windows.Forms.View.List; this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); // + // iconsList + // + this.iconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconsList.ImageStream"))); + this.iconsList.TransparentColor = System.Drawing.Color.Transparent; + this.iconsList.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); + this.iconsList.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); + this.iconsList.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); + // // pnlHidden // this.pnlHidden.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -606,9 +616,9 @@ this.pnlHidden.Controls.Add(this.LinkLabel1); this.pnlHidden.Controls.Add(this.Label3); this.pnlHidden.Controls.Add(this.Label2); - this.pnlHidden.Location = new System.Drawing.Point(222, 54); + this.pnlHidden.Location = new System.Drawing.Point(9, 54); this.pnlHidden.Name = "pnlHidden"; - this.pnlHidden.Size = new System.Drawing.Size(631, 417); + this.pnlHidden.Size = new System.Drawing.Size(461, 417); this.pnlHidden.TabIndex = 14; this.pnlHidden.Visible = false; // @@ -643,21 +653,13 @@ this.Label2.TabIndex = 0; this.Label2.Text = "This directory is hidden"; // - // iconsList - // - this.iconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconsList.ImageStream"))); - this.iconsList.TransparentColor = System.Drawing.Color.Transparent; - this.iconsList.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); - this.iconsList.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); - this.iconsList.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); - // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.program); this.Name = "WinClassicWindowsExplorer"; - this.Size = new System.Drawing.Size(874, 517); + this.Size = new System.Drawing.Size(704, 517); this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load); this.program.ResumeLayout(false); this.program.PerformLayout(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 573c9d7..e8f97a0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -126,7 +126,7 @@ namespace TimeHACK.OS.Win95.Win95Apps dirLbl.Text = currentDirectory; CheckLbl(); } catch (Exception ex) { - wm.startInfobox95("Windows Explorer", "Error with the file explorer \n" + ex.Message, Properties.Resources.Win95Info); + wm.startInfobox95("Exploring - C:", "Error with the file explorer \n" + ex.Message, Properties.Resources.Win95Info); ((Form)this.TopLevelControl).Close(); } } @@ -586,5 +586,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { ((Form)this.TopLevelControl).Close(); } + + private void AboutWindows95ToolStripMenuItem_Click(object sender, EventArgs e) + { + WindowManager wm = new WindowManager(); + wm.startAboutBox95("Windows 95", "Microsoft Windows 95 Rev B", Properties.Resources.WinClassicAbout95); + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index 359ed6e..8e25a32 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -181,7 +181,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -211,15 +211,15 @@ AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAe0NFAHyMQANBwH3 AW0B8jAAAgcBMwQHAe0CbQESAW0B7QH3AewBFDAABwcB7wT3Ae8B9wHsARQCAAvsBQAB8AhtAfMUAA0H - Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B+AHyFQABBwsUAW0BkgEUAQAB7AH/ - AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AfgB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 - AQcB+wEHAfsBBwHsBgAB7wEHBv8B+AHyFQAB8AHxAQQHoQG1AfcB+AHvAQAB7AH/AfsBBwH7AQcB+wEH - AfsBBwH7AgABBwQAAe8BBwb/AfgB8hUAAfAB8QEEAvwBhgL4ARQB/AHPAfcB+AHvAQAB7An/AewBAAH8 - Af8BBwMAAe8BBwb/AfgB8hUAAfAB8QEEAfwB6gHsAv8B+AH8Ac8B9wH4Ae8BAAzsAv8EAAHvAQcG/wH4 - AfIVAAHwAfEBBAH8AQcB7gG1AQQBhQH8Ac8B9wH4Ae8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH - BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wH4Ae8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv - AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AfgB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER - AfMXAAHwAfEI9wEHAfcB+AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA + Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B7AHyFQABBwsUAW0BkgEUAQAB7AH/ + AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AewB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 + AQcB+wEHAfsBBwHsBgAB7wEHBv8B7AHyFQAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/AfsBBwH7AQcB+wEH + AfsBBwH7AgABBwQAAe8BBwb/AewB8hUAAfAB8QEEAvwBhgLsARQB/AHPAfcB7AHvAQAB7An/AewBAAH8 + Af8BBwMAAe8BBwb/AewB8hUAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHs + AfIVAAHwAfEBBAH8AQcBvAG1AQQBhQH8Ac8B9wHsAe8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH + BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv + AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER + AfMXAAHwAfEI9wEHAfcB7AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8CAAEBBP8EAAT/BAAB4AEBAv8EAAHA AQEBwAEPBAABwAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEAAYABAQHAAQ8CAAGAAQEBAAEJAcABDwIA AYABAQIAAcABDwIAAYABAQEAAQEBwAEPAgABgAEBAYABAQHAAQ8CAAGAAQEBgAEBAcABHwIAAYABAQGA diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 1d2df39..ae0d454 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -391,6 +391,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap WinClassicAbout95 { + get { + object obj = ResourceManager.GetObject("WinClassicAbout95", 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 fdf87b4..b6e5e0c 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -312,7 +312,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wgAADsIBFShKgAAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu QmCC @@ -321,7 +321,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC @@ -330,7 +330,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vQAADr0BR/uQrQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== @@ -360,4 +360,7 @@ ..\Resources\shell32_21.ico_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassicAbout95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 605d4f4..21d668f 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -360,6 +360,7 @@ + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index d64a2d8..0f29eb5 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 83015dd..836f9aa 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 e093b17..719b815 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= + /ByXpyYdGQDMp01tJAyiJ8Wln0OrSUYL0p2W9D66eHQ= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 5bda568..93f0e60 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 6d7fb48..3c43798 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= + JfX57G1DYZrHPqP5jYBRs2Upr8OkaFvFTwMyG4w6Zqo= @@ -75,7 +75,7 @@ - aCU7tXzb1lHJzz5blBXKbootl0x5lYwecxfgepykISk= + gvdlN+WmuCMXqX/DMLwcXUc+e6IieBiX44CmfcML0T8= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 499a9f3..d169592 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 5bda568..93f0e60 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 2264624..d32908c 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -1d261c7a8319a6670fa9eada902d1eabddc89373 +f0325e7dfa40b36eee4b8bf365cc5bbf8c79d7c5 diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index 40121c6..d85b2de 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 ad6ea92..ec63535 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 7155bfc..972219d 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.Engine.Template.Taskbars.Win95TaskBarItem.resources b/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources index 9c67c9e..35e4f4e 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources 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 b40c703..d5f4b54 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -93,3 +93,35 @@ C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHA C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.application C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.exe C:\Users\lempamo\Documents\GitHub\TimeHACK-fork\TimeHACK.Main\obj\Release\TimeHACK.pdb +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe.manifest +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.application +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.exe +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.pdb +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.dll +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\bin\Release\TimeHACK.Engine.pdb +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csprojResolveAssemblyReference.cache +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameDialog.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.LoadGameProfileItem.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.NewGameDialog.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Windows95.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewContact.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.TestApp.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WebChat1998.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.AddressBook.FRMWinClassicAddressBookNewFolder.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicAddressBook.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicDownloader.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicHWCV.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinClassicForms.WinClassicInstaller.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Win98.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe +C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 7c6da71..5c3de75 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 924a917..fc40630 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.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources index 8515583..ffc7d5b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.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 4a5e9af..fb12697 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.OS.Win98.Win98.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources index 9944ba5..fb773e2 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index cde6241..c0ab57c 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 43f5d49..4fda140 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 e093b17..719b815 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= + /ByXpyYdGQDMp01tJAyiJ8Wln0OrSUYL0p2W9D66eHQ= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 5bda568..93f0e60 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 6d7fb48..3c43798 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= + JfX57G1DYZrHPqP5jYBRs2Upr8OkaFvFTwMyG4w6Zqo= @@ -75,7 +75,7 @@ - aCU7tXzb1lHJzz5blBXKbootl0x5lYwecxfgepykISk= + gvdlN+WmuCMXqX/DMLwcXUc+e6IieBiX44CmfcML0T8= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 499a9f3..d169592 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ diff --git a/TimeHACK.main/Resources/WinClassicAbout95.png b/TimeHACK.main/Resources/WinClassicAbout95.png new file mode 100644 index 0000000..f6023b4 Binary files /dev/null and b/TimeHACK.main/Resources/WinClassicAbout95.png differ -- cgit v1.2.3 From acbf56b32a58c1b62350966fa59173816413943e Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Fri, 2 Jun 2017 17:46:26 +0100 Subject: Minor adjustments --- .vs/TimeHACK/v15/.suo | Bin 167424 -> 169472 bytes .../WinClassicWindowsExplorer.Designer.cs | 39 +++++++++++---------- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 5 +++ .../Win95/Win95Apps/WinClassicWindowsExplorer.resx | 22 ++++++------ TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 4838400 -> 4838400 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 2 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 267776 -> 267776 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 4838400 -> 4838400 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 6660 -> 6660 bytes ...5.Win95Apps.WinClassicWindowsExplorer.resources | Bin 5894 -> 5894 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 4838400 -> 4838400 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 2 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 267776 -> 267776 bytes 15 files changed, 40 insertions(+), 34 deletions(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 2abdad5..f120032 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index 2f0829f..abf81d2 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -90,11 +90,11 @@ this.Label1 = new System.Windows.Forms.Label(); this.txtSave = new System.Windows.Forms.TextBox(); this.mainView = new System.Windows.Forms.ListView(); + this.iconsList = new System.Windows.Forms.ImageList(this.components); this.pnlHidden = new System.Windows.Forms.Panel(); this.LinkLabel1 = new System.Windows.Forms.LinkLabel(); this.Label3 = new System.Windows.Forms.Label(); this.Label2 = new System.Windows.Forms.Label(); - this.iconsList = new System.Windows.Forms.ImageList(this.components); this.program.SuspendLayout(); this.MenuStrip1.SuspendLayout(); this.pnlSave.SuspendLayout(); @@ -118,7 +118,7 @@ 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(874, 517); + this.program.Size = new System.Drawing.Size(883, 517); this.program.TabIndex = 13; // // diskView @@ -144,7 +144,7 @@ // this.btnGo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnGo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnGo.Location = new System.Drawing.Point(819, 20); + this.btnGo.Location = new System.Drawing.Point(828, 20); this.btnGo.Name = "btnGo"; this.btnGo.Size = new System.Drawing.Size(55, 28); this.btnGo.TabIndex = 12; @@ -164,7 +164,7 @@ this.HelpToolStripMenuItem}); this.MenuStrip1.Location = new System.Drawing.Point(0, 0); this.MenuStrip1.Name = "MenuStrip1"; - this.MenuStrip1.Size = new System.Drawing.Size(874, 24); + this.MenuStrip1.Size = new System.Drawing.Size(883, 24); this.MenuStrip1.TabIndex = 6; this.MenuStrip1.Text = "MenuStrip1"; // @@ -219,7 +219,7 @@ // DeleteToolStripMenuItem // this.DeleteToolStripMenuItem.Name = "DeleteToolStripMenuItem"; - this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.DeleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.DeleteToolStripMenuItem.Text = "Delete"; this.DeleteToolStripMenuItem.Click += new System.EventHandler(this.DeleteToolStripMenuItem_Click); // @@ -238,7 +238,7 @@ // CloseToolStripMenuItem // this.CloseToolStripMenuItem.Name = "CloseToolStripMenuItem"; - this.CloseToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.CloseToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.CloseToolStripMenuItem.Text = "Close"; this.CloseToolStripMenuItem.Click += new System.EventHandler(this.CloseToolStripMenuItem_Click); // @@ -492,7 +492,7 @@ // toprightcorner // this.toprightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.toprightcorner.Location = new System.Drawing.Point(870, 0); + this.toprightcorner.Location = new System.Drawing.Point(879, 0); this.toprightcorner.Name = "toprightcorner"; this.toprightcorner.Size = new System.Drawing.Size(4, 4); this.toprightcorner.TabIndex = 6; @@ -521,7 +521,7 @@ // this.bottomrightcorner.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.bottomrightcorner.Cursor = System.Windows.Forms.Cursors.SizeNWSE; - this.bottomrightcorner.Location = new System.Drawing.Point(870, 513); + this.bottomrightcorner.Location = new System.Drawing.Point(879, 513); this.bottomrightcorner.Name = "bottomrightcorner"; this.bottomrightcorner.Size = new System.Drawing.Size(4, 4); this.bottomrightcorner.TabIndex = 4; @@ -581,6 +581,7 @@ this.txtSave.Name = "txtSave"; this.txtSave.Size = new System.Drawing.Size(706, 20); this.txtSave.TabIndex = 15; + this.txtSave.TextChanged += new System.EventHandler(this.txtSave_TextChanged); // // mainView // @@ -590,7 +591,7 @@ this.mainView.LargeImageList = this.iconsList; this.mainView.Location = new System.Drawing.Point(222, 54); this.mainView.Name = "mainView"; - this.mainView.Size = new System.Drawing.Size(631, 417); + this.mainView.Size = new System.Drawing.Size(640, 417); this.mainView.SmallImageList = this.iconsList; this.mainView.StateImageList = this.iconsList; this.mainView.TabIndex = 10; @@ -598,6 +599,14 @@ this.mainView.View = System.Windows.Forms.View.List; this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); // + // iconsList + // + this.iconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconsList.ImageStream"))); + this.iconsList.TransparentColor = System.Drawing.Color.Transparent; + this.iconsList.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); + this.iconsList.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); + this.iconsList.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); + // // pnlHidden // this.pnlHidden.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -608,7 +617,7 @@ this.pnlHidden.Controls.Add(this.Label2); this.pnlHidden.Location = new System.Drawing.Point(222, 54); this.pnlHidden.Name = "pnlHidden"; - this.pnlHidden.Size = new System.Drawing.Size(631, 417); + this.pnlHidden.Size = new System.Drawing.Size(640, 417); this.pnlHidden.TabIndex = 14; this.pnlHidden.Visible = false; // @@ -643,21 +652,13 @@ this.Label2.TabIndex = 0; this.Label2.Text = "This directory is hidden"; // - // iconsList - // - this.iconsList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("iconsList.ImageStream"))); - this.iconsList.TransparentColor = System.Drawing.Color.Transparent; - this.iconsList.Images.SetKeyName(0, "nwnp32_1_SERVER_ICON.png"); - this.iconsList.Images.SetKeyName(1, "shell32_21.ico_16x16.png"); - this.iconsList.Images.SetKeyName(2, "blank-file-Windows95Icon.gif"); - // // WinClassicWindowsExplorer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.Controls.Add(this.program); this.Name = "WinClassicWindowsExplorer"; - this.Size = new System.Drawing.Size(874, 517); + this.Size = new System.Drawing.Size(883, 517); this.Load += new System.EventHandler(this.WinClassicWindowsExplorer_Load); this.program.ResumeLayout(false); this.program.PerformLayout(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 573c9d7..8fba587 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -586,5 +586,10 @@ namespace TimeHACK.OS.Win95.Win95Apps { ((Form)this.TopLevelControl).Close(); } + + private void txtSave_TextChanged(object sender, EventArgs e) + { + + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index 359ed6e..8e25a32 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -181,7 +181,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAAQgBAAEIAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -211,15 +211,15 @@ AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAAe0NFAHyMQANBwH3 AW0B8jAAAgcBMwQHAe0CbQESAW0B7QH3AewBFDAABwcB7wT3Ae8B9wHsARQCAAvsBQAB8AhtAfMUAA0H - Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B+AHyFQABBwsUAW0BkgEUAQAB7AH/ - AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AfgB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 - AQcB+wEHAfsBBwHsBgAB7wEHBv8B+AHyFQAB8AHxAQQHoQG1AfcB+AHvAQAB7AH/AfsBBwH7AQcB+wEH - AfsBBwH7AgABBwQAAe8BBwb/AfgB8hUAAfAB8QEEAvwBhgL4ARQB/AHPAfcB+AHvAQAB7An/AewBAAH8 - Af8BBwMAAe8BBwb/AfgB8hUAAfAB8QEEAfwB6gHsAv8B+AH8Ac8B9wH4Ae8BAAzsAv8EAAHvAQcG/wH4 - AfIVAAHwAfEBBAH8AQcB7gG1AQQBhQH8Ac8B9wH4Ae8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH - BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wH4Ae8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv - AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AfgB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER - AfMXAAHwAfEI9wEHAfcB+AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA + Ae8B7AEUAgAB7AH/AQcB+wEHAfsBBwH7AQcB+wHsBQAB7wEHBv8B7AHyFQABBwsUAW0BkgEUAQAB7AH/ + AQcB+wEHAfsBBwH7AQcB+wEHAQAB7AQAAe8BBwb/AewB8hUAAfAK8QH3AW0BkgHzAQAB7AH/AfsBBwH7 + AQcB+wEHAfsBBwHsBgAB7wEHBv8B7AHyFQAB8AHxAQQHoQG1AfcB7AHvAQAB7AH/AfsBBwH7AQcB+wEH + AfsBBwH7AgABBwQAAe8BBwb/AewB8hUAAfAB8QEEAvwBhgLsARQB/AHPAfcB7AHvAQAB7An/AewBAAH8 + Af8BBwMAAe8BBwb/AewB8hUAAfAB8QEEAfwB6gHsAv8B7AH8Ac8B9wHsAe8BAAzsAv8EAAHvAQcG/wHs + AfIVAAHwAfEBBAH8AQcBvAG1AQQBhQH8Ac8B9wHsAe8CAAHsAf8B+wEHAewC/wH8Af8B/AL/BQAB7wEH + BP8CEQEOAfIVAAHwAfEBBAHNAwQBoQL8Ac8B9wHsAe8CAAHsAf8BBwH7AQcB7AL/AfwC/wEAAewEAAHv + AQcE/wHsAfcB8BYAAfAB8QEKBwQBzwH3AewB7wIAAewB/wH7AQcB+wEHAewD/wEAAuwEAAHvARUEEwER + AfMXAAHwAfEI9wEHAfcB7AHvAwAB7AT/AuwB/ycAAf8BvAnxAbwB7AHvBAAE7CsAAf8BBwn3AZIB8jEA AUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcAA/8CAAEBBP8EAAT/BAAB4AEBAv8EAAHA AQEBwAEPBAABwAEBAcABDwIAAYABAAGAAQEBwAEPAgABgAEAAYABAQHAAQ8CAAGAAQEBAAEJAcABDwIA AYABAQIAAcABDwIAAYABAQEAAQEBwAEPAgABgAEBAYABAQHAAQ8CAAGAAQEBgAEBAcABHwIAAYABAQGA diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index e093b17..8ee2ca1 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= + wprAFcVrrP/1/J0uhlBqq9mi2p60RD4ul28QruV13dE= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 5bda568..9c097ee 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 6d7fb48..87c002d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= + ox3NlFYbnLLzgmkMHWrW7zaT40LkQrYkinavCIeNznA= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 499a9f3..c6e6fb8 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 5bda568..9c097ee 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.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 7c6da71..74336bf 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.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources index 8515583..ffc7d5b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e093b17..8ee2ca1 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - 03fTpnouFl4A5h5ZAKMk4oQhz1CMYj1Oi6EPMCsJN+0= + wprAFcVrrP/1/J0uhlBqq9mi2p60RD4ul28QruV13dE= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 5bda568..9c097ee 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 6d7fb48..87c002d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - A+LaAAXq2NMwITfU85ZH80ymnwcn7qJ8gS7p96/CyQE= + ox3NlFYbnLLzgmkMHWrW7zaT40LkQrYkinavCIeNznA= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 499a9f3..c6e6fb8 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 316b7739bd1f2e19ba67d7fd6302b8ec0c8fa75a Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 10 Jun 2017 12:22:50 +0100 Subject: Done ALOT of tweaks and Save troubleshooter There is now a save troubleshooter that checks your save files if they can't load! Also, it checks what OS to load on startup of the game! --- .vs/TimeHACK/v15/.suo | Bin 119296 -> 137216 bytes TimeHACK.Engine/SaveSystem.cs | 48 ++- TimeHACK.Engine/Template/WinClassic.cs | 40 ++ TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 189952 -> 190464 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 23531 -> 23531 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 189952 -> 190464 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 1 + TimeHACK.Main/OS/Win98/Win98.Designer.cs | 17 +- TimeHACK.Main/OS/Win98/Win98.cs | 4 +- TimeHACK.Main/OS/Win98/Win98.resx | 3 - .../SaveDialogs/SaveFileTroubleShooter.Designer.cs | 147 +++++++ .../SaveDialogs/SaveFileTroubleShooter.cs | 119 +++++ .../SaveDialogs/SaveFileTroubleShooter.resx | 120 ++++++ TimeHACK.Main/TimeHACK.Main.csproj | 9 + TimeHACK.Main/TitleScreen.cs | 71 ++- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 189952 -> 190464 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 60928 -> 62976 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 21 + TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 0 -> 6356480 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 478 +++++++++++++++++++++ TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 0 -> 273920 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 0 -> 6356480 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- ...ne.Template.Taskbars.Win95TaskBarItem.resources | Bin 722 -> 722 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 3 +- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 0 -> 6798 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 36771 -> 36781 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 149868 -> 149868 bytes .../obj/Release/TimeHACK.OS.Win98.Win98.resources | Bin 15903 -> 0 bytes .../Release/TimeHACK.OS.Win98.Windows98.resources | Bin 0 -> 15851 bytes ...CK.SaveDialogs.SaveFileTroubleShooter.resources | Bin 0 -> 180 bytes .../obj/Release/TimeHACK.TitleScreen.resources | Bin 1074962 -> 1074962 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 21 + TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 0 -> 6356480 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 478 +++++++++++++++++++++ TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 0 -> 273920 bytes 39 files changed, 1524 insertions(+), 58 deletions(-) create mode 100644 TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.Designer.cs create mode 100644 TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs create mode 100644 TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.resx create mode 100644 TimeHACK.Main/bin/Release/TimeHACK.application create mode 100644 TimeHACK.Main/bin/Release/TimeHACK.exe create mode 100644 TimeHACK.Main/bin/Release/TimeHACK.exe.manifest create mode 100644 TimeHACK.Main/bin/Release/TimeHACK.pdb create mode 100644 TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache delete mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.application create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.exe create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.exe.manifest create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.pdb diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index ade6e75..491df86 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 82a0e5e..56a71a4 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -10,7 +10,7 @@ namespace TimeHACK.Engine { public static class SaveSystem { - public static Save CurrentSave { get; private set; } + public static Save CurrentSave { get; set; } public static FileSystemFolderInfo filesystemflinfo { get; set; } public static Boolean DevMode = false; @@ -69,7 +69,13 @@ namespace TimeHACK.Engine { get { - return Path.Combine(ProfileSettingsDirectory, "Doc"); + if (CurrentSave.CurrentOS == "95") + { + return Path.Combine(ProfileMyComputerDirectory, "Doc"); + } else { + return Path.Combine(ProfileSettingsDirectory, "Doc"); + } + } } @@ -112,13 +118,14 @@ namespace TimeHACK.Engine public static void NewGame() { - //TODO: User must set a username....somehow - CheckFiles(); + //TODO: User must set a username....somehow var save = new Save(); save.ExperiencedStories = new List(); - save.InstalledPrograms = new Dictionary(); + save.CurrentOS = "95"; CurrentSave = save; + + CheckFiles(); SaveGame(); } @@ -134,24 +141,21 @@ namespace TimeHACK.Engine Directory.CreateDirectory(ProfileDirectory); if (!Directory.Exists(ProfileFileSystemDirectory)) - { Directory.CreateDirectory(ProfileFileSystemDirectory); - SaveDirectoryInfo(ProfileFileSystemDirectory, false, "My Computer", false); - Directory.CreateDirectory(ProfileMyComputerDirectory); - SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95", true); - Directory.CreateDirectory(ProfileDocumentsDirectory); - SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true); - Directory.CreateDirectory(ProfileSettingsDirectory); - SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true); - Directory.CreateDirectory(ProfileProgramsDirectory); - SaveDirectoryInfo(ProfileProgramsDirectory, true, "Program Files", true); - Directory.CreateDirectory(ProfileWindowsDirectory); - SaveDirectoryInfo(ProfileWindowsDirectory, true, "Windows", true); - } + + SaveDirectoryInfo(ProfileFileSystemDirectory, false, "My Computer", false); + SaveDirectoryInfo(ProfileMyComputerDirectory, false, "Win95", true); + SaveDirectoryInfo(ProfileDocumentsDirectory, false, "My Documents", true); + SaveDirectoryInfo(ProfileSettingsDirectory, false, "Documents and Settings", true); + SaveDirectoryInfo(ProfileProgramsDirectory, true, "Program Files", true); + SaveDirectoryInfo(ProfileWindowsDirectory, true, "Windows", true); } - public static void SaveDirectoryInfo(String Directory, Boolean isProtected, String label, Boolean allowback) + public static void SaveDirectoryInfo(String directory, Boolean isProtected, String label, Boolean allowback) { + if (!Directory.Exists(directory)) + Directory.CreateDirectory(directory); + FileSystemFolderInfo info = new FileSystemFolderInfo(); info.Isprotected = isProtected; @@ -160,7 +164,7 @@ namespace TimeHACK.Engine string toWrite = JsonConvert.SerializeObject(info, Formatting.Indented); - File.WriteAllText(Path.Combine(Directory, "_data.info"), toWrite); + File.WriteAllText(Path.Combine(directory, "_data.info"), toWrite); } @@ -184,7 +188,9 @@ namespace TimeHACK.Engine public class Save { public string Username { get; set; } - public Dictionary InstalledPrograms { get; set; } + + public string CurrentOS { get; set; } + // public Dictionary InstalledPrograms { get; set; } InstallProgram is no longer needed... we have that data in the FileSystem public List ExperiencedStories { get; set; } } diff --git a/TimeHACK.Engine/Template/WinClassic.cs b/TimeHACK.Engine/Template/WinClassic.cs index 615d0f4..f5737aa 100644 --- a/TimeHACK.Engine/Template/WinClassic.cs +++ b/TimeHACK.Engine/Template/WinClassic.cs @@ -1,4 +1,5 @@ using System; +using System.Drawing; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -74,5 +75,44 @@ namespace TimeHACK.Engine.Template } } + + // The rest of this code will automatically style the buttons on the form! + + protected override void OnControlAdded(ControlEventArgs e) + { + base.OnControlAdded(e); + + if (e.Control.GetType() == typeof(Button)) + { + e.Control.MouseEnter += button_MouseEnter; + e.Control.MouseLeave += button_MouseLeave; + + ((Button)e.Control).FlatStyle = FlatStyle.Popup; + } + } + + protected override void OnControlRemoved(ControlEventArgs e) + { + base.OnControlRemoved(e); + + if (e.Control.GetType() == typeof(Button)) + { + e.Control.MouseEnter -= button_MouseEnter; + e.Control.MouseLeave -= button_MouseLeave; + } + } + + private void button_MouseEnter(object sender, EventArgs e) + { + var c = (Button)sender; + c.UseVisualStyleBackColor = false; + c.BackColor = Color.GhostWhite; + } + + private void button_MouseLeave(object sender, EventArgs e) + { + var c = (Button)sender; + c.UseVisualStyleBackColor = true; + } } } diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 0f29eb5..843ed25 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 836f9aa..d856f49 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 32dc664..888b842 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index 24fb04e..a197860 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 0f29eb5..843ed25 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 836f9aa..d856f49 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/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 578a114..44002fd 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -429,6 +429,7 @@ namespace TimeHACK.OS.Win95.Win95Apps // IsFileDialog = False //End Sub void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { + //icons.Images.Add(Properties.Resources.WinClassicFolder); //icons.Images.Add(Properties.Resources.WinClassicComputer); program.BringToFront(); diff --git a/TimeHACK.Main/OS/Win98/Win98.Designer.cs b/TimeHACK.Main/OS/Win98/Win98.Designer.cs index 484c931..255a97a 100644 --- a/TimeHACK.Main/OS/Win98/Win98.Designer.cs +++ b/TimeHACK.Main/OS/Win98/Win98.Designer.cs @@ -1,6 +1,6 @@ namespace TimeHACK.OS.Win98 { - partial class Win98 + partial class Windows98 { /// /// Required designer variable. @@ -28,7 +28,7 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Win98)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Windows98)); System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("My Computer", 0); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("Network Neighborhood", 5); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem("Inbox", 3); @@ -116,9 +116,9 @@ // this.taskbar.BackColor = System.Drawing.Color.Silver; this.taskbar.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("taskbar.BackgroundImage"))); + this.taskbar.Controls.Add(this.startbutton); this.taskbar.Controls.Add(this.clockPanel); this.taskbar.Controls.Add(this.taskbarItems); - this.taskbar.Controls.Add(this.startbutton); this.taskbar.Dock = System.Windows.Forms.DockStyle.Bottom; this.taskbar.Location = new System.Drawing.Point(0, 452); this.taskbar.Name = "taskbar"; @@ -148,11 +148,14 @@ // // taskbarItems // + this.taskbarItems.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.taskbarItems.BackColor = System.Drawing.Color.Transparent; this.taskbarItems.Cursor = System.Windows.Forms.Cursors.Default; - this.taskbarItems.Location = new System.Drawing.Point(63, 4); + this.taskbarItems.Location = new System.Drawing.Point(69, 4); this.taskbarItems.Name = "taskbarItems"; - this.taskbarItems.Size = new System.Drawing.Size(3648, 22); + this.taskbarItems.Size = new System.Drawing.Size(500, 22); this.taskbarItems.TabIndex = 5; // // startbutton @@ -909,7 +912,7 @@ this.desktopicons.TabIndex = 7; this.desktopicons.UseCompatibleStateImageBehavior = false; // - // Win98 + // Windows98 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -919,7 +922,7 @@ this.Controls.Add(this.startmenu); this.Controls.Add(this.desktopicons); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Name = "Win98"; + this.Name = "Windows98"; this.Text = "Win98"; this.taskbar.ResumeLayout(false); this.clockPanel.ResumeLayout(false); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index b3b5f99..f4f78de 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -10,9 +10,9 @@ using System.Windows.Forms; namespace TimeHACK.OS.Win98 { - public partial class Win98 : Form + public partial class Windows98 : Form { - public Win98() + public Windows98() { InitializeComponent(); } diff --git a/TimeHACK.Main/OS/Win98/Win98.resx b/TimeHACK.Main/OS/Win98/Win98.resx index 10f3284..ae0c3b7 100644 --- a/TimeHACK.Main/OS/Win98/Win98.resx +++ b/TimeHACK.Main/OS/Win98/Win98.resx @@ -138,9 +138,6 @@ 17, 17 - - 17, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.Designer.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.Designer.cs new file mode 100644 index 0000000..a242366 --- /dev/null +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.Designer.cs @@ -0,0 +1,147 @@ +namespace TimeHACK.SaveDialogs +{ + partial class SaveFileTroubleShooter + { + /// + /// 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 Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.pnlResolved = new System.Windows.Forms.Panel(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btnClose = new System.Windows.Forms.Button(); + this.pnlResolved.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(12, 9); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(393, 20); + this.label1.TabIndex = 0; + this.label1.Text = "Please wait while we check the state of your Save file..."; + // + // pnlResolved + // + this.pnlResolved.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.pnlResolved.Controls.Add(this.textBox1); + this.pnlResolved.Controls.Add(this.label3); + this.pnlResolved.Controls.Add(this.label2); + this.pnlResolved.Location = new System.Drawing.Point(12, 38); + this.pnlResolved.Name = "pnlResolved"; + this.pnlResolved.Size = new System.Drawing.Size(589, 146); + this.pnlResolved.TabIndex = 1; + this.pnlResolved.Visible = false; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(8, 11); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(210, 20); + this.label2.TabIndex = 0; + this.label2.Text = "The issue has been resolved"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(9, 31); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(24, 13); + this.label3.TabIndex = 2; + this.label3.Text = "log:"; + // + // textBox1 + // + this.textBox1.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.textBox1.Location = new System.Drawing.Point(10, 55); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(567, 79); + this.textBox1.TabIndex = 3; + // + // panel2 + // + this.panel2.BackColor = System.Drawing.SystemColors.ControlDark; + this.panel2.Controls.Add(this.btnClose); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(0, 217); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(612, 30); + this.panel2.TabIndex = 2; + // + // btnClose + // + this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnClose.Location = new System.Drawing.Point(526, 4); + this.btnClose.Name = "btnClose"; + this.btnClose.Size = new System.Drawing.Size(75, 23); + this.btnClose.TabIndex = 0; + this.btnClose.Text = "Close"; + this.btnClose.UseVisualStyleBackColor = true; + this.btnClose.Click += new System.EventHandler(this.btnClose_Click); + // + // SaveFileTroubleShooter + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(612, 247); + this.Controls.Add(this.panel2); + this.Controls.Add(this.pnlResolved); + this.Controls.Add(this.label1); + this.Name = "SaveFileTroubleShooter"; + this.Text = "Save File Troubleshooter"; + this.Load += new System.EventHandler(this.SaveFileTroubleShooter_Load); + this.pnlResolved.ResumeLayout(false); + this.pnlResolved.PerformLayout(); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Panel pnlResolved; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btnClose; + } +} \ No newline at end of file diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs new file mode 100644 index 0000000..eb79543 --- /dev/null +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TimeHACK.Engine; +using System.IO; + +namespace TimeHACK.SaveDialogs +{ + public partial class SaveFileTroubleShooter : Form + { + public String log; + Save savedata = new Save(); + String json; + public SaveFileTroubleShooter() + { + InitializeComponent(); + } + + private void btnClose_Click(object sender, EventArgs e) + { + this.Close(); + } + + private void SaveFileTroubleShooter_Load(object sender, EventArgs e) + { + BeginScan(); + } + + void WriteToLog(String toWrite) + { + log += toWrite + Environment.NewLine; + } + + void BeginScan() + { + WriteToLog("Started scanning profile: " + SaveSystem.ProfileName); + + // Check if the main.save file exists + + if (!File.Exists(Path.Combine(SaveSystem.ProfileDirectory, "main.save"))) + { + WriteToLog("ISSUE FOUND! File main.save doesn't exist"); + + WriteToLog("Creating one..."); + + SaveSystem.NewGame(); + + WriteToLog("Created one!"); + + EndScan(true); + return; + } else { + WriteToLog("File main.save does exist - checking contents"); + + // Read the main.save file + json = File.ReadAllText(Path.Combine(SaveSystem.ProfileDirectory, "main.save")); + + savedata = Newtonsoft.Json.JsonConvert.DeserializeObject(json); + + // Check the values + + if (savedata.CurrentOS == null || savedata.CurrentOS == "") + { + WriteToLog("ISSUE FOUND! Data for CurrentOS is null! Giving default value..."); + savedata.CurrentOS = "95"; + EndScan(true); + } + + if (savedata.ExperiencedStories == null) + { + WriteToLog("ISSUE FOUND! Data for ExperiencedStories is null! Giving default value..."); + savedata.ExperiencedStories = new List(); + } + + if (savedata.ExperiencedStories == null) + { + WriteToLog("ISSUE FOUND! Data for ExperiencedStories is null! Giving default value..."); + savedata.ExperiencedStories = new List(); + } + } + + if (!Directory.Exists(Path.Combine(SaveSystem.ProfileDirectory, "folders"))) + { + WriteToLog("ISSUE FOUND! Directory 'folders' doesn't exist! Creating one..."); + Directory.CreateDirectory(Path.Combine(SaveSystem.ProfileDirectory, "folders")); + SaveSystem.CheckFiles(); + } + + + } + + void EndScan(Boolean successful) + { + pnlResolved.Visible = true; + if (successful == true) + { + label2.Text = "The issue has been resolved."; + // Set CurrentSave to the resolved one + + SaveSystem.CurrentSave = savedata; + + // Set the main.save file to the resolved one + + File.WriteAllText(Path.Combine(SaveSystem.ProfileDirectory, "main.save"), Newtonsoft.Json.JsonConvert.SerializeObject(savedata)); + + textBox1.Text = log; + } else { + label2.Text = "The issue has not been resolved, sorry"; + textBox1.Text = log; + } + } + } +} diff --git a/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.resx b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/SaveDialogs/SaveFileTroubleShooter.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 21d668f..6b78699 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -243,6 +243,12 @@ True Resources.resx + + Form + + + SaveFileTroubleShooter.cs + Form @@ -311,6 +317,9 @@ Designer Resources.Designer.cs + + SaveFileTroubleShooter.cs + TitleScreen.cs diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index ea512e4..d73269f 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -4,8 +4,10 @@ using System.Drawing; using System.IO; using System.Windows.Forms; using TimeHACK.OS.Win95; +using TimeHACK.OS.Win98; using TimeHACK.Engine; using static TimeHACK.Engine.SaveSystem; +using TimeHACK.SaveDialogs; namespace TimeHACK { @@ -13,6 +15,7 @@ namespace TimeHACK { public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; + public static Windows98 frm98; public static string username; public static string progress = "95"; @@ -29,29 +32,51 @@ namespace TimeHACK { leet(); } - else - // If VM Mode is not enabled - if (vm_mode.Checked != true) - { - // Generate fullscreen desktop - frm95 = new Windows95(); - frm95.TopMost = true; - frm95.FormBorderStyle = FormBorderStyle.None; - frm95.WindowState = FormWindowState.Maximized; - frm95.Show(); - Hide(); - } - // If VM Mode is enabled - else - { - // Generate desktop with size entered by user - frm95 = new Windows95(); - frm95.FormBorderStyle = FormBorderStyle.None; - frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); - frm95.FormBorderStyle = FormBorderStyle.Fixed3D; - frm95.Show(); - Hide(); - } + else { + // Time to decide which OS to start up! + MessageBox.Show(CurrentSave.CurrentOS); + + switch (CurrentSave.CurrentOS) + { + case "95": + frm95 = new Windows95(); + frm95.TopMost = true; + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.WindowState = FormWindowState.Maximized; + //if (vm_mode.Checked == true) + //{ + // frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + // frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + //} + frm95.Show(); + Hide(); + + break; + case "98": + frm98 = new Windows98(); + frm98.TopMost = true; + frm98.FormBorderStyle = FormBorderStyle.None; + frm98.WindowState = FormWindowState.Maximized; + if (vm_mode.Checked == true) + { + frm98.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm98.FormBorderStyle = FormBorderStyle.Fixed3D; + } + frm98.Show(); + Hide(); + + break; + default: + MessageBox.Show("WARNING! It looks like this save is corrupt!"); + MessageBox.Show("We will now open the Save troubleshooter"); + + SaveFileTroubleShooter troubleshooter = new SaveFileTroubleShooter(); + + troubleshooter.ShowDialog(); + break; + } + + } } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 0f29eb5..843ed25 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 836f9aa..d856f49 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 new file mode 100644 index 0000000..e3c83f9 --- /dev/null +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + HQXMPfmrHd5GpwrSTljeapHcCrGpgq+tIA1XDC7Pu6w= + + + + \ No newline at end of file diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe new file mode 100644 index 0000000..fc9bd62 Binary files /dev/null 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 new file mode 100644 index 0000000..6255fac --- /dev/null +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -0,0 +1,478 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HCRfTIXCraEwvFmULJC3AcJMBu2+PrJYOO2N5PhSU1w= + + + + + + + + + + + + v0BE/qFWSZ0zeYD5hTCBto9Xqr5DEGUeahvBP1QyKl4= + + + + + + + + + + + + 7rJ8bZN2PaILQbCwBk7jrnQqTap9EQaHa/8nQTPwVgg= + + + + + + + + + + lqdCpqWSG703aUKUZuVLCGvz3fv9DSk/gweD2eGYZrQ= + + + + + + + + + nzG7pg3H+3uPdr/lzLxyroAH8XD1zvIYW4peV9fAD6M= + + + + + + + + + MsBfDGQbMHg7EHMcNY/8mrPtzIR7Si+xtJAcxLHz+wo= + + + + + + + + + M69a0Q8VAYpaeWem7o8i+9iv5cJdzgRLyWD48mOZQiM= + + + + + + + + + 5dxj6DQUI8H4fwy1EkXVnQnRwj/wJVEVSlzyjSYfUgI= + + + + + + + + + GI6mR05IfCFwEQvctIONdEaTnhHSnhbc3fLErCxmNJE= + + + + + + + + + k2m2tLIfVCyO67LZX2zSmbVyhl5XLttVgRG6E8/VuF0= + + + + + + + + + sBCYzVLt3A/I7Gku5XJ8ZLN2L/aR2YJ1WHrzbf+PySI= + + + + + + + + + ZzTzMYl3DLVEP1oagOyinEAULYpX610Iuk3sJnkA+yY= + + + + + + + + + LAoVjRnvN8/QnPLwFKlndMujFUfVmwuMdYg2vM+TWZI= + + + + + + + + + V0sbr2Q/ES6ckgBpW09YU5PFleJYeN3dWWNN5Bmte6o= + + + + + + + + + 2K2sK/Ba7mlOKw7sF8mza5p8tbxaAewzEqGSBUgZ1mY= + + + + + + + + + qmcKcG32LH7iikhI78zkcFVU8d2OB29WrHjaMNxQ31c= + + + + + + + + + Uj6S88dTZgAwhpS2lddEO1VF5yuGwj31xXwN2s4vPhY= + + + + + + + + + 9h0M8CsC6iXP7E+R3EmdfocnzxgjfrC53xwwS5GM3CQ= + + + + + + + + + w0UragVhbcpGR96DEyDG3918bEsoNR0lYqukJOOY6EM= + + + + + + + + + zrsVsDepWdceKYuysygzl34scDD+yFK0W6RY7elAjKc= + + + + + + + + + DwYeH+xQs13qziRfLclvR4xdlexQmcNybOPlAfAktNw= + + + + + + + + + a4iY6QVNpzMbNlIfIPmdmKdt6nRnAQGMDjOPWrM1oA8= + + + + + + + + + GyCFWEz6VhwTq8fb3O8SuIT0U2WVgelHbDp5L8lW7KA= + + + + + + + + + Z+wcS9Drzc+B2ytpUhd3VCyzHQlvomsyycp/Xiau5Vg= + + + + + + + + + AP1JKyEdfo5h1ffRNHo2ZLE9DVXPGViMIN5NeDTfJ5E= + + + + + + + + + wdycAfKPNJg2GO6pIc0JKDnDhE1zrtpamp5CVVKPOhw= + + + + + + + + + 7qdgZRiaGUdkQELrWMmy0X2MexD+1MiZHIJbd5Uml2E= + + + + + + + + + YQWpE0bdQOdQx4JECZ5oRvN5c6pb+uMgeovoDdT/sW8= + + + + + + + + + +zAe0vYsdCQdvT5DQ3XujGzfmMm5Mx5kvMQWGy32vq4= + + + + + + + + + VQvjXXCgsNEyzV6RvhuYZ5Reu41t0D7HH87dZYk7KcI= + + + + + + + + + rukmHuBnlGNy4RGEvN4wWt8Fz+EV9Z2izAvd+61FUR4= + + + + + + + + + pF6dDVQ6eNpFbiWSIN/nBMdJ/Oev6to/C/bBaGbEfoo= + + + + + + + + + slW3YsxMrkkV9T4PE0LgBfh9DIWGvIxcA1Tk4HQlPYw= + + + + + + + + + +Oqix05d9bmuGzXELIoh/sDI44JgBwy7xci7X79Q2KA= + + + + + + + + + qClKL3sLGduhUUkgph3TLlUcOJ9Rap+lqX32zp8f31A= + + + + + + + + + AzvxwpGvMrksiXkc3mKW5uuzp7TsxUxS7fhCKr9tmWE= + + + + + + + + + /J+u19nP9/3Umk2QZ4141A2KL/z1/EzabYWTsBAvdwQ= + + + + + + + + + v5spqrMy5B5E+JCBZbgg0zI5maO16zQPzVadt19KO5U= + + + + + + + + + hfdhKI5M05j5cHUOVxVwftsZVBbycC/w4+J5mknwmr0= + + + + + + + + + SR16+bLKwtB7indZu424Gg7EZatjjh3QQO1xMK78ItM= + + + + + + + + + e5Sz92eH3B1+fs6E/GQP+h4q2LmpTgNT43EkgevfryI= + + + + + + + + + bzXwypoYaLnjOMNStpcJjXIGFT2/HXJ8Awftsf+d6ZM= + + + + + + + + + xR7A8s/y3cRUwZTEB5N3A8KIF0mB8k5y4azjaVpgz3U= + + + + + + + + + zbhDuGL3PMWT/neUqIW70NotSiGrpCOiZlDRjp9jsfw= + + + + + + + + + +fshereDl8F60Ef1K3Q1uudUcIBJeWlPAmosAdKe/eY= + + + + + + + + + W0yCwc3lJJFqQfgeTtazQbdAjUboLWojci1PiqJjIBM= + + + + + + + + + x6TTsUiEHqlRiSdsR7WH5jiWTj1u/cJsO7BItxU4X9Q= + + + \ No newline at end of file diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb new file mode 100644 index 0000000..5afc08d Binary files /dev/null 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 new file mode 100644 index 0000000..fc9bd62 Binary files /dev/null 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 2264624..b553a6e 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -1d261c7a8319a6670fa9eada902d1eabddc89373 +8db664c2a85504fd808659509bebd1f75d52ef6c diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources b/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources index 35e4f4e..9c67c9e 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources 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 d5f4b54..015f6d4 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -13,7 +13,6 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.W I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.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.OS.Win98.Win98.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.Properties.Resources.resources @@ -125,3 +124,5 @@ C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe.manifest C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.application C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources +I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache new file mode 100644 index 0000000..a374a92 Binary files /dev/null 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 acb00d5..b6c9aed 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.Windows95.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Windows95.resources index fb12697..073b485 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.OS.Win98.Win98.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources deleted file mode 100644 index fb773e2..0000000 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Win98.resources and /dev/null differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources new file mode 100644 index 0000000..9944ba5 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win98.Windows98.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources b/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.SaveDialogs.SaveFileTroubleShooter.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 new file mode 100644 index 0000000..e3c83f9 --- /dev/null +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + HQXMPfmrHd5GpwrSTljeapHcCrGpgq+tIA1XDC7Pu6w= + + + + \ No newline at end of file diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe new file mode 100644 index 0000000..fc9bd62 Binary files /dev/null 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 new file mode 100644 index 0000000..6255fac --- /dev/null +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -0,0 +1,478 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + HCRfTIXCraEwvFmULJC3AcJMBu2+PrJYOO2N5PhSU1w= + + + + + + + + + + + + v0BE/qFWSZ0zeYD5hTCBto9Xqr5DEGUeahvBP1QyKl4= + + + + + + + + + + + + 7rJ8bZN2PaILQbCwBk7jrnQqTap9EQaHa/8nQTPwVgg= + + + + + + + + + + lqdCpqWSG703aUKUZuVLCGvz3fv9DSk/gweD2eGYZrQ= + + + + + + + + + nzG7pg3H+3uPdr/lzLxyroAH8XD1zvIYW4peV9fAD6M= + + + + + + + + + MsBfDGQbMHg7EHMcNY/8mrPtzIR7Si+xtJAcxLHz+wo= + + + + + + + + + M69a0Q8VAYpaeWem7o8i+9iv5cJdzgRLyWD48mOZQiM= + + + + + + + + + 5dxj6DQUI8H4fwy1EkXVnQnRwj/wJVEVSlzyjSYfUgI= + + + + + + + + + GI6mR05IfCFwEQvctIONdEaTnhHSnhbc3fLErCxmNJE= + + + + + + + + + k2m2tLIfVCyO67LZX2zSmbVyhl5XLttVgRG6E8/VuF0= + + + + + + + + + sBCYzVLt3A/I7Gku5XJ8ZLN2L/aR2YJ1WHrzbf+PySI= + + + + + + + + + ZzTzMYl3DLVEP1oagOyinEAULYpX610Iuk3sJnkA+yY= + + + + + + + + + LAoVjRnvN8/QnPLwFKlndMujFUfVmwuMdYg2vM+TWZI= + + + + + + + + + V0sbr2Q/ES6ckgBpW09YU5PFleJYeN3dWWNN5Bmte6o= + + + + + + + + + 2K2sK/Ba7mlOKw7sF8mza5p8tbxaAewzEqGSBUgZ1mY= + + + + + + + + + qmcKcG32LH7iikhI78zkcFVU8d2OB29WrHjaMNxQ31c= + + + + + + + + + Uj6S88dTZgAwhpS2lddEO1VF5yuGwj31xXwN2s4vPhY= + + + + + + + + + 9h0M8CsC6iXP7E+R3EmdfocnzxgjfrC53xwwS5GM3CQ= + + + + + + + + + w0UragVhbcpGR96DEyDG3918bEsoNR0lYqukJOOY6EM= + + + + + + + + + zrsVsDepWdceKYuysygzl34scDD+yFK0W6RY7elAjKc= + + + + + + + + + DwYeH+xQs13qziRfLclvR4xdlexQmcNybOPlAfAktNw= + + + + + + + + + a4iY6QVNpzMbNlIfIPmdmKdt6nRnAQGMDjOPWrM1oA8= + + + + + + + + + GyCFWEz6VhwTq8fb3O8SuIT0U2WVgelHbDp5L8lW7KA= + + + + + + + + + Z+wcS9Drzc+B2ytpUhd3VCyzHQlvomsyycp/Xiau5Vg= + + + + + + + + + AP1JKyEdfo5h1ffRNHo2ZLE9DVXPGViMIN5NeDTfJ5E= + + + + + + + + + wdycAfKPNJg2GO6pIc0JKDnDhE1zrtpamp5CVVKPOhw= + + + + + + + + + 7qdgZRiaGUdkQELrWMmy0X2MexD+1MiZHIJbd5Uml2E= + + + + + + + + + YQWpE0bdQOdQx4JECZ5oRvN5c6pb+uMgeovoDdT/sW8= + + + + + + + + + +zAe0vYsdCQdvT5DQ3XujGzfmMm5Mx5kvMQWGy32vq4= + + + + + + + + + VQvjXXCgsNEyzV6RvhuYZ5Reu41t0D7HH87dZYk7KcI= + + + + + + + + + rukmHuBnlGNy4RGEvN4wWt8Fz+EV9Z2izAvd+61FUR4= + + + + + + + + + pF6dDVQ6eNpFbiWSIN/nBMdJ/Oev6to/C/bBaGbEfoo= + + + + + + + + + slW3YsxMrkkV9T4PE0LgBfh9DIWGvIxcA1Tk4HQlPYw= + + + + + + + + + +Oqix05d9bmuGzXELIoh/sDI44JgBwy7xci7X79Q2KA= + + + + + + + + + qClKL3sLGduhUUkgph3TLlUcOJ9Rap+lqX32zp8f31A= + + + + + + + + + AzvxwpGvMrksiXkc3mKW5uuzp7TsxUxS7fhCKr9tmWE= + + + + + + + + + /J+u19nP9/3Umk2QZ4141A2KL/z1/EzabYWTsBAvdwQ= + + + + + + + + + v5spqrMy5B5E+JCBZbgg0zI5maO16zQPzVadt19KO5U= + + + + + + + + + hfdhKI5M05j5cHUOVxVwftsZVBbycC/w4+J5mknwmr0= + + + + + + + + + SR16+bLKwtB7indZu424Gg7EZatjjh3QQO1xMK78ItM= + + + + + + + + + e5Sz92eH3B1+fs6E/GQP+h4q2LmpTgNT43EkgevfryI= + + + + + + + + + bzXwypoYaLnjOMNStpcJjXIGFT2/HXJ8Awftsf+d6ZM= + + + + + + + + + xR7A8s/y3cRUwZTEB5N3A8KIF0mB8k5y4azjaVpgz3U= + + + + + + + + + zbhDuGL3PMWT/neUqIW70NotSiGrpCOiZlDRjp9jsfw= + + + + + + + + + +fshereDl8F60Ef1K3Q1uudUcIBJeWlPAmosAdKe/eY= + + + + + + + + + W0yCwc3lJJFqQfgeTtazQbdAjUboLWojci1PiqJjIBM= + + + + + + + + + x6TTsUiEHqlRiSdsR7WH5jiWTj1u/cJsO7BItxU4X9Q= + + + \ No newline at end of file diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb new file mode 100644 index 0000000..5afc08d Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From e4db9cc77abc4cc79c25a6c489183f58276428e8 Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 10 Jun 2017 17:12:28 +0100 Subject: Even more tweaks to the explorer and stuff --- .vs/TimeHACK/v15/.suo | Bin 137216 -> 140800 bytes .../OS/Win95/Win95Apps/WinClassicNotepad.cs | 32 ++++++++-- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 71 ++++++++++++--------- TimeHACK.Main/Program.cs | 8 +-- TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs | 2 +- TimeHACK.Main/SaveDialogs/NewGameDialog.cs | 2 +- TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6356480 -> 6356480 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 2 +- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 273920 -> 275968 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6356480 -> 6356480 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6356480 -> 6356480 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 2 +- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 273920 -> 275968 bytes 15 files changed, 76 insertions(+), 47 deletions(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 491df86..b597e51 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index e08e6ec..6dd6ee8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -88,14 +88,38 @@ namespace TimeHACK.OS.Win95.Win95Apps private void openToolStripMenuItem_Click(object sender, EventArgs e) { - ActivateOpenFileDialog(".txt"); - mainText.Text = ReadTextFile(Program.OpenFileExplorerAsDialogAndReturnGivenPath()); + try + { + ActivateSaveFileDialog(".txt"); + String selectedPath; + selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); + + MessageBox.Show(selectedPath); + if (selectedPath != "") + { + mainText.Text = ReadTextFile(selectedPath); + } + } + catch + { + } } private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - ActivateSaveFileDialog(".txt"); - File.WriteAllText(Program.OpenFileExplorerAsDialogAndReturnGivenPath(), mainText.Text); + try + { + ActivateSaveFileDialog(".txt"); + String selectedPath; + selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); + + MessageBox.Show(selectedPath); + if (selectedPath != "") + { + File.WriteAllText(selectedPath, mainText.Text); + } + } catch { + } } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 44002fd..2c84133 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -116,12 +116,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (new FileInfo(str).Extension == onlyViewExtension) { - this.mainView.Items.Add(Path.GetFileName(str), 0); + this.mainView.Items.Add(Path.GetFileName(str), 2); } } } else { if (!(Path.GetFileName(str) == "_data.info")) { - this.mainView.Items.Add(Path.GetFileName(str)); + this.mainView.Items.Add(Path.GetFileName(str), 2); } } } @@ -467,23 +467,18 @@ namespace TimeHACK.OS.Win95.Win95Apps if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } else { // If it is a file - if (IsFileOpenDialog == true || IsFileSaveDialog == true) { // If it is a open/save file dialog box - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + mainView.FocusedItem.Text; - ((Form)this.TopLevelControl).Close(); + if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) + { + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + } - } else { - ReturnType(new FileInfo(currentDirectory + "\\" + mainView.FocusedItem.Text).Extension); + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; - switch (fileType) { - case 1: - //ManageTextFile.OpenNewTextFile(currentDirectory + "\\" + mainView.FocusedItem.Text); - break; - } - } + ((Form)this.TopLevelControl).Close(); } - - } catch (Exception ex) { + } catch { } } @@ -495,11 +490,9 @@ namespace TimeHACK.OS.Win95.Win95Apps if (diskView.FocusedItem.Text == "My Computer") { GoToDir(ProfileFileSystemDirectory); - } - - } catch (Exception ex) { + } catch { } } @@ -543,24 +536,42 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button1_Click(object sender, EventArgs e) { - if (txtSave.Text == "") - { - wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); - } - else + try { - if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) + Boolean OpenFile = false; + if (mainView.FocusedItem != null) { + if ((String)mainView.FocusedItem.Tag != "") + { // If it isn't a file + GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); + } + else OpenFile = true; // If it is a file + } + else OpenFile = true; + if (OpenFile == true) + { + if (txtSave.Text == "") + { + wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); + } + else + { + if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) + { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; - } - + } + + + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; - FileDialogBoxManager.IsInOpenDialog = false; - FileDialogBoxManager.IsInSaveDialog = false; + ((Form)this.TopLevelControl).Close(); + } + } + } catch { - ((Form)this.TopLevelControl).Close(); } } diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 97a9ca2..839a0c8 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -78,14 +78,8 @@ namespace TimeHACK public static String OpenFileExplorerAsDialogAndReturnGivenPath() { WinClassicWindowsExplorer we = new WinClassicWindowsExplorer(); - WinClassic app = wm.startWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true, true); - TitleScreen.frm95.AddTaskBarItem(app, app.Tag.ToString(), "Windows Explorer", Properties.Resources.WinClassicFileExplorer); - - TitleScreen.frm95.nonimportantapps.Add(app); - TitleScreen.frm95.nonimportantapps[TitleScreen.frm95.nonimportantapps.Count - 1].BringToFront(); - TitleScreen.frm95.nonimportantapps[TitleScreen.frm95.nonimportantapps.Count - 1].FormClosing += new FormClosingEventHandler(TitleScreen.frm95.NonImportantApp_Closing); - app.BringToFront(); + WinClassic app = wm.startWin95(we, "Windows Explorer", Properties.Resources.WinClassicFileExplorer, true, true, true); try { return WindowsExplorerReturnPath; diff --git a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs index 0087fb0..5e1ccf4 100644 --- a/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs +++ b/TimeHACK.Main/SaveDialogs/LoadGameProfileItem.cs @@ -123,7 +123,7 @@ namespace TimeHACK } } pnlConfirm.Hide(); - } catch (Exception ex) + } catch { } diff --git a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs index d492a79..0e6f346 100644 --- a/TimeHACK.Main/SaveDialogs/NewGameDialog.cs +++ b/TimeHACK.Main/SaveDialogs/NewGameDialog.cs @@ -76,7 +76,7 @@ namespace TimeHACK { MessageBox.Show("You must enter a profile name!"); } - } catch (Exception ex) + } catch { } diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index e3c83f9..0beb307 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - HQXMPfmrHd5GpwrSTljeapHcCrGpgq+tIA1XDC7Pu6w= + JDwiYb71FkbK9zwH+UQdUb+H04Uw0ZB3rfbjGZC5v94= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index fc9bd62..4635586 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 6255fac..f085b35 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - v0BE/qFWSZ0zeYD5hTCBto9Xqr5DEGUeahvBP1QyKl4= + 0Ls6I3WA5aPR/KrX4zGwrbzZvIh/wgf+cl6bLQj/nrY= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 5afc08d..67e3c50 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 fc9bd62..4635586 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.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e3c83f9..0beb307 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - HQXMPfmrHd5GpwrSTljeapHcCrGpgq+tIA1XDC7Pu6w= + JDwiYb71FkbK9zwH+UQdUb+H04Uw0ZB3rfbjGZC5v94= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index fc9bd62..4635586 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 6255fac..f085b35 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -63,7 +63,7 @@ - v0BE/qFWSZ0zeYD5hTCBto9Xqr5DEGUeahvBP1QyKl4= + 0Ls6I3WA5aPR/KrX4zGwrbzZvIh/wgf+cl6bLQj/nrY= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 5afc08d..67e3c50 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 22b7ec620f8708c0f922e3883b82b01431b5ef05 Mon Sep 17 00:00:00 2001 From: AShifter Date: Sat, 10 Jun 2017 10:24:20 -0600 Subject: Start story hell yeah --- TimeHACK.Main/OS/Win95/Win95.Designer.cs | 21 +++- TimeHACK.Main/OS/Win95/Win95.cs | 7 ++ TimeHACK.Main/OS/Win95/Win95.resx | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs | 33 ++++++ TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 2 + .../OS/Win95/Win95Apps/WinClassicNotepad.cs | 32 +----- .../Win95/Win95Apps/WinClassicTerminal.Designer.cs | 61 +++++++++++ .../OS/Win95/Win95Apps/WinClassicTerminal.cs | 42 ++++++++ .../OS/Win95/Win95Apps/WinClassicTerminal.resx | 120 +++++++++++++++++++++ .../WinClassicWindowsExplorer.Designer.cs | 14 ++- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 115 ++++++-------------- .../Win95/Win95Apps/WinClassicWindowsExplorer.resx | 4 +- 12 files changed, 326 insertions(+), 127 deletions(-) create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs create mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx diff --git a/TimeHACK.Main/OS/Win95/Win95.Designer.cs b/TimeHACK.Main/OS/Win95/Win95.Designer.cs index 69733c6..92e238a 100644 --- a/TimeHACK.Main/OS/Win95/Win95.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95.Designer.cs @@ -129,6 +129,7 @@ namespace TimeHACK.OS.Win95 this.BitmapImageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MicrosoftDataLinkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -243,7 +244,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, 292); + this.startmenuitems.Size = new System.Drawing.Size(145, 311); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -738,7 +739,8 @@ namespace TimeHACK.OS.Win95 this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.windowManagerTestToolStripMenuItem, this.downloaderTestToolStripMenuItem, - this.installerTestToolStripMenuItem}); + this.installerTestToolStripMenuItem, + this.storyTest1ToolStripMenuItem}); this.DocumentsToolStripMenuItem.Image = global::TimeHACK.Properties.Resources.WinClassicDocuments; this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; @@ -753,7 +755,7 @@ namespace TimeHACK.OS.Win95 this.windowManagerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.windowManagerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("windowManagerTestToolStripMenuItem.BackgroundImage"))); this.windowManagerTestToolStripMenuItem.Name = "windowManagerTestToolStripMenuItem"; - this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.windowManagerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.windowManagerTestToolStripMenuItem.Text = "WindowManagerTest"; this.windowManagerTestToolStripMenuItem.Click += new System.EventHandler(this.windowManagerTestToolStripMenuItem_Click); // @@ -762,7 +764,7 @@ namespace TimeHACK.OS.Win95 this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage"))); this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -771,7 +773,7 @@ namespace TimeHACK.OS.Win95 this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage"))); this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(187, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(186, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -1144,6 +1146,14 @@ namespace TimeHACK.OS.Win95 this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(150, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; // + // storyTest1ToolStripMenuItem + // + this.storyTest1ToolStripMenuItem.BackgroundImage = global::TimeHACK.Properties.Resources.sliversilver; + this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(186, 22); + this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; + this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); + // // Windows95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1269,5 +1279,6 @@ namespace TimeHACK.OS.Win95 private System.Windows.Forms.ToolStripMenuItem downloaderTestToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem installerTestToolStripMenuItem; private System.Windows.Forms.Panel taskbarItems; + private System.Windows.Forms.ToolStripMenuItem storyTest1ToolStripMenuItem; } } \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index 6d7b5f3..79a0a82 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -9,6 +9,7 @@ using TimeHACK.Engine.Template; using TimeHACK.Engine.Template.Taskbars; using TimeHACK.OS.Win95.Win95Apps; using TimeHACK.WinClassicForms; +using TimeHACK.OS.Win95.Win95Apps.Story; namespace TimeHACK.OS.Win95 { @@ -340,6 +341,12 @@ namespace TimeHACK.OS.Win95 startmenu.Hide(); } + private void storyTest1ToolStripMenuItem_Click(object sender, EventArgs e) + { + Win95Apps.Story.Hack1 story = new Win95Apps.Story.Hack1(); + story.startObjective(); + } + //TODO: Add Outlook Express 4 } } diff --git a/TimeHACK.Main/OS/Win95/Win95.resx b/TimeHACK.Main/OS/Win95/Win95.resx index 3cb2089..72d7350 100644 --- a/TimeHACK.Main/OS/Win95/Win95.resx +++ b/TimeHACK.Main/OS/Win95/Win95.resx @@ -407,7 +407,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAVABAQFQAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAVgBAQFYAQEBIAEAASABAAT/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/Story/Hack1.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs new file mode 100644 index 0000000..1822c43 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Story/Hack1.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Media; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using TimeHACK.Engine; + +namespace TimeHACK.OS.Win95.Win95Apps.Story +{ + class Hack1 + { + WinClassicTerminal term = new WinClassicTerminal(); + WindowManager wm = new WindowManager(); + private SoundPlayer startsound; + + // This is the very first story script! + public void startObjective() + { + + wm.startWin95(term, "MS-DOS Prompt", null, true, true); + term.WriteLine("192.168.0.1 Connecting..."); + + // Play Dial-up Sound + Stream audio = Properties.Resources.modem_dial; + startsound = new SoundPlayer(audio); + startsound.PlaySync(); + term.WriteLine("192.168.0.1 Connected."); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index 0fac91a..97a0581 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -60,6 +60,8 @@ namespace TimeHACK.OS.Win95.Win95Apps googlealpha.Show(); break; case "www.12padams.com": + Story.Hack1 startStory = new Story.Hack1(); + startStory.startObjective(); hidePrograms(); break; case "www.microsoft.com/internetexplorer4/welcome": diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index 6dd6ee8..e08e6ec 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -88,38 +88,14 @@ namespace TimeHACK.OS.Win95.Win95Apps private void openToolStripMenuItem_Click(object sender, EventArgs e) { - try - { - ActivateSaveFileDialog(".txt"); - String selectedPath; - selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); - - MessageBox.Show(selectedPath); - if (selectedPath != "") - { - mainText.Text = ReadTextFile(selectedPath); - } - } - catch - { - } + ActivateOpenFileDialog(".txt"); + mainText.Text = ReadTextFile(Program.OpenFileExplorerAsDialogAndReturnGivenPath()); } private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - try - { - ActivateSaveFileDialog(".txt"); - String selectedPath; - selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); - - MessageBox.Show(selectedPath); - if (selectedPath != "") - { - File.WriteAllText(selectedPath, mainText.Text); - } - } catch { - } + ActivateSaveFileDialog(".txt"); + File.WriteAllText(Program.OpenFileExplorerAsDialogAndReturnGivenPath(), mainText.Text); } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs new file mode 100644 index 0000000..d7e9781 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.Designer.cs @@ -0,0 +1,61 @@ +namespace TimeHACK.OS.Win95.Win95Apps +{ + partial class WinClassicTerminal + { + /// + /// 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.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.SuspendLayout(); + // + // richTextBox1 + // + this.richTextBox1.BackColor = System.Drawing.Color.Black; + this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.richTextBox1.ForeColor = System.Drawing.Color.White; + this.richTextBox1.Location = new System.Drawing.Point(0, 0); + this.richTextBox1.Name = "richTextBox1"; + this.richTextBox1.ReadOnly = true; + this.richTextBox1.Size = new System.Drawing.Size(459, 262); + this.richTextBox1.TabIndex = 0; + this.richTextBox1.Text = ""; + // + // WinClassicTerminal + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.richTextBox1); + this.Name = "WinClassicTerminal"; + this.Size = new System.Drawing.Size(459, 262); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.RichTextBox richTextBox1; + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs new file mode 100644 index 0000000..24cb7dd --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.cs @@ -0,0 +1,42 @@ +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; +using System.Media; +using System.IO; +using System.Threading; + +namespace TimeHACK.OS.Win95.Win95Apps +{ + public partial class WinClassicTerminal : UserControl + { + public WinClassicTerminal() + { + InitializeComponent(); + this.richTextBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + } + private SoundPlayer startsound; + /// + /// Write text to the Terminal and create a new line. Very similar to the Win32 Console.WriteLine Function. + /// + /// + public void WriteLine(string Text) + { + richTextBox1.AppendText(Text + "\n"); + } + + /// + /// Write text to the Terminal. Very similar to the Win32 Console.Write Function. + /// + /// + public void Write(String Text) + { + richTextBox1.AppendText(Text); + } + } +} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicTerminal.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/WinClassicWindowsExplorer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs index c71d633..aafe999 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.Designer.cs @@ -195,26 +195,26 @@ // FolderToolStripMenuItem // this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // // ShortcutToolStripMenuItem // this.ShortcutToolStripMenuItem.Name = "ShortcutToolStripMenuItem"; - this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.ShortcutToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.ShortcutToolStripMenuItem.Text = "Shortcut"; // // TextDocumentToolStripMenuItem // this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.TextDocumentToolStripMenuItem.Text = "Text Document"; // // BitmapImageToolStripMenuItem // this.BitmapImageToolStripMenuItem.Name = "BitmapImageToolStripMenuItem"; - this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.BitmapImageToolStripMenuItem.Size = new System.Drawing.Size(155, 22); this.BitmapImageToolStripMenuItem.Text = "Bitmap Image"; // // DeleteToolStripMenuItem @@ -229,7 +229,6 @@ this.RenameToolStripMenuItem.Name = "RenameToolStripMenuItem"; this.RenameToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.RenameToolStripMenuItem.Text = "Rename"; - this.RenameToolStripMenuItem.Click += new System.EventHandler(this.RenameToolStripMenuItem_Click); // // PropertiesToolStripMenuItem // @@ -414,7 +413,7 @@ this.DisconnectNetworkDriveToolStripMenuItem, this.GoToToolStripMenuItem}); this.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem"; - this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(47, 20); + this.ToolsToolStripMenuItem.Size = new System.Drawing.Size(48, 20); this.ToolsToolStripMenuItem.Text = "Tools"; // // FindToolStripMenuItem @@ -599,7 +598,6 @@ this.mainView.TabIndex = 10; this.mainView.UseCompatibleStateImageBehavior = false; this.mainView.View = System.Windows.Forms.View.List; - this.mainView.AfterLabelEdit += new System.Windows.Forms.LabelEditEventHandler(this.mainView_AfterLabelEdit); this.mainView.DoubleClick += new System.EventHandler(this.mainView_DoubleClick); // // iconsList @@ -620,7 +618,7 @@ this.pnlHidden.Controls.Add(this.Label2); this.pnlHidden.Location = new System.Drawing.Point(9, 54); this.pnlHidden.Name = "pnlHidden"; - this.pnlHidden.Size = new System.Drawing.Size(692, 417); + this.pnlHidden.Size = new System.Drawing.Size(461, 417); this.pnlHidden.TabIndex = 14; this.pnlHidden.Visible = false; // diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index 2c84133..e8f97a0 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -19,10 +19,8 @@ namespace TimeHACK.OS.Win95.Win95Apps public Boolean IsFileOpenDialog = false; public Boolean IsFileSaveDialog = false; public String onlyViewExtension = ""; - String ToReplaceWith = ProfileDirectory; String currentDirectory = Path.Combine(ProfileDirectory, "folders"); - String oldLabelText; Int32 fileType = 6; String attemptedDirectory = ""; WindowManager wm = new WindowManager(); @@ -116,12 +114,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (new FileInfo(str).Extension == onlyViewExtension) { - this.mainView.Items.Add(Path.GetFileName(str), 2); + this.mainView.Items.Add(Path.GetFileName(str), 0); } } } else { if (!(Path.GetFileName(str) == "_data.info")) { - this.mainView.Items.Add(Path.GetFileName(str), 2); + this.mainView.Items.Add(Path.GetFileName(str)); } } } @@ -429,7 +427,6 @@ namespace TimeHACK.OS.Win95.Win95Apps // IsFileDialog = False //End Sub void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { - //icons.Images.Add(Properties.Resources.WinClassicFolder); //icons.Images.Add(Properties.Resources.WinClassicComputer); program.BringToFront(); @@ -467,18 +464,23 @@ namespace TimeHACK.OS.Win95.Win95Apps 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 (IsFileOpenDialog == true || IsFileSaveDialog == true) { // If it is a open/save file dialog box + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + mainView.FocusedItem.Text; + ((Form)this.TopLevelControl).Close(); + } else { - FileDialogBoxManager.IsInOpenDialog = false; - FileDialogBoxManager.IsInSaveDialog = false; + ReturnType(new FileInfo(currentDirectory + "\\" + mainView.FocusedItem.Text).Extension); - ((Form)this.TopLevelControl).Close(); + switch (fileType) { + case 1: + //ManageTextFile.OpenNewTextFile(currentDirectory + "\\" + mainView.FocusedItem.Text); + break; + } + } } - } catch { + + } catch (Exception ex) { } } @@ -490,9 +492,11 @@ namespace TimeHACK.OS.Win95.Win95Apps if (diskView.FocusedItem.Text == "My Computer") { GoToDir(ProfileFileSystemDirectory); + } - } catch { + + } catch (Exception ex) { } } @@ -536,42 +540,24 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button1_Click(object sender, EventArgs e) { - try + if (txtSave.Text == "") { - Boolean OpenFile = false; - if (mainView.FocusedItem != null) - { - if ((String)mainView.FocusedItem.Tag != "") - { // If it isn't a file - GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); - } - else OpenFile = true; // If it is a file - } - else OpenFile = true; - if (OpenFile == true) + wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); + } + else + { + if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) { - if (txtSave.Text == "") - { - wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); - } - else - { - if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) - { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; - - } + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; - - FileDialogBoxManager.IsInOpenDialog = false; - FileDialogBoxManager.IsInSaveDialog = false; - - ((Form)this.TopLevelControl).Close(); - } } - } catch { + + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; + + ((Form)this.TopLevelControl).Close(); } } @@ -579,7 +565,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if (!File.Exists(Path.Combine(currentDirectory, mainView.FocusedItem.Text))) + if (!File.Exists(currentDirectory + mainView.FocusedItem.Text)) { wm.startInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info); } @@ -600,48 +586,11 @@ namespace TimeHACK.OS.Win95.Win95Apps { ((Form)this.TopLevelControl).Close(); } + private void AboutWindows95ToolStripMenuItem_Click(object sender, EventArgs e) { WindowManager wm = new WindowManager(); wm.startAboutBox95("Windows 95", "Microsoft Windows 95 Rev B", Properties.Resources.WinClassicAbout95); } - - private void RenameToolStripMenuItem_Click(object sender, EventArgs e) - { - try - { - // The AfterLabelEdit event will kick in after this - oldLabelText = mainView.FocusedItem.Text; - mainView.LabelEdit = true; - mainView.FocusedItem.BeginEdit(); - } catch - { - - } - } - - private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) - { - - String setText; - setText = mainView.FocusedItem.Text; - if (setText == "") - { - wm.startInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); - } - else - { - if (Directory.Exists(setText)) - { - wm.startInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); - } - else - { - Directory.Delete(Path.Combine(currentDirectory, oldLabelText), true); - Directory.CreateDirectory(Path.Combine(currentDirectory, setText)); - } - } - RefreshAll(); - } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx index ecbc974..8e25a32 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -181,7 +181,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD8 - CQAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CQAAAk1TRnQBSQFMAgEBAwEAARABAAEQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From 6fe33a8837e18a65c063bc38f447a7c4fc60e540 Mon Sep 17 00:00:00 2001 From: AShifter Date: Sat, 10 Jun 2017 10:28:06 -0600 Subject: re fix things yoy --- .vs/TimeHACK/v15/.suo | Bin 140800 -> 140800 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll | Bin 190464 -> 190464 bytes TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb | Bin 62976 -> 62976 bytes .../obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9510 -> 9380 bytes .../TimeHACK.Engine.Properties.Resources.resources | Bin 155664 -> 155664 bytes .../TimeHACK.Engine.Template.WinClassic.resources | Bin 4593 -> 4593 bytes .../TimeHACK.Engine.csproj.GenerateResource.Cache | Bin 2531 -> 2531 bytes ...ACK.Engine.csprojResolveAssemblyReference.cache | Bin 23531 -> 29957 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll | Bin 190464 -> 190464 bytes TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb | Bin 62976 -> 62976 bytes TimeHACK.Main/TimeHACK.Main.csproj | 19 +++++++++++++++++++ TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 14810 -> 14419 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 3 +++ .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 6798 -> 6798 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 36781 -> 46871 bytes ...5.Win95Apps.WinClassicWindowsExplorer.resources | Bin 5894 -> 5894 bytes .../Release/TimeHACK.OS.Win95.Windows95.resources | Bin 149868 -> 149868 bytes 19 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index b597e51..63ad0c8 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll index 843ed25..746c4e9 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 d856f49..9b17eca 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/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 2a875f4..653c3c4 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -ce9c5da841ac94441144344852958905f2496327 +2e843e63d81f85d28b296935356be2ecc6190ae4 diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index e421fcc..4d12d8e 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources index 999bbc4..922e583 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Properties.Resources.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources index bb123eb..690267a 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.Template.WinClassic.resources differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache index 888b842..4d43d2f 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.csprojResolveAssemblyReference.cache b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache index a197860..1de6ed7 100644 Binary files a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache and b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll b/TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll index 843ed25..746c4e9 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 d856f49..9b17eca 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/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 6b78699..0cbdbf6 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -122,6 +122,19 @@ + + + UserControl + + + WinClassicFTPClient.cs + + + UserControl + + + WinClassicTerminal.cs + UserControl @@ -255,6 +268,12 @@ TitleScreen.cs + + WinClassicFTPClient.cs + + + WinClassicTerminal.cs + WinClassicWindowsExplorer.cs diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index b553a6e..a30e381 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -8db664c2a85504fd808659509bebd1f75d52ef6c +114a75f89f00e735f973e97219ae38c3263d9c1a diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index df5a199..d50643a 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.Main.csproj.FileListAbsolute.txt b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt index 015f6d4..154e793 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -126,3 +126,6 @@ C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.exe C:\Users\Richie\Desktop\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.pdb I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources +C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources +C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources +C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index a374a92..55f49ba 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 b6c9aed..a25e678 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.WinClassicWindowsExplorer.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources index 9edd0e6..ffc7d5b 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.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 073b485..0bbf7ee 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 -- cgit v1.2.3 From d9b6009e4909508bfb880b9f61e9e0f81d5ffa8b Mon Sep 17 00:00:00 2001 From: AShifter Date: Sat, 10 Jun 2017 10:34:33 -0600 Subject: fixes all the things! compile plz appveyor --- .vs/TimeHACK/v15/.suo | Bin 140800 -> 140800 bytes .../OS/Win95/Win95Apps/WinClassicOE4.Designer.cs | 37 --------------------- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.cs | 20 ----------- TimeHACK.Main/Properties/Resources.Designer.cs | 18 +++++----- TimeHACK.Main/Properties/Resources.resx | 6 ++-- TimeHACK.Main/Resources/modem_dial.wav | Bin 0 -> 2233388 bytes TimeHACK.Main/TimeHACK.Main.csproj | 7 +--- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 190464 -> 190464 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 62976 -> 62976 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 4 +-- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6356480 -> 7088128 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 15 +++++++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 275968 -> 284160 bytes TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6356480 -> 7088128 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 35191 -> 35191 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 14419 -> 14502 bytes .../TempPE/Properties.Resources.Designer.cs.dll | Bin 12800 -> 12800 bytes .../TimeHACK.Main.csproj.FileListAbsolute.txt | 3 +- .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 6798 -> 6979 bytes ...S.Win95.Win95Apps.WinClassicFTPClient.resources | Bin 0 -> 4403 bytes ...OS.Win95.Win95Apps.WinClassicTerminal.resources | Bin 0 -> 180 bytes .../TimeHACK.Properties.Resources.resources | Bin 4854305 -> 5576595 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 4 +-- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6356480 -> 7088128 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 15 +++++++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 275968 -> 284160 bytes 27 files changed, 44 insertions(+), 87 deletions(-) delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.Designer.cs delete mode 100644 TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.cs create mode 100644 TimeHACK.Main/Resources/modem_dial.wav create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources create mode 100644 TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index 63ad0c8..cf2a2b5 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.Designer.cs deleted file mode 100644 index 26a913d..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.Designer.cs +++ /dev/null @@ -1,37 +0,0 @@ -namespace TimeHACK.OS.Win95.Win95Apps -{ - partial class WinClassicOE4 - { - /// - /// 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() - { - components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - } - - #endregion - } -} diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.cs deleted file mode 100644 index cb7a350..0000000 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicOE4.cs +++ /dev/null @@ -1,20 +0,0 @@ -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 WinClassicOE4 : UserControl - { - public WinClassicOE4() - { - InitializeComponent(); - } - } -} diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index ae0d454..b6d3fcf 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -175,6 +175,15 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream modem_dial { + get { + return ResourceManager.GetStream("modem_dial", resourceCulture); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// @@ -372,15 +381,6 @@ namespace TimeHACK.Properties { } } - /// - /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. - /// - internal static System.IO.UnmanagedMemoryStream Win95Start1 { - get { - return ResourceManager.GetStream("Win95Start1", resourceCulture); - } - } - /// /// 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 b6e5e0c..e574f4f 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -169,9 +169,6 @@ ..\resources\winclassic\win95sidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\resources\winclassic\win95start.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ..\resources\winclassic\winclassicclock.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -363,4 +360,7 @@ ..\Resources\WinClassicAbout95.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\resources\modem_dial.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/TimeHACK.Main/Resources/modem_dial.wav b/TimeHACK.Main/Resources/modem_dial.wav new file mode 100644 index 0000000..3a907a0 Binary files /dev/null and b/TimeHACK.Main/Resources/modem_dial.wav differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index 0cbdbf6..41dee88 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -225,12 +225,6 @@ WinClassicNotepad.cs - - UserControl - - - WinClassicOE4.cs - UserControl @@ -375,6 +369,7 @@ + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 843ed25..746c4e9 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 d856f49..9b17eca 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 0beb307..90b813d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -7,14 +7,14 @@ - + - JDwiYb71FkbK9zwH+UQdUb+H04Uw0ZB3rfbjGZC5v94= + axya6B1VuGVCDd3AFMwt1roZXHr5zdukXgh8gG8E78Y= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index 4635586..352d93e 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 f085b35..72bc8fe 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 0Ls6I3WA5aPR/KrX4zGwrbzZvIh/wgf+cl6bLQj/nrY= + xlhY2eZZvmIMUX049vQl+iv2GhxMilZe6Z5oLOMXcVg= @@ -75,7 +75,7 @@ - 7rJ8bZN2PaILQbCwBk7jrnQqTap9EQaHa/8nQTPwVgg= + 6k0eIg8wtPh0nQO1NXeZ7jhZxhwRazjjnelCvcFuXkw= @@ -142,6 +142,15 @@ k2m2tLIfVCyO67LZX2zSmbVyhl5XLttVgRG6E8/VuF0= + + + + + + + 8GPdrHpnW0rPFWbku96u19JwgFXPTZoX4unngsc1no0= + + diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 67e3c50..d488493 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 4635586..352d93e 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 a30e381..854ec49 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -114a75f89f00e735f973e97219ae38c3263d9c1a +025d69c9107d161f275b5b459aad08f6b0cc582e diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index cbb5cb0..9be29b0 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 d50643a..0a5b620 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 972219d..dd14639 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 154e793..fc82f64 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt +++ b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt @@ -45,7 +45,6 @@ C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.WinCla C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicNotepad.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWordPad.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Engine.Template.Taskbars.Win95TaskBarItem.resources -C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Win98.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Properties.Resources.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.TitleScreen.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.Main.csproj.GenerateResource.Cache @@ -129,3 +128,5 @@ I:\Desktop\HistamcomVB\My-TimeHACK\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.S C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicWindowsExplorer.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win98.Windows98.resources C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.SaveDialogs.SaveFileTroubleShooter.resources +C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources +C:\Users\Logan\Desktop\GitHub\TimeHACK\TimeHACK.Main\obj\Release\TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index 55f49ba..d0aa5ad 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.WinClassicFTPClient.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources new file mode 100644 index 0000000..b88090a Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicFTPClient.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicTerminal.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index deef1e6..2edb4b8 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 0beb307..90b813d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -7,14 +7,14 @@ - + - JDwiYb71FkbK9zwH+UQdUb+H04Uw0ZB3rfbjGZC5v94= + axya6B1VuGVCDd3AFMwt1roZXHr5zdukXgh8gG8E78Y= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index 4635586..352d93e 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 f085b35..72bc8fe 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,14 +56,14 @@ - + - 0Ls6I3WA5aPR/KrX4zGwrbzZvIh/wgf+cl6bLQj/nrY= + xlhY2eZZvmIMUX049vQl+iv2GhxMilZe6Z5oLOMXcVg= @@ -75,7 +75,7 @@ - 7rJ8bZN2PaILQbCwBk7jrnQqTap9EQaHa/8nQTPwVgg= + 6k0eIg8wtPh0nQO1NXeZ7jhZxhwRazjjnelCvcFuXkw= @@ -142,6 +142,15 @@ k2m2tLIfVCyO67LZX2zSmbVyhl5XLttVgRG6E8/VuF0= + + + + + + + 8GPdrHpnW0rPFWbku96u19JwgFXPTZoX4unngsc1no0= + + diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 67e3c50..d488493 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3 From 1fbd9c1c76d95d14746925113fcaefa50104b1cd Mon Sep 17 00:00:00 2001 From: Alex-TIMEHACK Date: Sat, 10 Jun 2017 17:45:37 +0100 Subject: Fixed changes AShifter accidentaly made Merge conflicts... --- .vs/TimeHACK/v15/.suo | Bin 140800 -> 146944 bytes .../OS/Win95/Win95Apps/WinClassicNotepad.cs | 32 +++++- .../Win95/Win95Apps/WinClassicWindowsExplorer.cs | 115 +++++++++++++++------ 3 files changed, 111 insertions(+), 36 deletions(-) diff --git a/.vs/TimeHACK/v15/.suo b/.vs/TimeHACK/v15/.suo index b597e51..b4d09a8 100644 Binary files a/.vs/TimeHACK/v15/.suo and b/.vs/TimeHACK/v15/.suo differ diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs index e08e6ec..6dd6ee8 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs @@ -88,14 +88,38 @@ namespace TimeHACK.OS.Win95.Win95Apps private void openToolStripMenuItem_Click(object sender, EventArgs e) { - ActivateOpenFileDialog(".txt"); - mainText.Text = ReadTextFile(Program.OpenFileExplorerAsDialogAndReturnGivenPath()); + try + { + ActivateSaveFileDialog(".txt"); + String selectedPath; + selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); + + MessageBox.Show(selectedPath); + if (selectedPath != "") + { + mainText.Text = ReadTextFile(selectedPath); + } + } + catch + { + } } private void saveToolStripMenuItem_Click(object sender, EventArgs e) { - ActivateSaveFileDialog(".txt"); - File.WriteAllText(Program.OpenFileExplorerAsDialogAndReturnGivenPath(), mainText.Text); + try + { + ActivateSaveFileDialog(".txt"); + String selectedPath; + selectedPath = Program.OpenFileExplorerAsDialogAndReturnGivenPath(); + + MessageBox.Show(selectedPath); + if (selectedPath != "") + { + File.WriteAllText(selectedPath, mainText.Text); + } + } catch { + } } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs index e8f97a0..2c84133 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicWindowsExplorer.cs @@ -19,8 +19,10 @@ namespace TimeHACK.OS.Win95.Win95Apps public Boolean IsFileOpenDialog = false; public Boolean IsFileSaveDialog = false; public String onlyViewExtension = ""; + String ToReplaceWith = ProfileDirectory; String currentDirectory = Path.Combine(ProfileDirectory, "folders"); + String oldLabelText; Int32 fileType = 6; String attemptedDirectory = ""; WindowManager wm = new WindowManager(); @@ -114,12 +116,12 @@ namespace TimeHACK.OS.Win95.Win95Apps { if (new FileInfo(str).Extension == onlyViewExtension) { - this.mainView.Items.Add(Path.GetFileName(str), 0); + this.mainView.Items.Add(Path.GetFileName(str), 2); } } } else { if (!(Path.GetFileName(str) == "_data.info")) { - this.mainView.Items.Add(Path.GetFileName(str)); + this.mainView.Items.Add(Path.GetFileName(str), 2); } } } @@ -427,6 +429,7 @@ namespace TimeHACK.OS.Win95.Win95Apps // IsFileDialog = False //End Sub void WinClassicWindowsExplorer_Load(object sender, EventArgs e) { + //icons.Images.Add(Properties.Resources.WinClassicFolder); //icons.Images.Add(Properties.Resources.WinClassicComputer); program.BringToFront(); @@ -464,23 +467,18 @@ namespace TimeHACK.OS.Win95.Win95Apps if ((String)mainView.FocusedItem.Tag != "") { // If it isn't a file GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); } else { // If it is a file - if (IsFileOpenDialog == true || IsFileSaveDialog == true) { // If it is a open/save file dialog box - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + mainView.FocusedItem.Text; - ((Form)this.TopLevelControl).Close(); + if (new FileInfo(Path.Combine(currentDirectory, txtSave.Text)).Extension == onlyViewExtension) + { + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + } - } else { - ReturnType(new FileInfo(currentDirectory + "\\" + mainView.FocusedItem.Text).Extension); + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; - switch (fileType) { - case 1: - //ManageTextFile.OpenNewTextFile(currentDirectory + "\\" + mainView.FocusedItem.Text); - break; - } - } + ((Form)this.TopLevelControl).Close(); } - - } catch (Exception ex) { + } catch { } } @@ -492,11 +490,9 @@ namespace TimeHACK.OS.Win95.Win95Apps if (diskView.FocusedItem.Text == "My Computer") { GoToDir(ProfileFileSystemDirectory); - } - - } catch (Exception ex) { + } catch { } } @@ -540,24 +536,42 @@ namespace TimeHACK.OS.Win95.Win95Apps private void Button1_Click(object sender, EventArgs e) { - if (txtSave.Text == "") - { - wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); - } - else + try { - if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) + Boolean OpenFile = false; + if (mainView.FocusedItem != null) { + if ((String)mainView.FocusedItem.Tag != "") + { // If it isn't a file + GoToDir(currentDirectory + "\\" + mainView.FocusedItem.Tag); + } + else OpenFile = true; // If it is a file + } + else OpenFile = true; + if (OpenFile == true) + { + if (txtSave.Text == "") + { + wm.startInfobox95("Windows Explorer", "Please enter a filename", Properties.Resources.Win95Info); + } + else + { + if (new FileInfo(currentDirectory + "\\" + txtSave.Text).Extension == onlyViewExtension) + { - Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + Program.WindowsExplorerReturnPath = currentDirectory + "\\" + txtSave.Text; + + } - } - - FileDialogBoxManager.IsInOpenDialog = false; - FileDialogBoxManager.IsInSaveDialog = false; + FileDialogBoxManager.IsInOpenDialog = false; + FileDialogBoxManager.IsInSaveDialog = false; + + ((Form)this.TopLevelControl).Close(); + } + } + } catch { - ((Form)this.TopLevelControl).Close(); } } @@ -565,7 +579,7 @@ namespace TimeHACK.OS.Win95.Win95Apps { try { - if (!File.Exists(currentDirectory + mainView.FocusedItem.Text)) + if (!File.Exists(Path.Combine(currentDirectory, mainView.FocusedItem.Text))) { wm.startInfobox95("Windows Explorer", "This directory doesn't exist", Properties.Resources.Win95Info); } @@ -586,11 +600,48 @@ namespace TimeHACK.OS.Win95.Win95Apps { ((Form)this.TopLevelControl).Close(); } - private void AboutWindows95ToolStripMenuItem_Click(object sender, EventArgs e) { WindowManager wm = new WindowManager(); wm.startAboutBox95("Windows 95", "Microsoft Windows 95 Rev B", Properties.Resources.WinClassicAbout95); } + + private void RenameToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + // The AfterLabelEdit event will kick in after this + oldLabelText = mainView.FocusedItem.Text; + mainView.LabelEdit = true; + mainView.FocusedItem.BeginEdit(); + } catch + { + + } + } + + private void mainView_AfterLabelEdit(object sender, LabelEditEventArgs e) + { + + String setText; + setText = mainView.FocusedItem.Text; + if (setText == "") + { + wm.startInfobox95("Windows Explorer", "Please enter a new directory name", Properties.Resources.Win95Info); + } + else + { + if (Directory.Exists(setText)) + { + wm.startInfobox95("Windows Explorer", "That directory already exists.", Properties.Resources.Win95Info); + } + else + { + Directory.Delete(Path.Combine(currentDirectory, oldLabelText), true); + Directory.CreateDirectory(Path.Combine(currentDirectory, setText)); + } + } + RefreshAll(); + } } } -- cgit v1.2.3 From 320634db071374146d8bc4d2a93c6c96c9f5cda8 Mon Sep 17 00:00:00 2001 From: IBMPCDOS5 Date: Sat, 10 Jun 2017 12:24:40 -0500 Subject: Win98 Fixed Shutdown label in 98 --- TimeHACK.Engine/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 9510 -> 9276 bytes TimeHACK.Main/obj/Release/CoreCompileInputs.cache | 2 +- .../DesignTimeResolveAssemblyReferences.cache | Bin 35191 -> 35191 bytes .../DesignTimeResolveAssemblyReferencesInput.cache | Bin 14898 -> 14186 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache index 2a875f4..128a272 100644 --- a/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Engine/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -ce9c5da841ac94441144344852958905f2496327 +612fc8a605c5ba312ff8ca6bc02fe42cb98339bd diff --git a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index e421fcc..1c74c1b 100644 Binary files a/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache index c80d83d..d21734b 100644 --- a/TimeHACK.Main/obj/Release/CoreCompileInputs.cache +++ b/TimeHACK.Main/obj/Release/CoreCompileInputs.cache @@ -1 +1 @@ -7e1dc210a348e105ac605d4b310d851298fbe398 +afa2a0374774e62688929b1ade536ee4c8b42bf9 diff --git a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache index 6ee910d..c454670 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 433346f..bbe009a 100644 Binary files a/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ -- cgit v1.2.3