From 59505ed4dd131afbd18c0b3e660c8c72815ba5a2 Mon Sep 17 00:00:00 2001 From: AShifter Date: Tue, 29 Aug 2017 20:33:11 -0600 Subject: Add WinXP and MultiOS WM WM is currently working, though is in the middle of modification to work with multiple operating systems. Windows XP window template as well as resources have also been added, though window moving code has not been added yet. --- Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs') diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 1488808..b6195ae 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -88,14 +88,14 @@ namespace Histacom2.OS.Win95.Win95Apps { WinClassicDownloader opendownload = new WinClassicDownloader(); WindowManager wm = new WindowManager(); - wm.StartWin95(opendownload, "Downloader", null, false, true); + wm.Init(opendownload, "Downloader", null, false, true); opendownload.appName.Text = "Downloading: FTP Client"; } else if (objListViewItem.Text == "Web Chat Setup.exe") { WinClassicDownloader opendownload = new WinClassicDownloader(); WindowManager wm = new WindowManager(); - wm.StartWin95(opendownload, "Downloader", null, false, true); + wm.Init(opendownload, "Downloader", null, false, true); opendownload.appName.Text = "Downloading: Web Chat 1998"; opendownload.amountToDL = 35; } @@ -103,14 +103,14 @@ namespace Histacom2.OS.Win95.Win95Apps { WinClassicDownloader opendownload = new WinClassicDownloader(); WindowManager wm = new WindowManager(); - wm.StartWin95(opendownload, "Downloader", null, false, true); + wm.Init(opendownload, "Downloader", null, false, true); opendownload.appName.Text = "Downloading: Time Distorter 0.1"; } else if (objListViewItem.Text == "Guess The Number V1 Setup.exe") { WinClassicDownloader opendownload = new WinClassicDownloader(); WindowManager wm = new WindowManager(); - wm.StartWin95(opendownload, "Downloader", null, false, true); + wm.Init(opendownload, "Downloader", null, false, true); opendownload.appName.Text = "Downloading: Guess The Number V1"; opendownload.amountToDL = 16; } -- cgit v1.2.3 From 1a970e69dada088c5f5ea82dd5683da9ae306ebe Mon Sep 17 00:00:00 2001 From: lempamo Date: Mon, 4 Sep 2017 20:14:19 -0400 Subject: new classic buttons! --- Histacom2.Engine/Histacom2.Engine.csproj | 8 +- Histacom2.Engine/Template/Infobox95.Designer.cs | 31 +++--- Histacom2.Engine/Template/Infobox95.cs | 3 - Histacom2.Engine/Theme.cs | 14 +++ Histacom2.Engine/UI/ClassicButton.Designer.cs | 91 --------------- Histacom2.Engine/UI/ClassicButton.cs | 77 ++++++------- Histacom2.Engine/UI/ClassicButton.resx | 123 --------------------- .../Win95Apps/WinClassicFTPClient.Designer.cs | 27 ++--- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 1 - .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- 10 files changed, 84 insertions(+), 293 deletions(-) delete mode 100644 Histacom2.Engine/UI/ClassicButton.Designer.cs delete mode 100644 Histacom2.Engine/UI/ClassicButton.resx (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index fb64648..9b186d8 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -92,10 +92,7 @@ - UserControl - - - ClassicButton.cs + Component Component @@ -132,9 +129,6 @@ WinXP.cs - - ClassicButton.cs - diff --git a/Histacom2.Engine/Template/Infobox95.Designer.cs b/Histacom2.Engine/Template/Infobox95.Designer.cs index 0bccf85..6ee2a6a 100644 --- a/Histacom2.Engine/Template/Infobox95.Designer.cs +++ b/Histacom2.Engine/Template/Infobox95.Designer.cs @@ -29,12 +29,12 @@ private void InitializeComponent() { this.programContent = new System.Windows.Forms.Panel(); - this.button1 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); + this.button1 = new Histacom2.Engine.UI.ClassicButton(); + this.button3 = new Histacom2.Engine.UI.ClassicButton(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.infoText = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); + this.button2 = new Histacom2.Engine.UI.ClassicButton(); this.programContent.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); @@ -57,16 +57,13 @@ // // button1 // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.button1.BackColor = System.Drawing.Color.Silver; + this.button1.ForeColor = System.Drawing.Color.Black; this.button1.Location = new System.Drawing.Point(150, 84); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(80, 23); - this.button1.TabIndex = 5; + this.button1.TabIndex = 6; this.button1.Text = "Yes"; - this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // // button3 @@ -74,13 +71,13 @@ this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + this.button3.BackColor = System.Drawing.Color.Silver; + this.button3.ForeColor = System.Drawing.Color.Black; this.button3.Location = new System.Drawing.Point(323, 84); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(80, 23); this.button3.TabIndex = 4; this.button3.Text = "Cancel"; - this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // // pictureBox1 @@ -116,13 +113,13 @@ this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button2.Location = new System.Drawing.Point(236, 84); + this.button2.BackColor = System.Drawing.Color.Silver; + this.button2.ForeColor = System.Drawing.Color.Black; + this.button2.Location = new System.Drawing.Point(237, 84); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(80, 23); this.button2.TabIndex = 1; this.button2.Text = "No"; - this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.button2_Click); // // Infobox95 @@ -145,8 +142,8 @@ private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.Panel panel1; public System.Windows.Forms.Label infoText; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button1; + private UI.ClassicButton button1; + private UI.ClassicButton button2; + private UI.ClassicButton button3; } } \ No newline at end of file diff --git a/Histacom2.Engine/Template/Infobox95.cs b/Histacom2.Engine/Template/Infobox95.cs index f0ed0db..dca45bb 100644 --- a/Histacom2.Engine/Template/Infobox95.cs +++ b/Histacom2.Engine/Template/Infobox95.cs @@ -13,9 +13,6 @@ namespace Histacom2.Engine.Template public Infobox95(InfoboxType type, InfoboxButtons btns) { InitializeComponent(); - button1.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); - button2.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); - button3.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); switch (type) { diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 6c1efef..579f42e 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -19,6 +19,9 @@ namespace Histacom2.Engine public Stream progErrorSound { get; set; } public Stream questionSound { get; set; } + public Color threeDObjectsColor { get; set; } + public Color threeDObjectsTextColor { get; set; } + public Color activeTitleBarColor { get; set; } public Color activeTitleTextColor { get; set; } public Color inactiveTitleBarColor { get; set; } @@ -42,6 +45,9 @@ namespace Histacom2.Engine progErrorSound = Properties.Resources.CHORD; questionSound = Properties.Resources.CHORD; + threeDObjectsColor = Color.Silver; + threeDObjectsTextColor = Color.Black; + activeTitleBarColor = Color.Navy; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.Gray; @@ -65,6 +71,14 @@ namespace Histacom2.Engine progErrorSound = Properties.Resources.CHORD; questionSound = Properties.Resources.CHORD; + threeDObjectsColor = Color.Silver; + threeDObjectsTextColor = Color.Black; + + activeTitleBarColor = Color.Navy; + activeTitleTextColor = Color.White; + inactiveTitleBarColor = Color.Gray; + inactiveTitleTextColor = Color.Silver; + defaultWallpaper = null; themeName = "default98"; } diff --git a/Histacom2.Engine/UI/ClassicButton.Designer.cs b/Histacom2.Engine/UI/ClassicButton.Designer.cs deleted file mode 100644 index c76bba0..0000000 --- a/Histacom2.Engine/UI/ClassicButton.Designer.cs +++ /dev/null @@ -1,91 +0,0 @@ -namespace Histacom2.Engine.UI -{ - partial class ClassicButton - { - /// - /// 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.borderpart = new System.Windows.Forms.Panel(); - this.graystuff = new System.Windows.Forms.Panel(); - this.lessgraystuff = new System.Windows.Forms.Label(); - this.borderpart.SuspendLayout(); - this.graystuff.SuspendLayout(); - this.SuspendLayout(); - // - // borderpart - // - this.borderpart.BackColor = System.Drawing.Color.White; - this.borderpart.Controls.Add(this.graystuff); - this.borderpart.Location = new System.Drawing.Point(0, 0); - this.borderpart.Name = "borderpart"; - this.borderpart.Size = new System.Drawing.Size(99, 24); - this.borderpart.TabIndex = 0; - // - // graystuff - // - this.graystuff.BackColor = System.Drawing.Color.Gray; - this.graystuff.Controls.Add(this.lessgraystuff); - this.graystuff.Location = new System.Drawing.Point(1, 1); - this.graystuff.Name = "graystuff"; - this.graystuff.Size = new System.Drawing.Size(98, 23); - this.graystuff.TabIndex = 0; - // - // lessgraystuff - // - this.lessgraystuff.BackColor = System.Drawing.Color.Silver; - this.lessgraystuff.Location = new System.Drawing.Point(0, 0); - this.lessgraystuff.Margin = new System.Windows.Forms.Padding(0); - this.lessgraystuff.Name = "lessgraystuff"; - this.lessgraystuff.Size = new System.Drawing.Size(97, 22); - this.lessgraystuff.TabIndex = 0; - this.lessgraystuff.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.lessgraystuff.Paint += new System.Windows.Forms.PaintEventHandler(this.lessgraystuff_Paint); - // - // ClassicButton - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.Black; - this.Controls.Add(this.borderpart); - this.Name = "ClassicButton"; - this.Size = new System.Drawing.Size(100, 25); - this.Paint += new System.Windows.Forms.PaintEventHandler(this.ClassicButton_Paint); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ClassicButton_MouseDown); - this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ClassicButton_MouseUp); - this.Resize += new System.EventHandler(this.ClassicButton_Resize); - this.borderpart.ResumeLayout(false); - this.graystuff.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.Panel borderpart; - private System.Windows.Forms.Panel graystuff; - private System.Windows.Forms.Label lessgraystuff; - } -} diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 26629a8..e82a742 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -1,8 +1,6 @@ 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; @@ -10,49 +8,54 @@ using System.Windows.Forms; namespace Histacom2.Engine.UI { - public partial class ClassicButton : UserControl + public class ClassicButton : Control { - public ClassicButton() - { - InitializeComponent(); - } - - private void ClassicButton_SizeChanged(object sender, EventArgs e) - { + private Color _lightBack = Color.White; + private Color _darkBack = Color.Gray; - } + private bool _pressing = false; - private void ClassicButton_MouseDown(object sender, MouseEventArgs e) + public ClassicButton() : base() { - this.BackColor = Color.White; - borderpart.BackColor = Color.Black; - lessgraystuff.Location = new Point(1, 1); - } + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; + else BackColor = Color.Silver; + _lightBack = ControlPaint.Light(BackColor, 50); + _darkBack = ControlPaint.Dark(BackColor, 50); - private void ClassicButton_Paint(object sender, PaintEventArgs e) - { - e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; - base.OnPaint(e); - } + if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; + else ForeColor = Color.Black; - private void lessgraystuff_Paint(object sender, PaintEventArgs e) - { - e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; - base.OnPaint(e); + MouseDown += (s, e) => { _pressing = true; Invalidate(); }; + MouseUp += (s, e) => { _pressing = false; Invalidate(); }; } - private void ClassicButton_MouseUp(object sender, MouseEventArgs e) + protected override void OnPaint(PaintEventArgs e) { - this.BackColor = Color.Black; - borderpart.BackColor = Color.White; - lessgraystuff.Location = new Point(0, 0); - } - - private void ClassicButton_Resize(object sender, EventArgs e) - { - borderpart.Size = new Size(this.Width - 1, this.Height - 1); - graystuff.Size = new Size(this.Width - 2, this.Height - 2); - lessgraystuff.Size = new Size(this.Width - 3, this.Height - 3); + base.OnPaint(e); + var g = e.Graphics; + g.Clear(BackColor); + + g.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + + if (_pressing) + { + g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width, Height)); + g.FillRectangle(Brushes.Black, new Rectangle(0, 0, Width - 1, Height - 1)); + g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); + g.FillRectangle(new SolidBrush(BackColor), new Rectangle(2, 2, Width - 3, Height - 3)); + + g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2) + 1, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1); + } + else + { + g.FillRectangle(Brushes.Black, new Rectangle(0, 0, Width, Height)); + g.FillRectangle(new SolidBrush(_lightBack), new Rectangle(0, 0, Width - 1, Height - 1)); + g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); + g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3)); + + g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) - (g.MeasureString(Text, Font).Width / 2), (Height / 2) - (g.MeasureString(Text, Font).Height / 2)); + } } + } -} \ No newline at end of file +} diff --git a/Histacom2.Engine/UI/ClassicButton.resx b/Histacom2.Engine/UI/ClassicButton.resx deleted file mode 100644 index d5494e3..0000000 --- a/Histacom2.Engine/UI/ClassicButton.resx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 17, 17 - - \ No newline at end of file diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index 9e09cb0..b793250 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -37,7 +37,6 @@ "???.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.btnLogin = new System.Windows.Forms.Button(); this.infoLabel = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -53,6 +52,7 @@ this.welcomeLabel = new System.Windows.Forms.Label(); this.ftpFiles = new System.Windows.Forms.ListView(); this.fileIcons = new System.Windows.Forms.ImageList(this.components); + this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.topBar.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -76,17 +76,6 @@ this.topBar.Size = new System.Drawing.Size(762, 30); this.topBar.TabIndex = 0; // - // btnLogin - // - this.btnLogin.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnLogin.Location = new System.Drawing.Point(585, 2); - this.btnLogin.Name = "btnLogin"; - this.btnLogin.Size = new System.Drawing.Size(44, 23); - this.btnLogin.TabIndex = 5; - this.btnLogin.Text = "Login"; - this.btnLogin.UseVisualStyleBackColor = true; - this.btnLogin.Click += new System.EventHandler(this.button1_Click); - // // infoLabel // this.infoLabel.AutoSize = true; @@ -236,6 +225,18 @@ this.fileIcons.Images.SetKeyName(1, "WinClassicNotepad.png"); this.fileIcons.Images.SetKeyName(2, "WinClassicSetup.png"); // + // btnLogin + // + this.btnLogin.BackColor = System.Drawing.Color.Silver; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.ForeColor = System.Drawing.Color.Black; + this.btnLogin.Location = new System.Drawing.Point(585, 4); + this.btnLogin.Name = "btnLogin"; + this.btnLogin.Size = new System.Drawing.Size(44, 20); + this.btnLogin.TabIndex = 9; + this.btnLogin.Text = "Login"; + this.btnLogin.Click += new System.EventHandler(this.button1_Click); + // // WinClassicFTPClient // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -266,11 +267,11 @@ private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; public System.Windows.Forms.TextBox hostnameBox; private System.Windows.Forms.Label infoLabel; - private System.Windows.Forms.Button btnLogin; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.Button btnCancel; private System.Windows.Forms.Label welcomeLabel; internal System.Windows.Forms.ListView ftpFiles; private System.Windows.Forms.ImageList fileIcons; + private Engine.UI.ClassicButton btnLogin; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index b6195ae..2fd4afd 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -119,7 +119,6 @@ namespace Histacom2.OS.Win95.Win95Apps private void DoClassicButtons() { - btnLogin.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); btnCancel.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 0869aa0..607312e 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAASABAAEgAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From 584789ed8a37027db496d6c90873186fe461f021 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 6 Sep 2017 00:26:22 -0400 Subject: a little modification --- Histacom2.Engine/UI/ClassicButton.cs | 4 +-- .../Win95Apps/WinClassicFTPClient.Designer.cs | 34 +++++++++++----------- .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 12 ++++---- .../OS/Win95/Win95Apps/WinClassicFTPClient.resx | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs') diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 717a6ce..b761504 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -59,7 +59,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(2, 2, Width - 3, Height - 3)); - g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 3, sf); + g.DrawString(Text, _font, new SolidBrush(ForeColor), ((Width / 2) + 1) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); } else { @@ -68,7 +68,7 @@ namespace Histacom2.Engine.UI g.FillRectangle(new SolidBrush(_darkBack), new Rectangle(1, 1, Width - 2, Height - 2)); g.FillRectangle(new SolidBrush(BackColor), new Rectangle(1, 1, Width - 3, Height - 3)); - g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 2, sf); + g.DrawString(Text, _font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1, sf); } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs index b793250..63e056b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.Designer.cs @@ -37,6 +37,7 @@ "???.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.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.infoLabel = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -48,11 +49,10 @@ this.hostnameBox = new System.Windows.Forms.TextBox(); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.panel1 = new System.Windows.Forms.Panel(); - this.btnCancel = new System.Windows.Forms.Button(); + this.btnCancel = new Histacom2.Engine.UI.ClassicButton(); this.welcomeLabel = new System.Windows.Forms.Label(); this.ftpFiles = new System.Windows.Forms.ListView(); this.fileIcons = new System.Windows.Forms.ImageList(this.components); - this.btnLogin = new Histacom2.Engine.UI.ClassicButton(); this.topBar.SuspendLayout(); this.panel1.SuspendLayout(); this.SuspendLayout(); @@ -76,6 +76,18 @@ this.topBar.Size = new System.Drawing.Size(762, 30); this.topBar.TabIndex = 0; // + // btnLogin + // + this.btnLogin.BackColor = System.Drawing.Color.Silver; + this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.btnLogin.ForeColor = System.Drawing.Color.Black; + this.btnLogin.Location = new System.Drawing.Point(585, 4); + this.btnLogin.Name = "btnLogin"; + this.btnLogin.Size = new System.Drawing.Size(44, 20); + this.btnLogin.TabIndex = 9; + this.btnLogin.Text = "Login"; + this.btnLogin.Click += new System.EventHandler(this.button1_Click); + // // infoLabel // this.infoLabel.AutoSize = true; @@ -172,13 +184,13 @@ // // btnCancel // - this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancel.BackColor = System.Drawing.Color.Silver; + this.btnCancel.ForeColor = System.Drawing.Color.Black; this.btnCancel.Location = new System.Drawing.Point(3, 2); this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 0; this.btnCancel.Text = "Cancel"; - this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); // // welcomeLabel @@ -225,18 +237,6 @@ this.fileIcons.Images.SetKeyName(1, "WinClassicNotepad.png"); this.fileIcons.Images.SetKeyName(2, "WinClassicSetup.png"); // - // btnLogin - // - this.btnLogin.BackColor = System.Drawing.Color.Silver; - this.btnLogin.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnLogin.ForeColor = System.Drawing.Color.Black; - this.btnLogin.Location = new System.Drawing.Point(585, 4); - this.btnLogin.Name = "btnLogin"; - this.btnLogin.Size = new System.Drawing.Size(44, 20); - this.btnLogin.TabIndex = 9; - this.btnLogin.Text = "Login"; - this.btnLogin.Click += new System.EventHandler(this.button1_Click); - // // WinClassicFTPClient // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -268,7 +268,7 @@ public System.Windows.Forms.TextBox hostnameBox; private System.Windows.Forms.Label infoLabel; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Button btnCancel; + private Engine.UI.ClassicButton btnCancel; private System.Windows.Forms.Label welcomeLabel; internal System.Windows.Forms.ListView ftpFiles; private System.Windows.Forms.ImageList fileIcons; diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 2fd4afd..4dd74fb 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -117,11 +117,6 @@ namespace Histacom2.OS.Win95.Win95Apps } } - private void DoClassicButtons() - { - btnCancel.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); - } - private void btnCancel_Click(object sender, EventArgs e) { ParentForm.Close(); @@ -129,7 +124,12 @@ namespace Histacom2.OS.Win95.Win95Apps private void WinClassicFTPClient_Load(object sender, EventArgs e) { - DoClassicButtons(); + + } + + private void topBar_Paint(object sender, PaintEventArgs e) + { + topBar.BackColor = SaveSystem.currentTheme.threeDObjectsColor; } } } diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx index 607312e..9dd3ac3 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.resx @@ -128,7 +128,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABe - EgAAAk1TRnQBSQFMAgEBAwEAASgBAAEoAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + EgAAAk1TRnQBSQFMAgEBAwEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABgAMAASADAAEBAQABCAYAARAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA -- cgit v1.2.3 From bd74f334cf0a2fcb4f98b1d33fa909bce766d02b Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 22 Sep 2017 21:18:09 -0400 Subject: new installer prototype --- Histacom2.Engine/SaveSystem.cs | 9 +- Histacom2.Engine/Template/WinClassic.Designer.cs | 15 ++- .../InstallerPanes/WelcomePane.Designer.cs | 107 ++++++++++++++++++ .../GlobalPrograms/InstallerPanes/WelcomePane.cs | 26 +++++ .../GlobalPrograms/InstallerPanes/WelcomePane.resx | 120 +++++++++++++++++++++ .../WinClassicCalculator.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicCalculator.cs | 2 +- .../WinClassicDownloader.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicDownloader.cs | 15 +-- .../GlobalPrograms/WinClassicInstaller.Designer.cs | 110 +++++++++++++++++++ Histacom2/GlobalPrograms/WinClassicInstaller.cs | 30 ++++++ Histacom2/GlobalPrograms/WinClassicInstaller.resx | 120 +++++++++++++++++++++ .../GlobalPrograms/WinClassicNotepad.Designer.cs | 2 +- Histacom2/GlobalPrograms/WinClassicNotepad.cs | 2 +- Histacom2/Histacom2.csproj | 19 ++++ Histacom2/OS/Win95/Win95.cs | 1 + .../OS/Win95/Win95Apps/IE3Sites/12padams1998.cs | 1 + .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 68 ++++++------ .../OS/Win95/Win95Apps/Win95WindowsExplorer.cs | 1 + .../OS/Win95/Win95Apps/WinClassicFTPClient.cs | 1 + Histacom2/OS/Win98/Win98.cs | 3 +- .../Win98Apps/IE4Sites/12padams1999.Designer.cs | 44 ++++++-- .../OS/Win98/Win98Apps/IE4Sites/12padams1999.cs | 16 +++ .../Win98/Win98Apps/WinClassicWindowsExplorer.cs | 18 ++-- Histacom2/Properties/Resources.resx | 3 + Histacom2/Properties/Resources1.Designer.cs | 10 ++ .../WinClassic/WinClassicInstallSidebar.png | Bin 0 -> 3976 bytes 27 files changed, 672 insertions(+), 75 deletions(-) create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs create mode 100644 Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.cs create mode 100644 Histacom2/GlobalPrograms/WinClassicInstaller.resx create mode 100644 Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png (limited to 'Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs') diff --git a/Histacom2.Engine/SaveSystem.cs b/Histacom2.Engine/SaveSystem.cs index b8c619e..79333bd 100644 --- a/Histacom2.Engine/SaveSystem.cs +++ b/Histacom2.Engine/SaveSystem.cs @@ -171,13 +171,13 @@ namespace Histacom2.Engine SaveDirectoryInfo(ProfileMyComputerDirectory, "Program Files", true, "Program Files", true); SaveDirectoryInfo(ProfileProgramsDirectory, "Accessories", false, "Accessories", true); SaveDirectoryInfo(ProfileProgramsDirectory, "Internet Explorer", true, "Internet Explorer", true); - SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true); + if (CurrentSave.CurrentOS == "95") SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true); SaveDirectoryInfo(ProfileMyComputerDirectory, "Windows", true, "Windows", true); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Accessories"), "wordpad.exe", "wordpad", 16, 183296); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "ie20.exe", "ie", 8, 512); CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "lnfinst.exe", "iebrokeninstaller", 8, 512); - CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4); + if (CurrentSave.CurrentOS == "95") CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), "msnver.txt", "5900", 12, 4); CreateWindowsDirectory(); } @@ -322,7 +322,7 @@ namespace Histacom2.Engine public static void UpgradeFileSystem(string newOS) { - if (newOS == "98" || newOS == "2000" || newOS == "ME") + if (newOS == "98") { // We are upgrading from the old WinClassic file System to the new WinClassic filesystem! // All the above OSes share basically the same file layout! @@ -336,10 +336,11 @@ namespace Histacom2.Engine // There is no "The Microsoft Network" folder! if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "The Microsoft Network"), true); + if (Directory.Exists(Path.Combine(ProfileProgramsDirectory, "12padams"))) Directory.Delete(Path.Combine(ProfileProgramsDirectory, "12padams"), true); FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject(File.ReadAllText(Path.Combine(ProfileProgramsDirectory, "_data.info"))); foreach (THDirInfo dir in fsfi.SubDirs) { - if (dir.Name == "The Microsoft Network") + if (dir.Name == "The Microsoft Network" || dir.Name == "12padams") { fsfi.SubDirs.Remove(dir); break; diff --git a/Histacom2.Engine/Template/WinClassic.Designer.cs b/Histacom2.Engine/Template/WinClassic.Designer.cs index bacce99..8463041 100644 --- a/Histacom2.Engine/Template/WinClassic.Designer.cs +++ b/Histacom2.Engine/Template/WinClassic.Designer.cs @@ -45,6 +45,7 @@ this.bottom = new System.Windows.Forms.Panel(); this.right = new System.Windows.Forms.Panel(); this.top = new System.Windows.Forms.Panel(); + this.panel1 = new System.Windows.Forms.Panel(); this.program.SuspendLayout(); this.programtopbar.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.programIcon)).BeginInit(); @@ -57,6 +58,7 @@ // this.program.BackColor = System.Drawing.Color.Silver; this.program.Controls.Add(this.programContent); + this.program.Controls.Add(this.panel1); this.program.Controls.Add(this.programtopbar); this.program.Controls.Add(this.toprightcorner); this.program.Controls.Add(this.bottomrightcorner); @@ -75,9 +77,9 @@ // programContent // this.programContent.Dock = System.Windows.Forms.DockStyle.Fill; - this.programContent.Location = new System.Drawing.Point(4, 22); + this.programContent.Location = new System.Drawing.Point(4, 23); this.programContent.Name = "programContent"; - this.programContent.Size = new System.Drawing.Size(292, 274); + this.programContent.Size = new System.Drawing.Size(292, 273); this.programContent.TabIndex = 9; this.programContent.ControlAdded += new System.Windows.Forms.ControlEventHandler(this.programContent_ControlAdded); // @@ -265,6 +267,14 @@ this.top.MouseMove += new System.Windows.Forms.MouseEventHandler(this.top_MouseMove); this.top.MouseUp += new System.Windows.Forms.MouseEventHandler(this.border_MouseUp); // + // panel1 + // + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(4, 22); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(292, 1); + this.panel1.TabIndex = 0; + // // WinClassic // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -307,5 +317,6 @@ public System.Windows.Forms.PictureBox maximizebutton; public System.Windows.Forms.PictureBox minimizebutton; public System.Windows.Forms.PictureBox programIcon; + private System.Windows.Forms.Panel panel1; } } \ No newline at end of file diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs new file mode 100644 index 0000000..2249215 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.Designer.cs @@ -0,0 +1,107 @@ +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + partial class WelcomePane + { + /// + /// 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.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicLabel1 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel2 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel3 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel4 = new Histacom2.Engine.UI.ClassicLabel(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.WinClassicInstallSidebar; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(164, 314); + this.pictureBox1.TabIndex = 0; + this.pictureBox1.TabStop = false; + // + // classicLabel1 + // + this.classicLabel1.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel1.Location = new System.Drawing.Point(177, 19); + this.classicLabel1.Name = "classicLabel1"; + this.classicLabel1.Size = new System.Drawing.Size(311, 40); + this.classicLabel1.TabIndex = 1; + this.classicLabel1.Text = "Welcome to the Program Setup Wizard"; + // + // classicLabel2 + // + this.classicLabel2.Location = new System.Drawing.Point(177, 72); + this.classicLabel2.Name = "classicLabel2"; + this.classicLabel2.Size = new System.Drawing.Size(311, 13); + this.classicLabel2.TabIndex = 2; + this.classicLabel2.Text = "This will install Program on your computer."; + // + // classicLabel3 + // + this.classicLabel3.Location = new System.Drawing.Point(177, 98); + this.classicLabel3.Name = "classicLabel3"; + this.classicLabel3.Size = new System.Drawing.Size(311, 26); + this.classicLabel3.TabIndex = 3; + this.classicLabel3.Text = "It is recommended that you close all other applications before continuing."; + // + // classicLabel4 + // + this.classicLabel4.Location = new System.Drawing.Point(177, 137); + this.classicLabel4.Name = "classicLabel4"; + this.classicLabel4.Size = new System.Drawing.Size(311, 13); + this.classicLabel4.TabIndex = 4; + this.classicLabel4.Text = "Click Next to continue, or Cancel to exit Setup."; + // + // WelcomePane + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.White; + this.Controls.Add(this.classicLabel4); + this.Controls.Add(this.classicLabel3); + this.Controls.Add(this.classicLabel2); + this.Controls.Add(this.classicLabel1); + this.Controls.Add(this.pictureBox1); + this.Name = "WelcomePane"; + this.Size = new System.Drawing.Size(495, 314); + this.Load += new System.EventHandler(this.WelcomePane_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicLabel classicLabel1; + private Engine.UI.ClassicLabel classicLabel2; + private Engine.UI.ClassicLabel classicLabel3; + private Engine.UI.ClassicLabel classicLabel4; + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs new file mode 100644 index 0000000..48ac001 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.cs @@ -0,0 +1,26 @@ +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; + +namespace Histacom2.GlobalPrograms.InstallerPanes +{ + public partial class WelcomePane : UserControl + { + public WelcomePane() + { + InitializeComponent(); + } + + private void WelcomePane_Load(object sender, EventArgs e) + { + classicLabel1.Text = $"Welcome to the {((WinClassicInstaller)Parent.Parent).progName} Setup Wizard"; + classicLabel2.Text = $"This will install {((WinClassicInstaller)Parent.Parent).progName} on your computer."; + } + } +} diff --git a/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/InstallerPanes/WelcomePane.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/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs index f612876..90a9c00 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.Designer.cs @@ -1,4 +1,4 @@ -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicCalculator { diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.cs index 2fecae8..50fd2d8 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicCalculator : UserControl { diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs index 78fb92b..fda53dc 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs @@ -1,4 +1,4 @@ -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicDownloader { diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.cs index bb83ff6..eaf253a 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Windows.Forms; using static Histacom2.Engine.SaveSystem; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicDownloader : UserControl { @@ -55,16 +55,11 @@ namespace Histacom2.OS.Win95.Win95Apps case "Downloading: Start Runner 95": CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Start Runner Setup.exe", "sr95 setup", 11, 34846); break; + case "Downloading: Web Chat 1999": + CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop"), "Web Chat Setup.exe", "web chat 99 setup", 11, 37048); + break; } - /* if (appName.Text == "Downloading: Start Runner") - { - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Start Runner Setup.exe"), "StartRunner"); - } - if (appName.Text == "Downloading: Error Blaster") - { - CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Error Blaster Setup.exe"), "ErrorBlaster"); - } - if (appName.Text == "Downloading: Skindows 95") + /* if (appName.Text == "Downloading: Skindows 95") { CreateWindowsFile(Path.Combine(ProfileWindowsDirectory, "Desktop", "Skindows 95 Setup.exe"), "Skindows95Setup"); } */ diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs new file mode 100644 index 0000000..c8bea62 --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.Designer.cs @@ -0,0 +1,110 @@ +namespace Histacom2.GlobalPrograms +{ + partial class WinClassicInstaller + { + /// + /// 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.panel1 = new System.Windows.Forms.Panel(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.classicButton1 = new Histacom2.Engine.UI.ClassicButton(); + this.classicButton2 = new Histacom2.Engine.UI.ClassicButton(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // panel1 + // + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(495, 314); + this.panel1.TabIndex = 0; + // + // pictureBox1 + // + this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.ie4_hsplitter; + this.pictureBox1.Location = new System.Drawing.Point(0, 314); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(495, 2); + this.pictureBox1.TabIndex = 1; + this.pictureBox1.TabStop = false; + // + // classicButton1 + // + this.classicButton1.AdaptBackColorWithTheme = true; + this.classicButton1.AdaptFontWithTheme = true; + this.classicButton1.AdaptForeColorWithTheme = true; + this.classicButton1.BackColor = System.Drawing.Color.Silver; + this.classicButton1.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton1.ForeColor = System.Drawing.Color.Black; + this.classicButton1.Location = new System.Drawing.Point(408, 326); + this.classicButton1.Name = "classicButton1"; + this.classicButton1.Size = new System.Drawing.Size(75, 23); + this.classicButton1.TabIndex = 2; + this.classicButton1.Text = "Cancel"; + // + // classicButton2 + // + this.classicButton2.AdaptBackColorWithTheme = true; + this.classicButton2.AdaptFontWithTheme = true; + this.classicButton2.AdaptForeColorWithTheme = true; + this.classicButton2.BackColor = System.Drawing.Color.Silver; + this.classicButton2.DialogResult = System.Windows.Forms.DialogResult.None; + this.classicButton2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.classicButton2.ForeColor = System.Drawing.Color.Black; + this.classicButton2.Location = new System.Drawing.Point(323, 326); + this.classicButton2.Name = "classicButton2"; + this.classicButton2.Size = new System.Drawing.Size(75, 23); + this.classicButton2.TabIndex = 3; + this.classicButton2.Text = "&Next >"; + // + // WinClassicInstaller + // + 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.classicButton2); + this.Controls.Add(this.classicButton1); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.panel1); + this.MaximumSize = new System.Drawing.Size(495, 358); + this.MinimumSize = new System.Drawing.Size(495, 358); + this.Name = "WinClassicInstaller"; + this.Size = new System.Drawing.Size(495, 358); + this.Load += new System.EventHandler(this.WinClassicInstaller_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicButton classicButton1; + private Engine.UI.ClassicButton classicButton2; + } +} diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.cs b/Histacom2/GlobalPrograms/WinClassicInstaller.cs new file mode 100644 index 0000000..8f262fb --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.cs @@ -0,0 +1,30 @@ +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; + +namespace Histacom2.GlobalPrograms +{ + public partial class WinClassicInstaller : UserControl + { + public string progName; + public int state = 0; + + public WinClassicInstaller(string prog) + { + InitializeComponent(); + progName = prog; + } + + private void WinClassicInstaller_Load(object sender, EventArgs e) + { + var welkom = new InstallerPanes.WelcomePane(); + welkom.Parent = panel1; + } + } +} diff --git a/Histacom2/GlobalPrograms/WinClassicInstaller.resx b/Histacom2/GlobalPrograms/WinClassicInstaller.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Histacom2/GlobalPrograms/WinClassicInstaller.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/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs index 99c1a2c..87ec209 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.Designer.cs @@ -1,6 +1,6 @@ using System; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { partial class WinClassicNotepad { diff --git a/Histacom2/GlobalPrograms/WinClassicNotepad.cs b/Histacom2/GlobalPrograms/WinClassicNotepad.cs index e1a4019..1a58d8e 100644 --- a/Histacom2/GlobalPrograms/WinClassicNotepad.cs +++ b/Histacom2/GlobalPrograms/WinClassicNotepad.cs @@ -11,7 +11,7 @@ using Histacom2.Engine; using static Histacom2.Engine.FileDialogBoxManager; using System.IO; -namespace Histacom2.OS.Win95.Win95Apps +namespace Histacom2.GlobalPrograms { public partial class WinClassicNotepad : UserControl { diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 0064576..fc87093 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -132,6 +132,18 @@ AchievementBox.cs + + UserControl + + + WelcomePane.cs + + + UserControl + + + WinClassicInstaller.cs + UserControl @@ -401,6 +413,12 @@ AchievementBox.cs + + WelcomePane.cs + + + WinClassicInstaller.cs + SurviveTheDay.cs @@ -765,6 +783,7 @@ + diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 926aea0..38129ab 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -12,6 +12,7 @@ using Histacom2.OS.Win95.Win95Apps.Story; using static Histacom2.Engine.SaveSystem; using Histacom2.OS.Win95.Win95Apps._12padamViruses; using Histacom2.OS.Win95.Win95Apps._12padamsViruses; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95 { diff --git a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs index a6c67df..9f4bfbd 100644 --- a/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs +++ b/Histacom2/OS/Win95/Win95Apps/IE3Sites/12padams1998.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; using System.Threading; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps.IE3Sites { diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs index 20a51c7..5592445 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -41,14 +41,14 @@ this.checkBox1 = new System.Windows.Forms.CheckBox(); this.panel1 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); + this.label4 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); this.panel3 = new System.Windows.Forms.Panel(); this.label6 = new System.Windows.Forms.Label(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); this.panel4 = new System.Windows.Forms.Panel(); this.label7 = new System.Windows.Forms.Label(); - this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); @@ -184,14 +184,14 @@ this.panel2.TabIndex = 11; this.panel2.Visible = false; // - // label3 + // label5 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(-3, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(268, 13); - this.label3.TabIndex = 0; - this.label3.Text = "Setup will install GenericName in the following directory:"; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(-3, 28); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(178, 13); + this.label5.TabIndex = 2; + this.label5.Text = "To install in this directory, click Next."; // // label4 // @@ -202,14 +202,14 @@ this.label4.TabIndex = 1; this.label4.Text = "C:\\Program Files\\12padams\\GenericName\\"; // - // label5 + // label3 // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(-3, 28); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(178, 13); - this.label5.TabIndex = 2; - this.label5.Text = "To install in this directory, click Next."; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(-3, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(268, 13); + this.label3.TabIndex = 0; + this.label3.Text = "Setup will install GenericName in the following directory:"; // // panel3 // @@ -230,6 +230,23 @@ this.label6.TabIndex = 1; this.label6.Text = "Installing..."; // + // progressBar1 + // + this.progressBar1.BlockSpacing = 5; + this.progressBar1.BlockWidth = 20; + this.progressBar1.Location = new System.Drawing.Point(3, 115); + this.progressBar1.MarqueeWidth = 125; + this.progressBar1.Maximum = 100D; + this.progressBar1.Minimum = 0D; + this.progressBar1.Name = "progressBar1"; + this.progressBar1.ProgressColor = System.Drawing.Color.Navy; + this.progressBar1.ShowText = false; + this.progressBar1.Size = new System.Drawing.Size(312, 28); + this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; + this.progressBar1.TabIndex = 0; + this.progressBar1.Text = "progressBar1"; + this.progressBar1.Value = 0D; + // // panel4 // this.panel4.Controls.Add(this.label7); @@ -248,23 +265,6 @@ this.label7.TabIndex = 0; this.label7.Text = "GenericName Setup has been completed."; // - // progressBar1 - // - this.progressBar1.BlockSpacing = 5; - this.progressBar1.BlockWidth = 20; - this.progressBar1.Location = new System.Drawing.Point(3, 115); - this.progressBar1.MarqueeWidth = 125; - this.progressBar1.Maximum = 100D; - this.progressBar1.Minimum = 0D; - this.progressBar1.Name = "progressBar1"; - this.progressBar1.ProgressColor = System.Drawing.Color.Navy; - this.progressBar1.ShowText = false; - this.progressBar1.Size = new System.Drawing.Size(312, 28); - this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Blocks; - this.progressBar1.TabIndex = 0; - this.progressBar1.Text = "progressBar1"; - this.progressBar1.Value = 0D; - // // Win95Installer // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs index 519e14d..fa1e0ce 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95WindowsExplorer.cs @@ -14,6 +14,7 @@ using Newtonsoft.Json; using Histacom2.Engine.Template; using System.Diagnostics; using Histacom2.OS.Win95.Win95Apps._12padamViruses; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs index 4dd74fb..1a0836b 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicFTPClient.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using Histacom2.Engine; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { diff --git a/Histacom2/OS/Win98/Win98.cs b/Histacom2/OS/Win98/Win98.cs index f4a9c07..32b7aca 100644 --- a/Histacom2/OS/Win98/Win98.cs +++ b/Histacom2/OS/Win98/Win98.cs @@ -11,6 +11,7 @@ using Histacom2.OS.Win95.Win95Apps; using Histacom2.OS.Win95.Win95Apps.Story; using static Histacom2.Engine.SaveSystem; using Histacom2.OS.Win98.Win98Apps; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win98 { @@ -232,7 +233,7 @@ namespace Histacom2.OS.Win98 private void installerTestToolStripMenuItem_Click(object sender, EventArgs e) { - Win95Installer openinstaller = new Win95Installer("Testing"); + WinClassicInstaller openinstaller = new WinClassicInstaller("Testing"); WinClassic app = wm.Init(openinstaller, "Installer", null, false, true); AddTaskBarItem(app, app.Tag.ToString(), "Installer", null); diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs index aa8aae4..5a252ef 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.Designer.cs @@ -58,6 +58,8 @@ this.classicLabel13 = new Histacom2.Engine.UI.ClassicLabel(); this.classicButton6 = new Histacom2.Engine.UI.ClassicButton(); this.classicLabel14 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel15 = new Histacom2.Engine.UI.ClassicLabel(); + this.classicLabel16 = new Histacom2.Engine.UI.ClassicLabel(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -99,7 +101,7 @@ this.panel1.Controls.Add(this.classicLabel8); this.panel1.Controls.Add(this.classicButton1); this.panel1.Controls.Add(this.panel2); - this.panel1.Location = new System.Drawing.Point(104, 90); + this.panel1.Location = new System.Drawing.Point(104, 78); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(225, 209); this.panel1.TabIndex = 2; @@ -126,6 +128,7 @@ this.classicButton1.Size = new System.Drawing.Size(72, 23); this.classicButton1.TabIndex = 1; this.classicButton1.Text = "Download"; + this.classicButton1.Click += new System.EventHandler(this.classicButton1_Click); // // panel2 // @@ -158,7 +161,7 @@ this.panel3.Controls.Add(this.classicLabel13); this.panel3.Controls.Add(this.classicButton6); this.panel3.Controls.Add(this.panel4); - this.panel3.Location = new System.Drawing.Point(630, 90); + this.panel3.Location = new System.Drawing.Point(630, 78); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(225, 209); this.panel3.TabIndex = 3; @@ -194,7 +197,7 @@ this.panel5.Controls.Add(this.classicLabel10); this.panel5.Controls.Add(this.classicButton3); this.panel5.Controls.Add(this.panel6); - this.panel5.Location = new System.Drawing.Point(369, 90); + this.panel5.Location = new System.Drawing.Point(369, 78); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(225, 209); this.panel5.TabIndex = 4; @@ -225,8 +228,9 @@ this.panel7.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel7.BackColor = System.Drawing.Color.Lime; this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel7.Controls.Add(this.classicLabel15); this.panel7.Controls.Add(this.panel8); - this.panel7.Location = new System.Drawing.Point(104, 314); + this.panel7.Location = new System.Drawing.Point(104, 302); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(353, 135); this.panel7.TabIndex = 5; @@ -257,8 +261,9 @@ this.panel9.Anchor = System.Windows.Forms.AnchorStyles.Top; this.panel9.BackColor = System.Drawing.Color.Lime; this.panel9.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel9.Controls.Add(this.classicLabel16); this.panel9.Controls.Add(this.panel10); - this.panel9.Location = new System.Drawing.Point(502, 314); + this.panel9.Location = new System.Drawing.Point(502, 302); this.panel9.Name = "panel9"; this.panel9.Size = new System.Drawing.Size(353, 135); this.panel9.TabIndex = 6; @@ -298,6 +303,7 @@ this.classicButton2.Size = new System.Drawing.Size(72, 23); this.classicButton2.TabIndex = 3; this.classicButton2.Text = "Download"; + this.classicButton2.Click += new System.EventHandler(this.classicButton2_Click); // // classicLabel9 // @@ -324,7 +330,7 @@ // // classicLabel10 // - this.classicLabel10.Location = new System.Drawing.Point(3, 49); + this.classicLabel10.Location = new System.Drawing.Point(4, 49); this.classicLabel10.Name = "classicLabel10"; this.classicLabel10.Size = new System.Drawing.Size(107, 13); this.classicLabel10.TabIndex = 5; @@ -347,7 +353,7 @@ // // classicLabel11 // - this.classicLabel11.Location = new System.Drawing.Point(3, 79); + this.classicLabel11.Location = new System.Drawing.Point(4, 79); this.classicLabel11.Name = "classicLabel11"; this.classicLabel11.Size = new System.Drawing.Size(107, 13); this.classicLabel11.TabIndex = 7; @@ -408,6 +414,28 @@ this.classicLabel14.TabIndex = 7; this.classicLabel14.Text = "© 12padams, 1999"; // + // classicLabel15 + // + this.classicLabel15.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel15.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel15.ForeColor = System.Drawing.Color.Navy; + this.classicLabel15.Location = new System.Drawing.Point(90, 44); + this.classicLabel15.Name = "classicLabel15"; + this.classicLabel15.Size = new System.Drawing.Size(167, 13); + this.classicLabel15.TabIndex = 2; + this.classicLabel15.Text = "Y2K: A Global Computer Crisis"; + // + // classicLabel16 + // + this.classicLabel16.Anchor = System.Windows.Forms.AnchorStyles.Top; + this.classicLabel16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline))), System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.classicLabel16.ForeColor = System.Drawing.Color.Navy; + this.classicLabel16.Location = new System.Drawing.Point(122, 44); + this.classicLabel16.Name = "classicLabel16"; + this.classicLabel16.Size = new System.Drawing.Size(109, 13); + this.classicLabel16.TabIndex = 3; + this.classicLabel16.Text = "Microsoft Wi n d o w s"; + // // _12padams1999 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -469,5 +497,7 @@ private Engine.UI.ClassicLabel classicLabel13; private Engine.UI.ClassicButton classicButton6; private Engine.UI.ClassicLabel classicLabel14; + private Engine.UI.ClassicLabel classicLabel15; + private Engine.UI.ClassicLabel classicLabel16; } } diff --git a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs index 30e56a0..0733144 100644 --- a/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs +++ b/Histacom2/OS/Win98/Win98Apps/IE4Sites/12padams1999.cs @@ -7,6 +7,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using Histacom2.Engine; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win98.Win98Apps.IE4Sites { @@ -16,5 +18,19 @@ namespace Histacom2.OS.Win98.Win98Apps.IE4Sites { InitializeComponent(); } + + private void classicButton2_Click(object sender, EventArgs e) + { + WinClassicDownloader opendownload = new WinClassicDownloader(); + WindowManager wm = new WindowManager(); + wm.Init(opendownload, "Downloader", null, false, true); + opendownload.appName.Text = "Downloading: Web Chat 1999"; + opendownload.amountToDL = 37; + } + + private void classicButton1_Click(object sender, EventArgs e) + { + + } } } diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs index 936d89e..a0cbadb 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicWindowsExplorer.cs @@ -13,6 +13,8 @@ using Histacom2.Engine; using Newtonsoft.Json; using System.Diagnostics; using Histacom2.Engine.Template; +using Histacom2.OS.Win98.Win98Apps; +using Histacom2.GlobalPrograms; namespace Histacom2.OS.Win95.Win95Apps { @@ -304,30 +306,22 @@ namespace Histacom2.OS.Win95.Win95Apps break; case "ie": if (TitleScreen.frm95.ie != null) { wm.StartInfobox95("Error Opening Internet Explorer", "An instance of Internet Explorer 4 is already open.", InfoboxType.Warning, InfoboxButtons.OK); return; } - TitleScreen.frm95.ie = wm.Init(new WinClassicIE3(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); + TitleScreen.frm95.ie = wm.Init(new WinClassicIE4(), "Internet Explorer 4", Properties.Resources.Win95IconIE4, true, true); Program.AddTaskbarItem(TitleScreen.frm95.ie, TitleScreen.frm95.ie.Tag.ToString(), "Internet Explorer 4", Properties.Resources.Win95IconIE4); TitleScreen.frm95.ie.BringToFront(); TitleScreen.frm95.ie.FormClosing += new FormClosingEventHandler(TitleScreen.frm95.InternetExplorer4_Closing); break; - case "web chat setup": - Win95Installer inst = new Win95Installer("Web Chat 1998"); + case "web chat 99 setup": + Win95Installer inst = new Win95Installer("Web Chat 1999"); inst.InstallCompleted += (sendr, args) => TitleScreen.frm95.WebChatToolStripMenuItem.Visible = true; WinClassic appInstaller = wm.Init(inst, "Web Chat Setup", null, true, true); Program.AddTaskbarItem(appInstaller, appInstaller.Tag.ToString(), "Web Chat Setup", null); appInstaller.BringToFront(); - break; - case "ftp client setup": - Win95Installer instFtp = new Win95Installer("FTP Client"); - instFtp.InstallCompleted += (sendr, args) => TitleScreen.frm95.FTPClientToolStripMenuItem.Visible = true; - WinClassic appFtp = wm.Init(instFtp, "FTP Client Setup", null, true, true); - Program.AddTaskbarItem(appFtp, appFtp.Tag.ToString(), "FTP Client Setup", null); - appFtp.BringToFront(); - break; case "time distorter setup": - Win95Installer instTd = new Win95Installer("Time Distorter 0.1"); + Win95Installer instTd = new Win95Installer("Time Distorter 0.2"); instTd.InstallCompleted += (sendr, args) => { TitleScreen.frm95.TimeDistorterToolStripMenuItem.Visible = true; diff --git a/Histacom2/Properties/Resources.resx b/Histacom2/Properties/Resources.resx index 465f30a..366c7a9 100644 --- a/Histacom2/Properties/Resources.resx +++ b/Histacom2/Properties/Resources.resx @@ -1954,4 +1954,7 @@ ..\Resources\IE4\IE4Home_WinTechLogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\WinClassic\WinClassicInstallSidebar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Histacom2/Properties/Resources1.Designer.cs b/Histacom2/Properties/Resources1.Designer.cs index d8580ec..465250d 100644 --- a/Histacom2/Properties/Resources1.Designer.cs +++ b/Histacom2/Properties/Resources1.Designer.cs @@ -1713,6 +1713,16 @@ namespace Histacom2.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap WinClassicInstallSidebar { + get { + object obj = ResourceManager.GetObject("WinClassicInstallSidebar", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png b/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png new file mode 100644 index 0000000..e482268 Binary files /dev/null and b/Histacom2/Resources/WinClassic/WinClassicInstallSidebar.png differ -- cgit v1.2.3