diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-07-22 12:45:53 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-07-22 12:45:53 +0100 |
| commit | 46eb239008fc30830b026b5eedc7da036d14d3f2 (patch) | |
| tree | b9e5a9f2397140a134d63b1d2608a3c49f15f407 /TimeHACK.Main | |
| parent | 31c67063128fc0e5accf852bafd8aab7c7b6e37b (diff) | |
| download | histacom2-46eb239008fc30830b026b5eedc7da036d14d3f2.tar.gz histacom2-46eb239008fc30830b026b5eedc7da036d14d3f2.tar.bz2 histacom2-46eb239008fc30830b026b5eedc7da036d14d3f2.zip | |
Fixed bugs
Diffstat (limited to 'TimeHACK.Main')
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win98/Win98.cs | 2 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs | 27 |
3 files changed, 14 insertions, 17 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index a685fa6..e85b39f 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -22,7 +22,7 @@ namespace TimeHACK.OS.Win95.Win95Apps public string onlyViewExtension = ""; string ToReplaceWith = ProfileDirectory; - string CurrentDirectory = Path.Combine(ProfileDirectory, "folders", "Computer"); + string CurrentDirectory = ProfileMyComputerDirectory; string OldLabelText; int fileType = 6; //string attemptedDirectory = ""; diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index e3e7043..5585e7d 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -71,6 +71,8 @@ namespace TimeHACK.OS.Win98 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + UpgradeFileSystem("95", "98"); + if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, Width, Height); //Start Menu Color - Commented until it works reliably //startmenuitems.Renderer = new MyRenderer(); diff --git a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 3a87805..e97276d 100644 --- a/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/TimeHACK.Main/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -22,7 +22,7 @@ namespace TimeHACK.OS.Win95.Win95Apps public string onlyViewExtension = ""; string ToReplaceWith = ProfileDirectory; - string CurrentDirectory = Path.Combine(ProfileDirectory, "folders", "Computer"); + string CurrentDirectory = ProfileMyComputerDirectory; string OldLabelText; int fileType = 6; //string attemptedDirectory = ""; @@ -162,23 +162,18 @@ namespace TimeHACK.OS.Win95.Win95Apps // Update the WebView - if (Directory.Exists(CurrentDirectory)) + if (CurrentDirectory == SaveSystem.ProfileMyComputerDirectory) { - if (CurrentDirectory == SaveSystem.ProfileMyComputerDirectory) - { - pictureBox1.Image = Properties.Resources.Win95HardDiskIcon; - } else if (CurrentDirectory == SaveSystem.ProfileFileSystemDirectory) { - pictureBox1.Image = Properties.Resources.Win95Computer; - } else { - pictureBox1.Image = Properties.Resources.WinClassicFolder; - } - + pictureBox1.Image = Properties.Resources.Win95HardDiskIcon; + } else if (CurrentDirectory == SaveSystem.ProfileFileSystemDirectory) { + pictureBox1.Image = Properties.Resources.Win95Computer; } else { - // If it is the drive give it that icon - - + pictureBox1.Image = Properties.Resources.WinClassicFolder; } + txtInfoTip.Show(); + InfoDesc.Hide(); + string weblabel = ReadDataFile(CurrentDirectory, false); txtInfoTitle.Text = weblabel ?? new FileInfo(CurrentDirectory).Name; @@ -621,7 +616,7 @@ namespace TimeHACK.OS.Win95.Win95Apps } else { - OpenFile((string)mainView.FocusedItem.Tag); + OpenFile(mainView.FocusedItem.Tag.ToString()); } } } catch (Exception ex) { @@ -756,7 +751,7 @@ namespace TimeHACK.OS.Win95.Win95Apps private void AboutWindows95ToolStripMenuItem_Click(object sender, EventArgs e) { WindowManager wm = new WindowManager(); - wm.StartAboutBox95("Windows 95", "Microsoft Windows 98", Properties.Resources.WinClassicAbout95); + wm.StartAboutBox95("Windows 98", "Microsoft Windows 98", Properties.Resources.WinClassicAbout95); } private void RenameToolStripMenuItem_Click(object sender, EventArgs e) |