From d968d36f0d7715633185ae948368cc32e3c751ab Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 17:15:09 -0400 Subject: Theme wallpapers work! --- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 5fc072e..e15bde5 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using TimeHACK.Engine; namespace TimeHACK.OS.Win95.Win95Apps { @@ -15,6 +16,73 @@ namespace TimeHACK.OS.Win95.Win95Apps public WinClassicThemePanel() { InitializeComponent(); + applyButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + cancelButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + okButton.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + pictureBox2.BackgroundImage = null; + break; + case "Dangerous Creatures": + pictureBox2.BackgroundImage = Properties.Resources.DCTheme_BG; + break; + } + } + + private void WinClassicThemePanel_Load(object sender, EventArgs e) + { + switch (SaveSystem.CurrentSave.ThemeName) + { + case "default95": + comboBox1.SelectedItem = "Default"; + break; + case "dangeranimals": + comboBox1.SelectedItem = "Dangerous Creatures"; + break; + } + } + + private void cancelButton_Click(object sender, EventArgs e) + { + ParentForm.Close(); + } + + private void applyButton_Click(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + SaveSystem.currentTheme = new Default95Theme(); + TitleScreen.frm95.BackgroundImage = null; + break; + case "Dangerous Creatures": + SaveSystem.currentTheme = new DangerousCreaturesTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; + break; + } + } + + private void okButton_Click(object sender, EventArgs e) + { + switch ((string)comboBox1.SelectedItem) + { + case "Default": + SaveSystem.currentTheme = new Default95Theme(); + TitleScreen.frm95.BackgroundImage = null; + TitleScreen.frm95.desktopicons.BackgroundImage = null; + break; + case "Dangerous Creatures": + SaveSystem.currentTheme = new DangerousCreaturesTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + break; + } + ParentForm.Close(); } } } -- cgit v1.2.3 From fa18e32a23d001d75afdc550742eeb89e1608328 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 17:25:36 -0400 Subject: Theme sounds work! --- TimeHACK.Engine/SaveSystem.cs | 13 +++++++++++++ TimeHACK.Engine/Theme.cs | 1 + TimeHACK.Main/OS/Win95/Win95.cs | 7 +++++-- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs | 4 ++++ TimeHACK.Main/Program.cs | 2 +- TimeHACK.Main/TitleScreen.cs | 1 + 6 files changed, 25 insertions(+), 3 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 7110995..5ea5831 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -220,6 +220,19 @@ namespace TimeHACK.Engine // CHANGE THE "JSON" TO "B64" ON A FINAL RELEASE! File.WriteAllText(Path.Combine(ProfileDirectory, ProfileFile), json); } + + public static void SetTheme() + { + switch (CurrentSave.ThemeName) + { + case "default95": + currentTheme = new Default95Theme(); + break; + case "dangeranimals": + currentTheme = new DangerousCreaturesTheme(); + break; + } + } } public class Save diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs index cd82fac..804eb88 100644 --- a/TimeHACK.Engine/Theme.cs +++ b/TimeHACK.Engine/Theme.cs @@ -45,6 +45,7 @@ namespace TimeHACK.Engine public DangerousCreaturesTheme() { startSound = Properties.Resources.Win95PlusDangerousCreaturesStart; + stopSound = Properties.Resources.Win95PlusDangerousCreaturesStart; defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper; themeName = "dangeranimals"; diff --git a/TimeHACK.Main/OS/Win95/Win95.cs b/TimeHACK.Main/OS/Win95/Win95.cs index d83d45e..c6db739 100644 --- a/TimeHACK.Main/OS/Win95/Win95.cs +++ b/TimeHACK.Main/OS/Win95/Win95.cs @@ -47,6 +47,7 @@ namespace TimeHACK.OS.Win95 SettingsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); FindToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); SetStyle(ControlStyles.SupportsTransparentBackColor, true); + BackgroundImage = currentTheme.defaultWallpaper; foreach (ToolStripMenuItem item in startmenuitems.Items) { item.MouseEnter += new EventHandler(MenuItem_MouseEnter); @@ -72,6 +73,7 @@ namespace TimeHACK.OS.Win95 // When New Game is clicked in TitleScreen.cs private void Desktop_Load(object sender, EventArgs e) { + if (currentTheme.defaultWallpaper != null) desktopicons.BackgroundImage = new Bitmap(currentTheme.defaultWallpaper, desktopicons.Width, desktopicons.Height); //Start Menu Color - Commented until it works reliably //startmenuitems.Renderer = new MyRenderer(); //ProgramsToolStripMenuItem.DropDown.Renderer = new MyRenderer(); @@ -80,7 +82,7 @@ namespace TimeHACK.OS.Win95 fontLoad(); // Play Windows 95 Start Sound - Stream audio = Properties.Resources.Win95Start; + Stream audio = currentTheme.startSound; startsound = new SoundPlayer(audio); startsound.Play(); @@ -153,7 +155,8 @@ namespace TimeHACK.OS.Win95 // Shutdown button private void ShutdownToolStripMenuItem_Click(object sender, EventArgs e) { - Program.ShutdownApplication(Properties.Resources.tada); + SaveGame(); + Program.ShutdownApplication(currentTheme.stopSound); } #endregion //Region diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index e15bde5..984de72 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -57,10 +57,12 @@ namespace TimeHACK.OS.Win95.Win95Apps switch ((string)comboBox1.SelectedItem) { case "Default": + SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); TitleScreen.frm95.BackgroundImage = null; break; case "Dangerous Creatures": + SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; break; @@ -72,11 +74,13 @@ namespace TimeHACK.OS.Win95.Win95Apps switch ((string)comboBox1.SelectedItem) { case "Default": + SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); TitleScreen.frm95.BackgroundImage = null; TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": + SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 5cc011a..e2a4be6 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -82,7 +82,7 @@ namespace TimeHACK } } - public static void ShutdownApplication(System.IO.UnmanagedMemoryStream audio) + public static void ShutdownApplication(System.IO.Stream audio) { System.Threading.Thread.Sleep(500); System.IO.Stream audioPlay = audio; diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 6d11dc6..1b7d006 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -276,6 +276,7 @@ namespace TimeHACK if (loadGameBox.successful == true) { LoadSave(); + SetTheme(); StartGame(); } } -- cgit v1.2.3 From 497b5cf0971964c7dac407cb97b695d28be0c90d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 5 Jul 2017 18:41:55 -0400 Subject: Added "Inside Your Computer" Theme --- TimeHACK.Engine/Properties/Resources.Designer.cs | 28 +++++++++++++++++++++ TimeHACK.Engine/Properties/Resources.resx | 9 +++++++ .../Resources/Win95PlusInsideComputerStart.wav | Bin 0 -> 50162 bytes .../Resources/Win95PlusInsideComputerStop.wav | Bin 0 -> 27780 bytes .../Resources/Win95PlusInsideComputerWallpaper.jpg | Bin 0 -> 76769 bytes TimeHACK.Engine/SaveSystem.cs | 3 +++ TimeHACK.Engine/Theme.cs | 12 +++++++++ TimeHACK.Engine/TimeHACK.Engine.csproj | 3 +++ .../Win95Apps/WinClassicThemePanel.Designer.cs | 3 ++- .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 20 +++++++++++++++ TimeHACK.Main/Properties/Resources.Designer.cs | 10 ++++++++ TimeHACK.Main/Properties/Resources.resx | 3 +++ TimeHACK.Main/Resources/ICTheme_BG.jpg | Bin 0 -> 76769 bytes TimeHACK.Main/TimeHACK.Main.csproj | 1 + 14 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav create mode 100644 TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg create mode 100644 TimeHACK.Main/Resources/ICTheme_BG.jpg (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/TimeHACK.Engine/Properties/Resources.Designer.cs b/TimeHACK.Engine/Properties/Resources.Designer.cs index b0186e9..6801231 100644 --- a/TimeHACK.Engine/Properties/Resources.Designer.cs +++ b/TimeHACK.Engine/Properties/Resources.Designer.cs @@ -218,6 +218,34 @@ namespace TimeHACK.Engine.Properties { } } + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStart { + get { + return ResourceManager.GetStream("Win95PlusInsideComputerStart", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. + /// + internal static System.IO.UnmanagedMemoryStream Win95PlusInsideComputerStop { + get { + return ResourceManager.GetStream("Win95PlusInsideComputerStop", resourceCulture); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Win95PlusInsideComputerWallpaper { + get { + object obj = ResourceManager.GetObject("Win95PlusInsideComputerWallpaper", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.IO.UnmanagedMemoryStream similar to System.IO.MemoryStream. /// diff --git a/TimeHACK.Engine/Properties/Resources.resx b/TimeHACK.Engine/Properties/Resources.resx index aeb1500..08e94f6 100644 --- a/TimeHACK.Engine/Properties/Resources.resx +++ b/TimeHACK.Engine/Properties/Resources.resx @@ -199,4 +199,13 @@ ..\Resources\Win98Stop.WAV;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\Win95PlusInsideComputerStart.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95PlusInsideComputerStop.wav;System.IO.MemoryStream, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Win95PlusInsideComputerWallpaper.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav new file mode 100644 index 0000000..22ca7df Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStart.wav differ diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav new file mode 100644 index 0000000..d7a25a6 Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerStop.wav differ diff --git a/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg new file mode 100644 index 0000000..ae577da Binary files /dev/null and b/TimeHACK.Engine/Resources/Win95PlusInsideComputerWallpaper.jpg differ diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs index 5ea5831..cd8bb2f 100644 --- a/TimeHACK.Engine/SaveSystem.cs +++ b/TimeHACK.Engine/SaveSystem.cs @@ -231,6 +231,9 @@ namespace TimeHACK.Engine case "dangeranimals": currentTheme = new DangerousCreaturesTheme(); break; + case "insidepc": + currentTheme = new InsideComputerTheme(); + break; } } } diff --git a/TimeHACK.Engine/Theme.cs b/TimeHACK.Engine/Theme.cs index 804eb88..89c913d 100644 --- a/TimeHACK.Engine/Theme.cs +++ b/TimeHACK.Engine/Theme.cs @@ -51,4 +51,16 @@ namespace TimeHACK.Engine themeName = "dangeranimals"; } } + + public class InsideComputerTheme: Theme + { + public InsideComputerTheme() + { + startSound = Properties.Resources.Win95PlusInsideComputerStart; + stopSound = Properties.Resources.Win95PlusInsideComputerStop; + + defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper; + themeName = "insidepc"; + } + } } diff --git a/TimeHACK.Engine/TimeHACK.Engine.csproj b/TimeHACK.Engine/TimeHACK.Engine.csproj index 22e9038..695b2d8 100644 --- a/TimeHACK.Engine/TimeHACK.Engine.csproj +++ b/TimeHACK.Engine/TimeHACK.Engine.csproj @@ -118,6 +118,9 @@ + + + diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs index e6bdda1..a82ea29 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.Designer.cs @@ -53,7 +53,8 @@ this.comboBox1.FormattingEnabled = true; this.comboBox1.Items.AddRange(new object[] { "Default", - "Dangerous Creatures"}); + "Dangerous Creatures", + "Inside Your Computer"}); this.comboBox1.Location = new System.Drawing.Point(15, 201); this.comboBox1.Name = "comboBox1"; this.comboBox1.Size = new System.Drawing.Size(269, 21); diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 984de72..98ad7bc 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -31,6 +31,9 @@ namespace TimeHACK.OS.Win95.Win95Apps case "Dangerous Creatures": pictureBox2.BackgroundImage = Properties.Resources.DCTheme_BG; break; + case "Inside Your Computer": + pictureBox2.BackgroundImage = Properties.Resources.ICTheme_BG; + break; } } @@ -44,6 +47,9 @@ namespace TimeHACK.OS.Win95.Win95Apps case "dangeranimals": comboBox1.SelectedItem = "Dangerous Creatures"; break; + case "insidepc": + comboBox1.SelectedItem = "Inside Your Computer"; + break; } } @@ -60,11 +66,19 @@ namespace TimeHACK.OS.Win95.Win95Apps SaveSystem.CurrentSave.ThemeName = "default95"; SaveSystem.currentTheme = new Default95Theme(); TitleScreen.frm95.BackgroundImage = null; + TitleScreen.frm95.desktopicons.BackgroundImage = null; break; case "Dangerous Creatures": SaveSystem.CurrentSave.ThemeName = "dangeranimals"; SaveSystem.currentTheme = new DangerousCreaturesTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + break; + case "Inside Your Computer": + SaveSystem.CurrentSave.ThemeName = "insidepc"; + SaveSystem.currentTheme = new InsideComputerTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); break; } } @@ -85,6 +99,12 @@ namespace TimeHACK.OS.Win95.Win95Apps TitleScreen.frm95.BackgroundImage = Properties.Resources.DCTheme_BG; TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); break; + case "Inside Your Computer": + SaveSystem.CurrentSave.ThemeName = "insidepc"; + SaveSystem.currentTheme = new InsideComputerTheme(); + TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + break; } ParentForm.Close(); } diff --git a/TimeHACK.Main/Properties/Resources.Designer.cs b/TimeHACK.Main/Properties/Resources.Designer.cs index 3797b07..abdd38c 100644 --- a/TimeHACK.Main/Properties/Resources.Designer.cs +++ b/TimeHACK.Main/Properties/Resources.Designer.cs @@ -165,6 +165,16 @@ namespace TimeHACK.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ICTheme_BG { + get { + object obj = ResourceManager.GetObject("ICTheme_BG", 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 355e0eb..af91fe3 100644 --- a/TimeHACK.Main/Properties/Resources.resx +++ b/TimeHACK.Main/Properties/Resources.resx @@ -579,4 +579,7 @@ ..\Resources\DCTheme_BG.JPG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ICTheme_BG.jpg;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/Resources/ICTheme_BG.jpg b/TimeHACK.Main/Resources/ICTheme_BG.jpg new file mode 100644 index 0000000..ae577da Binary files /dev/null and b/TimeHACK.Main/Resources/ICTheme_BG.jpg differ diff --git a/TimeHACK.Main/TimeHACK.Main.csproj b/TimeHACK.Main/TimeHACK.Main.csproj index ffcd0ca..6fba178 100644 --- a/TimeHACK.Main/TimeHACK.Main.csproj +++ b/TimeHACK.Main/TimeHACK.Main.csproj @@ -414,6 +414,7 @@ + -- cgit v1.2.3 From e4ee95004a1655a61355d64818d633bcca00fd52 Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 6 Jul 2017 10:41:05 -0400 Subject: Changed Installer and added EULA --- .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 61 +++++++++++++++++++++- TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs | 24 +++++++++ .../OS/Win95/Win95Apps/Win95Installer.resx | 17 ++++++ .../Win95Apps/WinClassicFTPClient.Designer.cs | 10 ++-- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 7 ++- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs | 9 ++++ .../OS/Win95/Win95Apps/WinClassicIE4.resx | 1 + .../OS/Win95/Win95Apps/WinClassicThemePanel.cs | 2 +- TimeHACK.Main/Resources/IE4/padams.html | 1 + 10 files changed, 124 insertions(+), 10 deletions(-) (limited to 'TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs index 0bfab81..d19c533 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -36,8 +36,13 @@ this.cancelbutton1 = new System.Windows.Forms.Button(); this.nextbutton1 = new System.Windows.Forms.Button(); this.backbutton1 = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.checkBox1 = new System.Windows.Forms.CheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); this.SuspendLayout(); // // installPic @@ -97,23 +102,69 @@ this.nextbutton1.TabIndex = 5; this.nextbutton1.Text = "Next"; this.nextbutton1.UseVisualStyleBackColor = true; + this.nextbutton1.Click += new System.EventHandler(this.nextbutton1_Click); // // backbutton1 // this.backbutton1.Enabled = false; this.backbutton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.backbutton1.Location = new System.Drawing.Point(241, 301); + this.backbutton1.Location = new System.Drawing.Point(235, 301); this.backbutton1.Name = "backbutton1"; this.backbutton1.Size = new System.Drawing.Size(75, 23); this.backbutton1.TabIndex = 6; this.backbutton1.Text = "Back"; this.backbutton1.UseVisualStyleBackColor = true; // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(-3, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(263, 13); + this.label2.TabIndex = 7; + this.label2.Text = "Please read and agree to the EULA before continuing."; + // + // textBox1 + // + this.textBox1.AcceptsReturn = true; + this.textBox1.BackColor = System.Drawing.Color.White; + this.textBox1.Location = new System.Drawing.Point(0, 28); + this.textBox1.Multiline = true; + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.textBox1.Size = new System.Drawing.Size(318, 209); + this.textBox1.TabIndex = 8; + this.textBox1.Text = resources.GetString("textBox1.Text"); + // + // checkBox1 + // + this.checkBox1.AutoSize = true; + this.checkBox1.Location = new System.Drawing.Point(0, 243); + this.checkBox1.Name = "checkBox1"; + this.checkBox1.Size = new System.Drawing.Size(215, 17); + this.checkBox1.TabIndex = 9; + this.checkBox1.Text = "I hereby agree to the terms in the EULA."; + this.checkBox1.UseVisualStyleBackColor = true; + this.checkBox1.CheckedChanged += new System.EventHandler(this.checkBox1_CheckedChanged); + // + // panel1 + // + this.panel1.Controls.Add(this.checkBox1); + this.panel1.Controls.Add(this.label2); + this.panel1.Controls.Add(this.textBox1); + this.panel1.Location = new System.Drawing.Point(150, 16); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(318, 260); + this.panel1.TabIndex = 10; + this.panel1.Visible = false; + // // Win95Installer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Silver; + this.Controls.Add(this.panel1); this.Controls.Add(this.backbutton1); this.Controls.Add(this.nextbutton1); this.Controls.Add(this.cancelbutton1); @@ -122,10 +173,12 @@ this.Controls.Add(this.pictureBox1); this.Controls.Add(this.installPic); this.Name = "Win95Installer"; - this.Size = new System.Drawing.Size(488, 340); + this.Size = new System.Drawing.Size(483, 340); this.Load += new System.EventHandler(this.Win95Installer_Load); ((System.ComponentModel.ISupportInitialize)(this.installPic)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -140,5 +193,9 @@ private System.Windows.Forms.Button cancelbutton1; private System.Windows.Forms.Button nextbutton1; private System.Windows.Forms.Button backbutton1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TextBox textBox1; + private System.Windows.Forms.CheckBox checkBox1; + private System.Windows.Forms.Panel panel1; } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs index 0ae74df..8377d54 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.cs @@ -12,10 +12,14 @@ namespace TimeHACK.OS.Win95.Win95Apps { public partial class Win95Installer : UserControl { + public int installStage = 0; + public Win95Installer() { InitializeComponent(); label1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + label2.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + checkBox1.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); cancelbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); nextbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); backbutton1.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -25,5 +29,25 @@ namespace TimeHACK.OS.Win95.Win95Apps { label1.Text.Replace("GenericName", installname.Text); } + + private void nextbutton1_Click(object sender, EventArgs e) + { + switch (installStage) + { + case 0: + label1.Hide(); + panel1.Show(); + backbutton1.Enabled = true; + nextbutton1.Enabled = false; + installStage = 1; + break; + } + } + + private void checkBox1_CheckedChanged(object sender, EventArgs e) + { + if (checkBox1.Checked) nextbutton1.Enabled = true; + else nextbutton1.Enabled = false; + } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx index 3c5d753..535ee98 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/Win95Installer.resx @@ -129,4 +129,21 @@ WARNING: This program is protected by copyright law and international treaties. Unauthorized reproduction or distribution of this program, or any portion of it, may result in severe civil and criminal penalties, and will be prosecuted to the maximum extent possible under law. + + By installing this software you agree that you will not try to reverse engineer it in anyway or claim it as your own work. + +You agree that you will not try to spread this software or any of its components to other companies without rightful permission from the owner. + +You agree that if you bought this program, you own it and that nobody else is allowed to use it on your computer or on their computer. + +You understand that trying to upload this software online or any other forms of spreading this software will result in the FBI coming into your home and killing you with knives. + +You agree that taking a picture of this software and sending it to someone will cause you to get 15 years in jail for software exposing. + +You agree that if you tell someone else about this software's features that you will wake up dead in the morning because the owner would have killed you in your sleep. + +You know that using this software will alert the maker of it and then cause him to monitor every moment of your life after you install this software. + +You agree to all of the above and will not commit any of the crimes otherwise you will go to Hell. + \ No newline at end of file diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 485b982..2e83e62 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -30,11 +30,11 @@ { this.components = new System.ComponentModel.Container(); System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] { - "/software/"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "/software/"}, 0, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] { - "index.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "index.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] { - "???.html"}, -1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); + "???.html"}, 1, System.Drawing.Color.Black, System.Drawing.Color.Empty, null); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WinClassicFTPClient)); this.topBar = new System.Windows.Forms.Panel(); this.button1 = new System.Windows.Forms.Button(); @@ -180,10 +180,10 @@ this.panel1.Size = new System.Drawing.Size(762, 30); this.panel1.TabIndex = 9; // - // cancelButton + // button2 // this.button2.Location = new System.Drawing.Point(3, 2); - this.button2.Name = "cancelButton"; + this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(75, 23); this.button2.TabIndex = 0; this.button2.Text = "cancelButton"; diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs index ab7e61f..b1caef9 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -33,6 +33,7 @@ namespace TimeHACK.OS.Win95.Win95Apps infoLabel.Text = "[200] OK"; welcomeLabel.Hide(); infoLabel.Show(); + ftpFiles.Show(); } else { @@ -57,9 +58,13 @@ namespace TimeHACK.OS.Win95.Win95Apps { Point objDrawingPoint = ftpFiles.PointToClient(Cursor.Position); ListViewItem objListViewItem = new ListViewItem(); - if (objListViewItem.Text == "/software/") + if (objDrawingPoint != null) { + objListViewItem = ftpFiles.GetItemAt(objDrawingPoint.X, objDrawingPoint.Y); + if (objListViewItem.Text == "/software/") + { + } } } } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 7b49ca1..28053de 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO - DwAAAk1TRnQBSQFMAgEBAgEAAQgBAAEIAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + DwAAAk1TRnQBSQFMAgEBAgEAARABAAEQAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs index d70b520..81b8504 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.cs @@ -206,6 +206,7 @@ namespace TimeHACK.OS.Win95.Win95Apps break; case "12PADAMS": webBrowser1.Document.GetElementById("wc_b").Click += new HtmlElementEventHandler(WCDownloadButton_Click); + webBrowser1.Document.GetElementById("ftp_b").Click += new HtmlElementEventHandler(FTPDownloadButton_Click); if (!TitleScreen.frm95.hiddenpadamsFound) webBrowser1.Document.GetElementById("distort").Style += "visibility:hidden;"; break; case "GOOGLE": @@ -221,6 +222,14 @@ namespace TimeHACK.OS.Win95.Win95Apps } } + private void FTPDownloadButton_Click(object sender, HtmlElementEventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.StartWin95(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: FTP Client"; + } + //TODO: Add more websites //TODO: Relabel Buttons And Things } diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx index 02cc277..f508cca 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicIE4.resx @@ -301,6 +301,7 @@ Where do you want to go today?</p> <h1>Games/Software</h1> <p class="app" id="gtn">Guess the Number V1 <button id="gtn_b">Download</button></p> <p class="app" id="wc">Web Chat 1998 <button id="wc_b">Download</button></p> + <p class="app" id="ftp">FTP Client <button id="ftp_b">Download</button></p> <p class="app" id="distort">Time Distorter 0.1 <button id="distort_b">Download</button></p> </div></td> <td><div class="customize"> diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs index 98ad7bc..4e731fe 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WinClassicThemePanel.cs @@ -103,7 +103,7 @@ namespace TimeHACK.OS.Win95.Win95Apps SaveSystem.CurrentSave.ThemeName = "insidepc"; SaveSystem.currentTheme = new InsideComputerTheme(); TitleScreen.frm95.BackgroundImage = Properties.Resources.ICTheme_BG; - TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.DCTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); + TitleScreen.frm95.desktopicons.BackgroundImage = new Bitmap(Properties.Resources.ICTheme_BG, TitleScreen.frm95.desktopicons.Width, TitleScreen.frm95.desktopicons.Height); break; } ParentForm.Close(); diff --git a/TimeHACK.Main/Resources/IE4/padams.html b/TimeHACK.Main/Resources/IE4/padams.html index af12151..cc16191 100644 --- a/TimeHACK.Main/Resources/IE4/padams.html +++ b/TimeHACK.Main/Resources/IE4/padams.html @@ -50,6 +50,7 @@

Games/Software

Guess the Number V1

Web Chat 1998

+

FTP Client

Time Distorter 0.1

-- cgit v1.2.3