diff options
| author | FloppyDiskDrive <[email protected]> | 2017-09-01 21:25:32 -0500 |
|---|---|---|
| committer | FloppyDiskDrive <[email protected]> | 2017-09-01 21:25:32 -0500 |
| commit | b8b914d600a18a25448c0ddcde963a3e9a30a534 (patch) | |
| tree | 481bfaec0a5217205751c02c3f9c1fc8870a01ab /Histacom2/OS | |
| parent | 529e5221b7c72a3613eb4aa396d4626a0173c571 (diff) | |
| parent | 7e54d42ed67bf8417a4a479dedce65217adc8309 (diff) | |
| download | histacom2-b8b914d600a18a25448c0ddcde963a3e9a30a534.tar.gz histacom2-b8b914d600a18a25448c0ddcde963a3e9a30a534.tar.bz2 histacom2-b8b914d600a18a25448c0ddcde963a3e9a30a534.zip | |
Merge remote-tracking branch 'refs/remotes/Histacom2-Devs/master'
Diffstat (limited to 'Histacom2/OS')
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs | 1 | ||||
| -rw-r--r-- | Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs index 76b9baf..b72c576 100644 --- a/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs +++ b/Histacom2/OS/Win95/Win95Apps/Story/Hack2.cs @@ -275,6 +275,7 @@ namespace Histacom2.OS.Win95.Win95Apps.Story SaveSystem.currentTheme = new Default98Theme(); SaveSystem.CurrentSave.ThemeName = "default98"; TitleScreen.frm95.distort.ParentForm.Close(); + foreach (Form frm in Application.OpenForms) if (frm is WinClassic) frm.Close(); Program.title.StartGame(); TitleScreen.frm95.Close(); return; diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 07f9e57..d7a10a8 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -53,6 +53,8 @@ namespace Histacom2.OS.Win95.Win95Apps mainView.LargeImageList = new ImageList(); mainView.LargeImageList.ImageSize = new Size(32, 32); + // Icons 17, 18, 19 reserved for exclusive apps + mainView.LargeImageList.Images.AddRange(new Bitmap[] { Properties.Resources.Win95Computer, // 0 Properties.Resources.WinClassicFolder, Properties.Resources.WinClassicIE4, @@ -73,7 +75,7 @@ namespace Histacom2.OS.Win95.Win95Apps Properties.Resources.TimeDistorter1, Properties.Resources.WinClassicGTN, Properties.Resources.WinClassicFTP, - Properties.Resources.WinClassicRtfFile}); + Properties.Resources.WinClassicRtfFile}); //20 program.BringToFront(); @@ -992,7 +994,7 @@ namespace Histacom2.OS.Win95.Win95Apps if (File.Exists(CurrentDirectory + "\\New Text Document.txt")) { //wm.StartInfobox95("Windows Explorer", "This directory already exists", Properties.Resources.Win95Info); - //TODO: add making "New Folder (2)" + //TODO: add making "New Text Document (2)" } else { |