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 --- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs') 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); } } } -- 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(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs') 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 (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs') 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 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(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicNotepad.cs') 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