diff options
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95.cs | 6 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 11 | ||||
| -rw-r--r-- | TimeHACK.Main/OS/Win98/Win98.cs | 18 |
3 files changed, 22 insertions, 13 deletions
diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index c326c64..c5e7799 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -238,7 +238,7 @@ namespace TimeHACK.OS.Win95 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer(); + Win95Installer openinstaller = new Win95Installer("Testing"); WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); @@ -278,8 +278,8 @@ namespace TimeHACK.OS.Win95 } else if (objListViewItem.Text == "Web Chat Setup") { - Win95Installer inst = new Win95Installer(); - inst.installname.Text = "Web Chat 1998"; + Win95Installer inst = new Win95Installer("Web Chat 1998"); + inst.InstallCompleted += (sendr, args) => WebChatToolStripMenuItem.Visible = true; WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); app.BringToFront(); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index e3924ee..8178a30 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -13,9 +13,17 @@ namespace TimeHACK.OS.Win95.Win95Apps public partial class Win95Installer : UserControl { public int installStage = 0; + private string prog; private Timer installbar = new Timer(); - public Win95Installer() + public event EventHandler InstallCompleted; + + protected void OnInstallCompleted(EventArgs e) + { + if (InstallCompleted != null) InstallCompleted(this, e); + } + + public Win95Installer(string progName) { InitializeComponent(); label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); @@ -45,6 +53,7 @@ namespace TimeHACK.OS.Win95.Win95Apps } else { + OnInstallCompleted(EventArgs.Empty); panel3.Hide(); panel4.Show(); backbutton1.Hide(); diff --git a/TimeHACK.Main/OS/Win98/Win98.cs b/TimeHACK.Main/OS/Win98/Win98.cs index 198108d..175719a 100644 --- a/TimeHACK.Main/OS/Win98/Win98.cs +++ b/TimeHACK.Main/OS/Win98/Win98.cs @@ -218,12 +218,12 @@ namespace TimeHACK.OS.Win98 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer(); - WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); + //Win95Installer openinstaller = new Win95Installer(); + //WinClassic app = wm.StartWin95(openinstaller, "Installer", null, false, true); - AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); + //AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); - app.BringToFront(); + //app.BringToFront(); startmenu.Hide(); } @@ -258,11 +258,11 @@ namespace TimeHACK.OS.Win98 } else if (objListViewItem.Text == "Web Chat Setup") { - Win95Installer inst = new Win95Installer(); - inst.installname.Text = "Web Chat 1998"; - WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); - AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); - app.BringToFront(); + //Win95Installer inst = new Win95Installer(); + //inst.installname.Text = "Web Chat 1998"; + //WinClassic app = wm.StartWin95(inst, "Web Chat Setup", null, true, true); + //AddTaskBarItem(app, app.Tag.ToString(), "Web Chat Setup", null); + //app.BringToFront(); startmenu.Hide(); } } |