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.Engine/Histacom2.Engine.csproj | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'Histacom2.Engine/Histacom2.Engine.csproj') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 361672e..fb64648 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -84,6 +84,12 @@ WinClassic.cs + + Form + + + WinXP.cs + UserControl @@ -123,6 +129,9 @@ WinClassic.cs + + WinXP.cs + ClassicButton.cs @@ -130,6 +139,18 @@ + + + + + + + + + + + + -- 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.Engine/Histacom2.Engine.csproj') 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 60af0b389dfd98f05278f3259485d1d2349d2012 Mon Sep 17 00:00:00 2001 From: lempamo Date: Fri, 8 Sep 2017 11:03:22 -0400 Subject: WIP ClassicTextbox --- Histacom2.Engine/Histacom2.Engine.csproj | 3 +++ Histacom2.Engine/Theme.cs | 10 ++++++++ Histacom2.Engine/UI/ClassicTextbox.cs | 44 ++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 Histacom2.Engine/UI/ClassicTextbox.cs (limited to 'Histacom2.Engine/Histacom2.Engine.csproj') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 9b186d8..e8b62bc 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -94,6 +94,9 @@ Component + + Component + Component diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 5b5ae50..8385062 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -24,6 +24,8 @@ namespace Histacom2.Engine public Font buttonFont { get; set; } + public Color windowColor { get; set; } + public Color activeTitleBarColor { get; set; } public Color activeTitleTextColor { get; set; } public Color inactiveTitleBarColor { get; set; } @@ -52,6 +54,8 @@ namespace Histacom2.Engine buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + windowColor = Color.White; + activeTitleBarColor = Color.Navy; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.Gray; @@ -80,6 +84,8 @@ namespace Histacom2.Engine buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + windowColor = Color.White; + activeTitleBarColor = Color.Navy; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.Gray; @@ -108,6 +114,8 @@ namespace Histacom2.Engine buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold); + windowColor = Color.FromArgb(184, 184, 184); + activeTitleBarColor = Color.Teal; activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.FromArgb(72, 72, 72); @@ -132,6 +140,8 @@ namespace Histacom2.Engine buttonFont = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Bold); + windowColor = Color.White; + activeTitleBarColor = Color.FromArgb(224, 0, 0); activeTitleTextColor = Color.White; inactiveTitleBarColor = Color.FromArgb(96, 168, 128); diff --git a/Histacom2.Engine/UI/ClassicTextbox.cs b/Histacom2.Engine/UI/ClassicTextbox.cs new file mode 100644 index 0000000..efe85a4 --- /dev/null +++ b/Histacom2.Engine/UI/ClassicTextbox.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.Engine.UI +{ + public class ClassicTextbox : Control + { + public ClassicTextbox() : base() + { + + } + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + + var textboxcolor = Color.Silver; + if (SaveSystem.currentTheme != null) textboxcolor = SaveSystem.currentTheme.windowColor; + + if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; + else BackColor = Color.White; + + var _lightBack = Paintbrush.GetLightFromColor(textboxcolor); + var _darkBack = Paintbrush.GetDarkFromColor(textboxcolor); + + var g = e.Graphics; + g.Clear(BackColor); + + g.DrawLine(new Pen(_darkBack), 0, 0, Width - 2, 0); + g.DrawLine(new Pen(_lightBack), Width - 1, 0, Width - 1, Height - 1); + g.DrawLine(new Pen(_lightBack), 0, Height - 1, Width - 1, Height - 1); + g.DrawLine(new Pen(_darkBack), 0, 0, 0, Height - 2); + g.DrawLine(Pens.Black, 1, 1, Width - 3, 1); + g.DrawLine(Pens.Black, 1, 1, 1, Height - 3); + g.DrawLine(new Pen(textboxcolor), 1, Height - 2, Width - 2, Height - 2); + g.DrawLine(new Pen(textboxcolor), Width - 2, Height - 2, Width - 2, 1); + } + } +} -- cgit v1.2.3 From ab9f118edb06826ed49c0b46bb1bce38d407e4f6 Mon Sep 17 00:00:00 2001 From: lempamo Date: Tue, 12 Sep 2017 09:51:26 -0400 Subject: various classic control things --- Histacom2.Engine/Histacom2.Engine.csproj | 3 + Histacom2.Engine/Paintbrush.cs | 1 + Histacom2.Engine/UI/ClassicButton.cs | 35 +++++++-- Histacom2.Engine/UI/ClassicLabel.cs | 29 +++++++ .../OS/Win95/Win95Apps/GuessTheNumber.Designer.cs | 27 ++++--- Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs | 5 -- .../OS/Win95/Win95Apps/WebChat1998.Designer.cs | 89 ++++++++++------------ Histacom2/OS/Win95/Win95Apps/WebChat1998.resx | 5 +- .../Win95Apps/WinClassicTimeDistorter.Designer.cs | 8 +- 9 files changed, 121 insertions(+), 81 deletions(-) create mode 100644 Histacom2.Engine/UI/ClassicLabel.cs (limited to 'Histacom2.Engine/Histacom2.Engine.csproj') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index e8b62bc..69a1b02 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -94,6 +94,9 @@ Component + + Component + Component diff --git a/Histacom2.Engine/Paintbrush.cs b/Histacom2.Engine/Paintbrush.cs index 4424371..02cb49b 100644 --- a/Histacom2.Engine/Paintbrush.cs +++ b/Histacom2.Engine/Paintbrush.cs @@ -56,6 +56,7 @@ namespace Histacom2.Engine public static Color GetDarkFromColor(Color basecolor) { + if (basecolor == Color.Silver) return Color.Gray; if (basecolor == Color.FromArgb(112, 112, 112)) return Color.FromArgb(72, 72, 72); if (basecolor == Color.FromArgb(169, 200, 169)) return Color.FromArgb(95, 153, 95); return ControlPaint.Dark(basecolor, 70); diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index b761504..1a77964 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -8,14 +8,26 @@ using System.Windows.Forms; namespace Histacom2.Engine.UI { - public class ClassicButton : Control + public class ClassicButton : Control, IButtonControl { private Color _lightBack; private Color _darkBack; - private Font _font; private bool _pressing = false; + public DialogResult DialogResult + { + get + { + throw new NotImplementedException(); + } + + set + { + throw new NotImplementedException(); + } + } + public ClassicButton() : base() { if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; @@ -26,8 +38,8 @@ namespace Histacom2.Engine.UI if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; else ForeColor = Color.Black; - if (SaveSystem.currentTheme != null) _font = SaveSystem.currentTheme.buttonFont; - else _font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); + if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; + else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); MouseDown += (s, e) => { _pressing = true; Invalidate(); }; MouseUp += (s, e) => { _pressing = false; Invalidate(); }; @@ -59,7 +71,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) + 2, 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,9 +80,18 @@ 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) + 1, sf); + g.DrawString(Text, Font, new SolidBrush(ForeColor), (Width / 2) + Padding.Left, (Height / 2) - (g.MeasureString(Text, Font).Height / 2) + 1, sf); } } - + + public void NotifyDefault(bool value) + { + + } + + public void PerformClick() + { + this.OnClick(new EventArgs()); + } } } diff --git a/Histacom2.Engine/UI/ClassicLabel.cs b/Histacom2.Engine/UI/ClassicLabel.cs new file mode 100644 index 0000000..0b9d9c2 --- /dev/null +++ b/Histacom2.Engine/UI/ClassicLabel.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.Engine.UI +{ + public class ClassicLabel : Control + { + public ClassicLabel() + { + + } + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + var gfx = e.Graphics; + gfx.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + + gfx.DrawString(Text, Font, new SolidBrush(ForeColor), 0, 0); + } + } +} diff --git a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs index cc266c0..6102f9f 100644 --- a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.Designer.cs @@ -31,12 +31,10 @@ this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox1 = new Histacom2.Engine.UI.ClassicButton(); this.pictureBox2 = new System.Windows.Forms.PictureBox(); - this.pictureBox3 = new System.Windows.Forms.PictureBox(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.pictureBox3 = new Histacom2.Engine.UI.ClassicButton(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.SuspendLayout(); // // label1 @@ -68,12 +66,13 @@ // // pictureBox1 // - this.pictureBox1.BackgroundImage = global::Histacom2.Properties.Resources.GTN95_Check; + this.pictureBox1.BackColor = System.Drawing.Color.Silver; + this.pictureBox1.ForeColor = System.Drawing.Color.Black; this.pictureBox1.Location = new System.Drawing.Point(191, 30); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(55, 27); - this.pictureBox1.TabIndex = 3; - this.pictureBox1.TabStop = false; + this.pictureBox1.TabIndex = 5; + this.pictureBox1.Text = "Check"; this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click); // // pictureBox2 @@ -86,12 +85,14 @@ // // pictureBox3 // - this.pictureBox3.BackgroundImage = global::Histacom2.Properties.Resources.GTN95_Restart; + this.pictureBox3.BackColor = System.Drawing.Color.Silver; + this.pictureBox3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.pictureBox3.ForeColor = System.Drawing.Color.Black; this.pictureBox3.Location = new System.Drawing.Point(19, 62); this.pictureBox3.Name = "pictureBox3"; this.pictureBox3.Size = new System.Drawing.Size(227, 23); - this.pictureBox3.TabIndex = 5; - this.pictureBox3.TabStop = false; + this.pictureBox3.TabIndex = 0; + this.pictureBox3.Text = "Restart"; this.pictureBox3.Click += new System.EventHandler(this.pictureBox3_Click); // // GuessTheNumber @@ -107,9 +108,7 @@ this.Controls.Add(this.label1); this.Name = "GuessTheNumber"; this.Size = new System.Drawing.Size(268, 100); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -120,8 +119,8 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.PictureBox pictureBox1; + private Engine.UI.ClassicButton pictureBox1; private System.Windows.Forms.PictureBox pictureBox2; - private System.Windows.Forms.PictureBox pictureBox3; + private Engine.UI.ClassicButton pictureBox3; } } diff --git a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs index 72adc0e..4766c8d 100644 --- a/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs +++ b/Histacom2/OS/Win95/Win95Apps/GuessTheNumber.cs @@ -21,11 +21,6 @@ namespace Histacom2.OS.Win95.Win95Apps rnd = new Random(); num = rnd.Next(0, 101); - - pictureBox1.MouseDown += (s, a) => pictureBox1.BackgroundImage = Properties.Resources.GTN95_CheckClicked; - pictureBox1.MouseUp += (s, a) => pictureBox1.BackgroundImage = Properties.Resources.GTN95_Check; - pictureBox3.MouseDown += (s, a) => pictureBox3.BackgroundImage = Properties.Resources.GTN95_RestartClicked; - pictureBox3.MouseUp += (s, a) => pictureBox3.BackgroundImage = Properties.Resources.GTN95_Restart; } private void pictureBox3_Click(object sender, EventArgs e) diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs index 8a32029..ea9d0cd 100644 --- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.Designer.cs @@ -29,28 +29,28 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - this.resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WebChat1998)); this.Chat = new System.Windows.Forms.Timer(this.components); this.listBox1 = new System.Windows.Forms.ListBox(); - this.label1 = new System.Windows.Forms.Label(); + this.label1 = new Histacom2.Engine.UI.ClassicLabel(); this.history = new System.Windows.Forms.TextBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.label5 = new System.Windows.Forms.Label(); - this.button5 = new System.Windows.Forms.Button(); - this.label6 = new System.Windows.Forms.Label(); + this.label5 = new Histacom2.Engine.UI.ClassicLabel(); + this.button5 = new Histacom2.Engine.UI.ClassicButton(); + this.label6 = new Histacom2.Engine.UI.ClassicLabel(); this.typechat = new System.Windows.Forms.TextBox(); this.login = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); + this.label2 = new Histacom2.Engine.UI.ClassicLabel(); this.txtscreenname = new System.Windows.Forms.TextBox(); - this.button1 = new System.Windows.Forms.Button(); - this.label3 = new System.Windows.Forms.Label(); - this.label4 = new System.Windows.Forms.Label(); + this.button1 = new Histacom2.Engine.UI.ClassicButton(); + this.label3 = new Histacom2.Engine.UI.ClassicLabel(); + this.label4 = new Histacom2.Engine.UI.ClassicLabel(); this.textBox1 = new System.Windows.Forms.TextBox(); this.textBox2 = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); + this.label7 = new Histacom2.Engine.UI.ClassicLabel(); + this.button2 = new Histacom2.Engine.UI.ClassicButton(); + this.button3 = new Histacom2.Engine.UI.ClassicButton(); + this.button4 = new Histacom2.Engine.UI.ClassicButton(); this.panel1.SuspendLayout(); this.login.SuspendLayout(); this.SuspendLayout(); @@ -73,8 +73,7 @@ // label1 // this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(501, 13); + this.label1.Location = new System.Drawing.Point(506, 13); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(85, 13); this.label1.TabIndex = 1; @@ -107,7 +106,6 @@ // // label5 // - this.label5.AutoSize = true; this.label5.Location = new System.Drawing.Point(13, 18); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(84, 13); @@ -116,17 +114,18 @@ // // button5 // - this.button5.Location = new System.Drawing.Point(97, 13); + this.button5.BackColor = System.Drawing.Color.Silver; + this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button5.ForeColor = System.Drawing.Color.Black; + this.button5.Location = new System.Drawing.Point(101, 13); this.button5.Name = "button5"; this.button5.Size = new System.Drawing.Size(75, 23); this.button5.TabIndex = 0; this.button5.Text = "Download"; - this.button5.UseVisualStyleBackColor = true; // // label6 // this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.label6.AutoSize = true; this.label6.Location = new System.Drawing.Point(504, 374); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(62, 13); @@ -157,7 +156,6 @@ // // label2 // - this.label2.AutoSize = true; this.label2.Location = new System.Drawing.Point(328, 161); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(149, 13); @@ -174,19 +172,18 @@ // button1 // this.button1.BackColor = System.Drawing.Color.Silver; - this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button1.ForeColor = System.Drawing.Color.Black; this.button1.Location = new System.Drawing.Point(331, 208); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(151, 23); this.button1.TabIndex = 4; this.button1.Text = "Login"; - this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.Button1_Click); // // label3 // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(196, 16); + this.label3.Location = new System.Drawing.Point(202, 16); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(112, 13); this.label3.TabIndex = 3; @@ -194,7 +191,6 @@ // // label4 // - this.label4.AutoSize = true; this.label4.Location = new System.Drawing.Point(118, 56); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(93, 13); @@ -229,48 +225,48 @@ // // label7 // - this.label7.AutoSize = true; this.label7.Location = new System.Drawing.Point(22, 13); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(406, 13); + this.label7.Size = new System.Drawing.Size(441, 13); this.label7.TabIndex = 7; this.label7.Text = "To speak, just type in the bottom textbox, then click the Speak button or press E" + "nter."; // // button2 // - this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right) - | System.Windows.Forms.AnchorStyles.Right))); + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.button2.BackColor = System.Drawing.Color.Silver; - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button2.ForeColor = System.Drawing.Color.Black; this.button2.Location = new System.Drawing.Point(422, 415); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(71, 23); this.button2.TabIndex = 8; this.button2.Text = "Speak"; - this.button2.UseVisualStyleBackColor = true; this.button2.Click += new System.EventHandler(this.Button2_Click); // // button3 // this.button3.BackColor = System.Drawing.Color.Silver; - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button3.ForeColor = System.Drawing.Color.Black; this.button3.Location = new System.Drawing.Point(149, 427); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.TabIndex = 9; this.button3.Text = "Paul"; - this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.Button3_Click); // // button4 // + this.button4.BackColor = System.Drawing.Color.Silver; + this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.button4.ForeColor = System.Drawing.Color.Black; this.button4.Location = new System.Drawing.Point(235, 427); this.button4.Name = "button4"; this.button4.Size = new System.Drawing.Size(75, 23); this.button4.TabIndex = 10; this.button4.Text = "Bill"; - this.button4.UseVisualStyleBackColor = true; this.button4.Click += new System.EventHandler(this.Button4_Click); // // WebChat1998 @@ -293,7 +289,6 @@ this.Size = new System.Drawing.Size(724, 462); this.Load += new System.EventHandler(this.WebChat1998_Load); this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); this.login.ResumeLayout(false); this.login.PerformLayout(); this.ResumeLayout(false); @@ -305,25 +300,25 @@ private System.Windows.Forms.Timer Chat; private System.Windows.Forms.ListBox listBox1; - private System.Windows.Forms.Label label1; + private Histacom2.Engine.UI.ClassicLabel label1; private System.Windows.Forms.TextBox history; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Label label5; + private Histacom2.Engine.UI.ClassicLabel label6; + private Histacom2.Engine.UI.ClassicButton button5; + private Histacom2.Engine.UI.ClassicLabel label5; private System.Windows.Forms.TextBox typechat; private System.Windows.Forms.Panel login; private System.Windows.Forms.TextBox textBox2; private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.Label label4; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.Button button1; + private Histacom2.Engine.UI.ClassicLabel label4; + private Histacom2.Engine.UI.ClassicLabel label3; + private Histacom2.Engine.UI.ClassicButton button1; private System.Windows.Forms.TextBox txtscreenname; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.Button button3; - private System.Windows.Forms.Button button4; + private Histacom2.Engine.UI.ClassicLabel label2; + private Histacom2.Engine.UI.ClassicLabel label7; + private Histacom2.Engine.UI.ClassicButton button2; + private Histacom2.Engine.UI.ClassicButton button3; + private Histacom2.Engine.UI.ClassicButton button4; private System.ComponentModel.ComponentResourceManager resources; } } diff --git a/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx b/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx index f1d3183..61225ed 100644 --- a/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx +++ b/Histacom2/OS/Win95/Win95Apps/WebChat1998.resx @@ -117,10 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + 17, 17 - + If you do not agree to the following rules below DO NOT log into the chat: diff --git a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs index ca74bd4..33ab4f2 100644 --- a/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/WinClassicTimeDistorter.Designer.cs @@ -34,7 +34,7 @@ this.lblCurrent = new System.Windows.Forms.Label(); this.lblYear = new System.Windows.Forms.Label(); this.lblTo = new System.Windows.Forms.Label(); - this.btnGo = new System.Windows.Forms.Button(); + this.btnGo = new Histacom2.Engine.UI.ClassicButton(); this.lblCountDown = new System.Windows.Forms.Label(); this.countDownTimer = new System.Windows.Forms.Timer(this.components); this.SuspendLayout(); @@ -104,14 +104,12 @@ // // btnGo // - this.btnGo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnGo.Location = new System.Drawing.Point(162, 133); this.btnGo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnGo.Name = "btnGo"; this.btnGo.Size = new System.Drawing.Size(124, 23); this.btnGo.TabIndex = 7; - this.btnGo.Text = "Go to destination year"; - this.btnGo.UseVisualStyleBackColor = true; + this.btnGo.Text = "Go To Destination Year"; this.btnGo.Click += new System.EventHandler(this.btnGo_Click); // // lblCountDown @@ -158,7 +156,7 @@ private System.Windows.Forms.Label lblYear; internal System.Windows.Forms.Label lblCountDown; private System.Windows.Forms.Timer countDownTimer; - internal System.Windows.Forms.Button btnGo; + internal Histacom2.Engine.UI.ClassicButton btnGo; internal System.Windows.Forms.Label lblTo; internal System.Windows.Forms.Label lblDestYear; } -- cgit v1.2.3 From e4bb33426e4e1a3b5c5ef36866ef2947a7d4356d Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 13 Sep 2017 11:13:17 -0400 Subject: start menu stuffs --- Histacom2.Engine/Histacom2.Engine.csproj | 3 + Histacom2.Engine/Theme.cs | 15 + Histacom2.Engine/UI/ClassicStartMenuItem.cs | 57 +++ Histacom2/OS/Win95/Win95.Designer.cs | 469 ++++++++++---------- Histacom2/OS/Win95/Win95.cs | 30 +- Histacom2/OS/Win95/Win95.resx | 488 ++++++++++----------- Histacom2/OS/Win98/Win98.Designer.cs | 132 +++--- Histacom2/OS/Win98/Win98.resx | 2 +- Histacom2/Resources/WinClassic/Win95SideBar.png | Bin 843 -> 724 bytes .../Resources/WinClassic/WinClassicPrograms.png | Bin 425 -> 426 bytes Histacom2/TitleScreen.cs | 6 +- 11 files changed, 653 insertions(+), 549 deletions(-) create mode 100644 Histacom2.Engine/UI/ClassicStartMenuItem.cs (limited to 'Histacom2.Engine/Histacom2.Engine.csproj') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 69a1b02..050ad0c 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -97,6 +97,9 @@ Component + + Component + Component diff --git a/Histacom2.Engine/Theme.cs b/Histacom2.Engine/Theme.cs index 8385062..2d4633f 100644 --- a/Histacom2.Engine/Theme.cs +++ b/Histacom2.Engine/Theme.cs @@ -31,6 +31,9 @@ namespace Histacom2.Engine public Color inactiveTitleBarColor { get; set; } public Color inactiveTitleTextColor { get; set; } + public Color selectedBackColor { get; set; } + public Color selectedTextColor { get; set; } + public Image defaultWallpaper { get; set; } public string themeName { get; set; } @@ -61,6 +64,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.Gray; inactiveTitleTextColor = Color.Silver; + selectedBackColor = Color.Navy; + selectedTextColor = Color.White; + defaultWallpaper = null; themeName = "default95"; } @@ -91,6 +97,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.Gray; inactiveTitleTextColor = Color.Silver; + selectedBackColor = Color.Navy; + selectedTextColor = Color.White; + defaultWallpaper = null; themeName = "default98"; } @@ -121,6 +130,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.FromArgb(72, 72, 72); inactiveTitleTextColor = Color.Gray; + selectedBackColor = Color.Teal; + selectedTextColor = Color.White; + defaultWallpaper = Properties.Resources.Win95PlusDangerousCreaturesWallpaper; themeName = "dangeranimals"; } @@ -147,6 +159,9 @@ namespace Histacom2.Engine inactiveTitleBarColor = Color.FromArgb(96, 168, 128); inactiveTitleTextColor = Color.FromArgb(216, 224, 216); + selectedBackColor = Color.FromArgb(248, 255, 160); + selectedTextColor = Color.Black; + defaultWallpaper = Properties.Resources.Win95PlusInsideComputerWallpaper; themeName = "insidepc"; } diff --git a/Histacom2.Engine/UI/ClassicStartMenuItem.cs b/Histacom2.Engine/UI/ClassicStartMenuItem.cs new file mode 100644 index 0000000..49aecd9 --- /dev/null +++ b/Histacom2.Engine/UI/ClassicStartMenuItem.cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace Histacom2.Engine.UI +{ + public class ClassicStartMenuItem : ToolStripMenuItem + { + public ClassicStartMenuItem() + { + + } + + protected override void OnPaint(PaintEventArgs e) + { + base.OnPaint(e); + if (SaveSystem.currentTheme != null) e.Graphics.Clear(SaveSystem.currentTheme.threeDObjectsColor); + else e.Graphics.Clear(BackColor); + if (Selected) + { + if (SaveSystem.currentTheme != null) e.Graphics.Clear(SaveSystem.currentTheme.selectedBackColor); + else e.Graphics.Clear(Color.Navy); + } + + e.Graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixelGridFit; + + StringFormat sf = new StringFormat(); + sf.HotkeyPrefix = System.Drawing.Text.HotkeyPrefix.Show; + + e.Graphics.DrawImage(Image, 0 + Padding.Left - Padding.Right, 0); + if (!Selected) { + e.Graphics.DrawString(Text, new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular), Brushes.Black, 38, 11, sf); + + if (DropDownItems.Count > 0) + { + e.Graphics.DrawPolygon(Pens.Black, new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + e.Graphics.FillPolygon(Brushes.Black, new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + } + } else + { + if (SaveSystem.currentTheme != null) + { + e.Graphics.DrawString(Text, new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular), new SolidBrush(SaveSystem.currentTheme.selectedTextColor), 38, 11, sf); + if (DropDownItems.Count > 0) + { + e.Graphics.DrawPolygon(new Pen(SaveSystem.currentTheme.selectedTextColor), new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + e.Graphics.FillPolygon(new SolidBrush(SaveSystem.currentTheme.selectedTextColor), new Point[] { new Point(121, 11), new Point(124, 14), new Point(121, 17) }); + } + } + } + } + } +} diff --git a/Histacom2/OS/Win95/Win95.Designer.cs b/Histacom2/OS/Win95/Win95.Designer.cs index f08b474..6e82ab1 100644 --- a/Histacom2/OS/Win95/Win95.Designer.cs +++ b/Histacom2/OS/Win95/Win95.Designer.cs @@ -41,7 +41,19 @@ namespace Histacom2.OS.Win95 this.startbutton = new System.Windows.Forms.PictureBox(); this.startmenu = new System.Windows.Forms.Panel(); this.startmenuitems = new System.Windows.Forms.MenuStrip(); - this.ProgramsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ossidestartmenu = new System.Windows.Forms.Panel(); + this.osimage = new System.Windows.Forms.PictureBox(); + this.clockTimer = new System.Windows.Forms.Timer(this.components); + this.desktopImages = new System.Windows.Forms.ImageList(this.components); + this.desktopicons = new System.Windows.Forms.ListView(); + this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); + this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.desktopupdate = new System.Windows.Forms.Timer(this.components); + this.ProgramsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.AccessoriesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.CommunicationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.InternetConnectionWizardToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -82,35 +94,23 @@ namespace Histacom2.OS.Win95 this.WebChatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TimeDistorterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.FTPClientToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DocumentsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DocumentsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.downloaderTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.installerTestToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.storyTest1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SettingsToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.ControlPanelToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PrintersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.TaskbarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.FindToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FindToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.FilesOrFoldersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ComputerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.OnTheInternetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.PeopleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.HelpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RunToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SuspendToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShutdownToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ossidestartmenu = new System.Windows.Forms.Panel(); - this.osimage = new System.Windows.Forms.PictureBox(); - this.clockTimer = new System.Windows.Forms.Timer(this.components); - this.desktopImages = new System.Windows.Forms.ImageList(this.components); - this.desktopicons = new System.Windows.Forms.ListView(); - this.rightclickbackproperties = new System.Windows.Forms.ContextMenuStrip(this.components); - this.NewToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.FolderToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.TextDocumentToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.PropertiesToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.desktopupdate = new System.Windows.Forms.Timer(this.components); + this.HelpToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.RunToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.SuspendToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); + this.ShutdownToolStripMenuItem = new Histacom2.Engine.UI.ClassicStartMenuItem(); this.panel1.SuspendLayout(); this.taskbar.SuspendLayout(); this.clockPanel.SuspendLayout(); @@ -201,15 +201,19 @@ namespace Histacom2.OS.Win95 this.startmenu.BackColor = System.Drawing.Color.Silver; this.startmenu.Controls.Add(this.startmenuitems); this.startmenu.Controls.Add(this.ossidestartmenu); - this.startmenu.Location = new System.Drawing.Point(0, 160); + this.startmenu.Location = new System.Drawing.Point(2, 185); this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 300); + this.startmenu.Size = new System.Drawing.Size(168, 271); this.startmenu.TabIndex = 3; + this.startmenu.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenu_Paint); // // startmenuitems // + this.startmenuitems.AutoSize = false; this.startmenuitems.BackColor = System.Drawing.Color.Silver; + this.startmenuitems.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; + this.startmenuitems.GripMargin = new System.Windows.Forms.Padding(0); this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ProgramsToolStripMenuItem, this.DocumentsToolStripMenuItem, @@ -220,17 +224,136 @@ namespace Histacom2.OS.Win95 this.SuspendToolStripMenuItem, this.ShutdownToolStripMenuItem}); this.startmenuitems.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.VerticalStackWithOverflow; - this.startmenuitems.Location = new System.Drawing.Point(26, 2); - this.startmenuitems.Margin = new System.Windows.Forms.Padding(0, 0, 5, 0); + this.startmenuitems.Location = new System.Drawing.Point(26, 5); this.startmenuitems.Name = "startmenuitems"; - this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); - this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(148, 292); + this.startmenuitems.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.startmenuitems.Size = new System.Drawing.Size(137, 262); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; + this.startmenuitems.Paint += new System.Windows.Forms.PaintEventHandler(this.startmenuitems_Paint); + // + // ossidestartmenu + // + this.ossidestartmenu.Controls.Add(this.osimage); + this.ossidestartmenu.Location = new System.Drawing.Point(3, 3); + this.ossidestartmenu.Name = "ossidestartmenu"; + this.ossidestartmenu.Size = new System.Drawing.Size(21, 265); + this.ossidestartmenu.TabIndex = 4; + // + // osimage + // + this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; + this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; + this.osimage.Location = new System.Drawing.Point(0, 0); + this.osimage.Name = "osimage"; + this.osimage.Size = new System.Drawing.Size(21, 265); + this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.osimage.TabIndex = 0; + this.osimage.TabStop = false; + // + // clockTimer + // + this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); + // + // desktopImages + // + this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); + this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; + this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); + this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); + this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); + this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); + this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); + this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); + this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); + this.desktopImages.Images.SetKeyName(8, "Win95File.png"); + this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); + this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); + this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); + this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); + // + // desktopicons + // + this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; + this.desktopicons.BackColor = System.Drawing.Color.Teal; + this.desktopicons.BackgroundImageTiled = true; + this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; + this.desktopicons.ForeColor = System.Drawing.Color.White; + this.desktopicons.LargeImageList = this.desktopImages; + this.desktopicons.Location = new System.Drawing.Point(0, 0); + this.desktopicons.Name = "desktopicons"; + this.desktopicons.Size = new System.Drawing.Size(640, 480); + this.desktopicons.TabIndex = 6; + this.desktopicons.UseCompatibleStateImageBehavior = false; + this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); + this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); + this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); + this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); + // + // rightclickbackproperties + // + this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.NewToolStripMenuItem1, + this.deleteToolStripMenuItem, + this.PropertiesToolStripMenuItem1}); + this.rightclickbackproperties.Name = "ContextMenuStrip1"; + this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); + // + // NewToolStripMenuItem1 + // + this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.FolderToolStripMenuItem, + this.TextDocumentToolStripMenuItem}); + this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.NewToolStripMenuItem1.Text = "New"; + // + // FolderToolStripMenuItem + // + this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.FolderToolStripMenuItem.Text = "Folder"; + this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); + // + // TextDocumentToolStripMenuItem + // + this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); + this.TextDocumentToolStripMenuItem.Text = "Text Document"; + this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); + // + // deleteToolStripMenuItem + // + this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; + this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); + this.deleteToolStripMenuItem.Text = "Delete"; + this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); + // + // PropertiesToolStripMenuItem1 + // + this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; + this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); + this.PropertiesToolStripMenuItem1.Text = "Properties"; + this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); + // + // desktopupdate + // + this.desktopupdate.Enabled = true; + this.desktopupdate.Interval = 10000; + this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); // // ProgramsToolStripMenuItem // + this.ProgramsToolStripMenuItem.AutoSize = false; this.ProgramsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ProgramsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ProgramsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; @@ -253,9 +376,9 @@ namespace Histacom2.OS.Win95 this.ProgramsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; - this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.ProgramsToolStripMenuItem.Text = "Programs"; + this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ProgramsToolStripMenuItem.Text = "&Programs"; // // AccessoriesToolStripMenuItem // @@ -279,7 +402,7 @@ namespace Histacom2.OS.Win95 this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -293,7 +416,7 @@ namespace Histacom2.OS.Win95 this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -304,7 +427,7 @@ namespace Histacom2.OS.Win95 this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image"))); this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std); // @@ -316,7 +439,7 @@ namespace Histacom2.OS.Win95 this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image"))); this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -333,7 +456,7 @@ namespace Histacom2.OS.Win95 this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -344,7 +467,7 @@ namespace Histacom2.OS.Win95 this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image"))); this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -355,7 +478,7 @@ namespace Histacom2.OS.Win95 this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image"))); this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -366,7 +489,7 @@ namespace Histacom2.OS.Win95 this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image"))); this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -377,7 +500,7 @@ namespace Histacom2.OS.Win95 this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image"))); this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // toolStripMenuItem1 @@ -391,7 +514,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem1.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.toolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(188, 28); + this.toolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.toolStripMenuItem1.Text = "System Tools"; // // toolStripMenuItem2 @@ -402,7 +525,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem2.Image"))); this.toolStripMenuItem2.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(181, 22); + this.toolStripMenuItem2.Size = new System.Drawing.Size(172, 22); this.toolStripMenuItem2.Text = "Disk Defragmenter"; // // toolStripMenuItem3 @@ -413,7 +536,7 @@ namespace Histacom2.OS.Win95 this.toolStripMenuItem3.Image = ((System.Drawing.Image)(resources.GetObject("toolStripMenuItem3.Image"))); this.toolStripMenuItem3.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(181, 22); + this.toolStripMenuItem3.Size = new System.Drawing.Size(172, 22); this.toolStripMenuItem3.Text = "ScanDisk"; // // GamesToolStripMenuItem @@ -426,7 +549,7 @@ namespace Histacom2.OS.Win95 this.GamesToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.GamesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.GamesToolStripMenuItem.Name = "GamesToolStripMenuItem"; - this.GamesToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.GamesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GamesToolStripMenuItem.Text = "Games"; // // MinsweeperToolStripMenuItem @@ -436,7 +559,7 @@ namespace Histacom2.OS.Win95 this.MinsweeperToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.MinsweeperToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicMinesweeper; this.MinsweeperToolStripMenuItem.Name = "MinsweeperToolStripMenuItem"; - this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.MinsweeperToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.MinsweeperToolStripMenuItem.Text = "Minesweeper"; this.MinsweeperToolStripMenuItem.Click += new System.EventHandler(this.MinsweeperToolStripMenuItem_Click); // @@ -448,7 +571,7 @@ namespace Histacom2.OS.Win95 this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; this.CalculatorToolStripMenuItem.Click += new System.EventHandler(this.CalculatorToolStripMenuItem_Click); // @@ -460,7 +583,7 @@ namespace Histacom2.OS.Win95 this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -471,7 +594,7 @@ namespace Histacom2.OS.Win95 this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image"))); this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -482,7 +605,7 @@ namespace Histacom2.OS.Win95 this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -494,7 +617,7 @@ namespace Histacom2.OS.Win95 this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image"))); this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -505,7 +628,7 @@ namespace Histacom2.OS.Win95 this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -516,7 +639,7 @@ namespace Histacom2.OS.Win95 this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image"))); this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -527,7 +650,7 @@ namespace Histacom2.OS.Win95 this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -545,7 +668,7 @@ namespace Histacom2.OS.Win95 this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -555,7 +678,7 @@ namespace Histacom2.OS.Win95 this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -565,7 +688,7 @@ namespace Histacom2.OS.Win95 this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -575,7 +698,7 @@ namespace Histacom2.OS.Win95 this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -584,7 +707,7 @@ namespace Histacom2.OS.Win95 this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -598,7 +721,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -607,7 +730,7 @@ namespace Histacom2.OS.Win95 this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -619,7 +742,7 @@ namespace Histacom2.OS.Win95 this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -632,7 +755,7 @@ namespace Histacom2.OS.Win95 this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -645,7 +768,7 @@ namespace Histacom2.OS.Win95 this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -657,7 +780,7 @@ namespace Histacom2.OS.Win95 this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -668,7 +791,7 @@ namespace Histacom2.OS.Win95 this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicGTNIcon; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; this.GuessTheNumberToolStripMenuItem.Click += new System.EventHandler(this.GuessTheNumberToolStripMenuItem_Click); @@ -679,7 +802,7 @@ namespace Histacom2.OS.Win95 this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -689,7 +812,7 @@ namespace Histacom2.OS.Win95 this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -699,7 +822,7 @@ namespace Histacom2.OS.Win95 this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -710,7 +833,7 @@ namespace Histacom2.OS.Win95 this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicWebchat; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; this.WebChatToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); @@ -722,7 +845,7 @@ namespace Histacom2.OS.Win95 this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Image = global::Histacom2.Properties.Resources.TimeDistorter1Icon; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; this.TimeDistorterToolStripMenuItem.Click += new System.EventHandler(this.TimeDistorterToolStripMenuItem_Click); @@ -734,13 +857,14 @@ namespace Histacom2.OS.Win95 this.FTPClientToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.FTPClientToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFTPIcon; this.FTPClientToolStripMenuItem.Name = "FTPClientToolStripMenuItem"; - this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.FTPClientToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.FTPClientToolStripMenuItem.Text = "FTP Client"; this.FTPClientToolStripMenuItem.Visible = false; this.FTPClientToolStripMenuItem.Click += new System.EventHandler(this.FTPClientToolStripMenuItem_Click); // // DocumentsToolStripMenuItem // + this.DocumentsToolStripMenuItem.AutoSize = false; this.DocumentsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.DocumentsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.DocumentsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -751,16 +875,16 @@ namespace Histacom2.OS.Win95 this.DocumentsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; - this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.DocumentsToolStripMenuItem.Text = "Documents"; + this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.DocumentsToolStripMenuItem.Text = "&Documents"; // // downloaderTestToolStripMenuItem // this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage"))); this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -769,7 +893,7 @@ namespace Histacom2.OS.Win95 this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage"))); this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -777,12 +901,13 @@ namespace Histacom2.OS.Win95 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); // // SettingsToolStripMenuItem // + this.SettingsToolStripMenuItem.AutoSize = false; this.SettingsToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.SettingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ControlPanelToolStripMenuItem, @@ -792,9 +917,9 @@ namespace Histacom2.OS.Win95 this.SettingsToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; - this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.SettingsToolStripMenuItem.Text = "Settings"; + this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SettingsToolStripMenuItem.Text = "&Settings"; // // ControlPanelToolStripMenuItem // @@ -803,7 +928,7 @@ namespace Histacom2.OS.Win95 this.ControlPanelToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95ControlPanelIcon; this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -813,7 +938,7 @@ namespace Histacom2.OS.Win95 this.PrintersToolStripMenuItem.Image = global::Histacom2.Properties.Resources.Win95PrintersFolder; this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; this.PrintersToolStripMenuItem.Click += new System.EventHandler(this.infoboxTestToolStripMenuItem_Click); // @@ -823,11 +948,12 @@ namespace Histacom2.OS.Win95 this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage"))); this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem"; - this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem // + this.FindToolStripMenuItem.AutoSize = false; this.FindToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FindToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FindToolStripMenuItem.BackgroundImage"))); this.FindToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -839,10 +965,10 @@ namespace Histacom2.OS.Win95 this.FindToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.FindToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; - this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.FindToolStripMenuItem.Text = "Find"; + this.FindToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.FindToolStripMenuItem.Text = "&Find"; // // FilesOrFoldersToolStripMenuItem // @@ -850,7 +976,7 @@ namespace Histacom2.OS.Win95 this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage"))); this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -859,7 +985,7 @@ namespace Histacom2.OS.Win95 this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage"))); this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -868,7 +994,7 @@ namespace Histacom2.OS.Win95 this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage"))); this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -877,174 +1003,60 @@ namespace Histacom2.OS.Win95 this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage"))); this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem // + this.HelpToolStripMenuItem.AutoSize = false; this.HelpToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.HelpToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicHelp; this.HelpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.HelpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; - this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.HelpToolStripMenuItem.Text = "Help"; + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.HelpToolStripMenuItem.Text = "&Help"; // // RunToolStripMenuItem // + this.RunToolStripMenuItem.AutoSize = false; this.RunToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.RunToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicRun; this.RunToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.RunToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; - this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); + this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.RunToolStripMenuItem.Text = "Run..."; + this.RunToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.RunToolStripMenuItem.Text = "&Run..."; // // SuspendToolStripMenuItem // + this.SuspendToolStripMenuItem.AutoSize = false; this.SuspendToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.SuspendToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicSuspend; this.SuspendToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; - this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.SuspendToolStripMenuItem.Text = "Suspend"; + this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.SuspendToolStripMenuItem.Text = "Suspe&nd"; // // ShutdownToolStripMenuItem // + this.ShutdownToolStripMenuItem.AutoSize = false; this.ShutdownToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.ShutdownToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicShutdown; this.ShutdownToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; - this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); - this.ShutdownToolStripMenuItem.Text = "Shut Down..."; + this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(0); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(137, 32); + this.ShutdownToolStripMenuItem.Text = "Sh&ut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // - // ossidestartmenu - // - this.ossidestartmenu.Controls.Add(this.osimage); - this.ossidestartmenu.Location = new System.Drawing.Point(0, 0); - this.ossidestartmenu.Name = "ossidestartmenu"; - this.ossidestartmenu.Size = new System.Drawing.Size(23, 297); - this.ossidestartmenu.TabIndex = 4; - // - // osimage - // - this.osimage.Dock = System.Windows.Forms.DockStyle.Fill; - this.osimage.Image = global::Histacom2.Properties.Resources.Win95SideBar; - this.osimage.Location = new System.Drawing.Point(0, 0); - this.osimage.Name = "osimage"; - this.osimage.Size = new System.Drawing.Size(23, 297); - this.osimage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.osimage.TabIndex = 0; - this.osimage.TabStop = false; - // - // clockTimer - // - this.clockTimer.Tick += new System.EventHandler(this.clockTimer_Tick); - // - // desktopImages - // - this.desktopImages.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("desktopImages.ImageStream"))); - this.desktopImages.TransparentColor = System.Drawing.Color.Transparent; - this.desktopImages.Images.SetKeyName(0, "WinClassicComputer.png"); - this.desktopImages.Images.SetKeyName(1, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(2, "WinClassicIE3.png"); - this.desktopImages.Images.SetKeyName(3, "WinClassicInbox.png"); - this.desktopImages.Images.SetKeyName(4, "WinClassicMSN.png"); - this.desktopImages.Images.SetKeyName(5, "WinClassicNetworking.png"); - this.desktopImages.Images.SetKeyName(6, "WinClassicOutlook.png"); - this.desktopImages.Images.SetKeyName(7, "WinClassicRecycle.png"); - this.desktopImages.Images.SetKeyName(8, "Win95File.png"); - this.desktopImages.Images.SetKeyName(9, "WinClassicFolder.png"); - this.desktopImages.Images.SetKeyName(10, "WinClassicApp.png"); - this.desktopImages.Images.SetKeyName(11, "WinClassicSetup.png"); - this.desktopImages.Images.SetKeyName(12, "WinClassicNotepad.png"); - // - // desktopicons - // - this.desktopicons.Alignment = System.Windows.Forms.ListViewAlignment.Left; - this.desktopicons.BackColor = System.Drawing.Color.Teal; - this.desktopicons.BackgroundImageTiled = true; - this.desktopicons.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.desktopicons.Dock = System.Windows.Forms.DockStyle.Fill; - this.desktopicons.ForeColor = System.Drawing.Color.White; - this.desktopicons.LargeImageList = this.desktopImages; - this.desktopicons.Location = new System.Drawing.Point(0, 0); - this.desktopicons.Name = "desktopicons"; - this.desktopicons.Size = new System.Drawing.Size(640, 480); - this.desktopicons.TabIndex = 6; - this.desktopicons.UseCompatibleStateImageBehavior = false; - this.desktopicons.DoubleClick += new System.EventHandler(this.desktopicons_DoubleClick); - this.desktopicons.MouseDown += new System.Windows.Forms.MouseEventHandler(this.desktop_mousedown); - this.desktopicons.MouseMove += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseMove); - this.desktopicons.MouseUp += new System.Windows.Forms.MouseEventHandler(this.desktopicons_MouseUp); - // - // rightclickbackproperties - // - this.rightclickbackproperties.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.NewToolStripMenuItem1, - this.deleteToolStripMenuItem, - this.PropertiesToolStripMenuItem1}); - this.rightclickbackproperties.Name = "ContextMenuStrip1"; - this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); - // - // NewToolStripMenuItem1 - // - this.NewToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.NewToolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.FolderToolStripMenuItem, - this.TextDocumentToolStripMenuItem}); - this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); - this.NewToolStripMenuItem1.Text = "New"; - // - // FolderToolStripMenuItem - // - this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); - this.FolderToolStripMenuItem.Text = "Folder"; - this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); - // - // TextDocumentToolStripMenuItem - // - this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22); - this.TextDocumentToolStripMenuItem.Text = "Text Document"; - this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); - // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); - this.deleteToolStripMenuItem.Text = "Delete"; - this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); - // - // PropertiesToolStripMenuItem1 - // - this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; - this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); - this.PropertiesToolStripMenuItem1.Text = "Properties"; - this.PropertiesToolStripMenuItem1.Click += new System.EventHandler(this.PropertiesToolStripMenuItem1_Click); - // - // desktopupdate - // - this.desktopupdate.Enabled = true; - this.desktopupdate.Interval = 10000; - this.desktopupdate.Tick += new System.EventHandler(this.desktopupdate_Tick); - // // Windows95 // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1052,8 +1064,8 @@ namespace Histacom2.OS.Win95 this.BackColor = System.Drawing.Color.Teal; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(640, 480); - this.Controls.Add(this.taskbar); this.Controls.Add(this.startmenu); + this.Controls.Add(this.taskbar); this.Controls.Add(this.panel1); this.Controls.Add(this.desktopicons); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -1068,7 +1080,6 @@ namespace Histacom2.OS.Win95 this.clockPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); - this.startmenu.PerformLayout(); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); this.ossidestartmenu.ResumeLayout(false); @@ -1088,7 +1099,7 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.Label taskbartime; internal System.Windows.Forms.Panel startmenu; internal System.Windows.Forms.MenuStrip startmenuitems; - internal System.Windows.Forms.ToolStripMenuItem ProgramsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem ProgramsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem AccessoriesToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem CommunicationsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem InternetConnectionWizardToolStripMenuItem; @@ -1125,22 +1136,22 @@ namespace Histacom2.OS.Win95 internal System.Windows.Forms.ToolStripMenuItem SkindowsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem WebChatToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem TimeDistorterToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem DocumentsToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem SettingsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem DocumentsToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem SettingsToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ControlPanelToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PrintersToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem TaskbarToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem FindToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem FindToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem FilesOrFoldersToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem ComputerToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem OnTheInternetToolStripMenuItem; internal System.Windows.Forms.ToolStripMenuItem PeopleToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem HelpToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem RunToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem HelpToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem RunToolStripMenuItem; internal System.Windows.Forms.Panel ossidestartmenu; internal System.Windows.Forms.PictureBox osimage; - internal System.Windows.Forms.ToolStripMenuItem ShutdownToolStripMenuItem; - internal System.Windows.Forms.ToolStripMenuItem SuspendToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem ShutdownToolStripMenuItem; + internal Histacom2.Engine.UI.ClassicStartMenuItem SuspendToolStripMenuItem; private System.Windows.Forms.Timer clockTimer; private System.Windows.Forms.ImageList desktopImages; internal System.Windows.Forms.ListView desktopicons; diff --git a/Histacom2/OS/Win95/Win95.cs b/Histacom2/OS/Win95/Win95.cs index 8188b7e..b4fcbd9 100644 --- a/Histacom2/OS/Win95/Win95.cs +++ b/Histacom2/OS/Win95/Win95.cs @@ -37,7 +37,7 @@ namespace Histacom2.OS.Win95 public Windows95() { InitializeComponent(); - startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); + //startmenu.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); ProgramsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); AccessoriesToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); CommunicationsToolStripMenuItem.DropDown.Paint += (sender, args) => Engine.Paintbrush.PaintClassicBorders(sender, args, 2); @@ -144,8 +144,8 @@ namespace Histacom2.OS.Win95 private void fontLoad() { this.taskbartime.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + //this.ProgramsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); + //this.DocumentsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.SettingsToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.FindToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); this.HelpToolStripMenuItem.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); @@ -161,8 +161,8 @@ namespace Histacom2.OS.Win95 private void startbutton_Click(object sender, EventArgs e) { startmenu.Show(); - startmenu.BringToFront(); if (taskbar.Visible) taskbar.BringToFront(); + startmenu.BringToFront(); } // Shutdown button @@ -631,6 +631,28 @@ namespace Histacom2.OS.Win95 gfx.DrawLine(new Pen(_lightBack), 62, 4, 62, 25); gfx.DrawLine(new Pen(_lightBack), 0, 25, 62, 25); } + + private void startmenuitems_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + } + + private void startmenu_Paint(object sender, PaintEventArgs e) + { + var gfx = e.Graphics; + gfx.Clear(currentTheme.threeDObjectsColor); + + var _lightBack = Paintbrush.GetLightFromColor(currentTheme.threeDObjectsColor); + var _darkBack = Paintbrush.GetDarkFromColor(currentTheme.threeDObjectsColor); + + gfx.DrawLine(Pens.Black, 0, startmenu.Height - 1, startmenu.Width - 1, startmenu.Height - 1); + gfx.DrawLine(Pens.Black, startmenu.Width - 1, startmenu.Height - 1, startmenu.Width - 1, 0); + gfx.DrawLine(new Pen(_darkBack), 1, startmenu.Height - 2, startmenu.Width - 2, startmenu.Height - 2); + gfx.DrawLine(new Pen(_darkBack), startmenu.Width - 2, 1, startmenu.Width - 2, startmenu.Height - 2); + gfx.DrawLine(new Pen(_lightBack), 1, startmenu.Height - 3, 1, 1); + gfx.DrawLine(new Pen(_lightBack), startmenu.Width - 3, 1, 1, 1); + } } public class MyRenderer : ToolStripProfessionalRenderer { diff --git a/Histacom2/OS/Win95/Win95.resx b/Histacom2/OS/Win95/Win95.resx index f0d544c..2711895 100644 --- a/Histacom2/OS/Win95/Win95.resx +++ b/Histacom2/OS/Win95/Win95.resx @@ -123,249 +123,6 @@ 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N - kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG - mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ - PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 - RAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N - UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 - QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF - pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU - OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD - ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A - KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl - tmCAq4kAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU - OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz - ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs - E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU - OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 - /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC - t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU - OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM - Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ - 13tFDjjJAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V - kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO - IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo - ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu - /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR - EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H - UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY - oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR - DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU - 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF - TkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l - jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk - +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A - JbFDpxtWNlIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB - DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP - YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy - BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR - EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA - QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI - qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA - AABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB - GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X - 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA - TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB - VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V - kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 - zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr - gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ - RU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB - DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX - VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ - aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ - 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME - Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN - upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 - NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j - Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I - gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m - M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu - QmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh - EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK - 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw - 4AAABIQCQUtXaBsAAAAASUVORK5CYII= - - 153, 17 @@ -377,7 +134,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - hAAAAk1TRnQBSQFMAgEBDQEAAVQBAgFUAQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + hAAAAk1TRnQBSQFMAgEBDQEAAfQBAgH0AQIBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABASQAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/ AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH//wChAAOAAf8DwAH/ A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/A8AB/wPAAf8DwAH/ @@ -951,6 +708,249 @@ 580, 17 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAALRJREFUOE+N + kgEOwCAIA3m6T/NnG6UwBZ1bk6pTemIy2am1dlX70VlR3Hu/IBE1wr5/BOEQymFZLRvIHMZtGjUjEHOG + mIdS214UkGi92qM5zDnCENfYn+0AQvAxC2/nHsNe+HgLwCbEmW1HmLOOZtYuAB0SJKAsivAPgBXpOgNQ + PPwCyDcF4M0TAIZw84CUgq1TF2xvhP+oACBCAoBW9dg6szWLzeUZs9Y/7mQNVMCjOPywyA3MF+cOKQF9 + RAAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAKpJREFUOE/N + UskNgDAMy+gdrZsVO3cL/HhgySKJD/WB/BdjjNXpZ9wFu+R+QwTmnDAtY5UsbErOGuiIIKmBoJYwwEJ7 + QZbEk066qCHbo8R0Qj0OPbA1vrxpCKxSm3dPIYWtwMNED28Fp5Ai7lWwe17DFNKwFRBHmKj2EDCZ4eEF + pxeIdj+AnH33gtIeGO11jAJQw20X+5nAG7SE5GykuTO1V5yGHur3LyFyAZP8TrljsWNAAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcwxstlzQAAALVJREFU + OE+dj4ERwyAMAxmd0diMImMZYaC9q3xOIJaeUP5Q936r1tpz+wgi4ATR3Huxbq1FC4ihHWDDEWM4A9jD + ukJczzBqRl8AD+iVMgB1B7j5BGATpqgJ4XfbeTi8vt8ANnCAn2JvnZuH4RvADKgx5MnHfAHm/bMB0j8A + KnueAEjX+Bs+1RcAiBBITWYUACEjssIQAFAOmzmissoAKF9FARvkFqYAySACxvh7WEXQWP4IlvIBh1rl + tmCAq4kAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcZhHn9oQAAAJ9JREFU + OE+VkAEOxCAIBH26P6s/8zrgeqTS05uEKMouaNnQR/zPdZVeazWDsZ6DuHfv3lqz8JsDJKYrgRiyKZYz + ieFOpxhiscxH6sIojuMLCV669lD8nYAQi1CosxusE7DCoQG44L6SyPL4hBic2ftJnhMQQsVvWHH8SPLs + E3dME/aZwYnRfBIholB3I00xE1amIDLBscmu8Bdm4NuMUj70z1LCUTedOwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCcbanecjQAAAItJREFU + OE+VjgEOhCAMBHk6T+Nn2iFuXEEtTLLBbNu5K6LWeuzkOruhXCXWvwWttd9cv74miLrHu1TASyQAHSr0 + /chh4PiBz/iO9W+B/mpUj6hPBbxEEtChQt+PHAbOKBCpgGUl6qlLBbxkFKgn9P3IYeCMApEKWFaEd1uC + t6QC3iyxPgsCDVYTlHICH5QKXtIjRNoAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 + JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH4QQIFCgUfVCd0wAAAHpJREFU + OE+djgsOgDAIQzn6bubRlF+zOZV1vqRBGK0IS2vthHK0ZjQBHdcBhcllc9t7UJnsvSSM4tKWM03cAvLM + Ve3YwNBPuqYCJONxVbGvCnABSx2QfwJjK0c03wHYzjq1RICB7WRsf10AeU9dQPAasCu19YAEww2JXJGJ + 13tFDjjJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAMFJREFUOE+V + kAsShDAIQzk6R/Nm3SSU2g/uaJxMi5Bnq81yt0b38pCbnz03hGDtEaYq0HVdraF9QBiORoAyXIFKyAhO + IG6m8P+TRDDMPV4JkBDWGkSNYe0JcS8AGoArAEPYDcjQAcgheL9CCVkAU1iP3sd9887L8akDkE//OoMo + ByhSkxYAl3x0EgTg6QTk3FZ/B6TRpLSiHoAOpXWVR8D4wgYopMad7KAPgJQGIh3WMbEu/+CFNEhAhKPu + /qQXQbMf8nZYxbrHLzUAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACmSURBVDhPnZFR + EsQgCEM9ukfzZl0CREmrO7uNw0ghL360ndR7v7L9X4BfBxDeVVrOmsaLQqd1DKowK7QmYwxvza4hC66H + UpiV6IJlm+UQOnvxvg7aBAPkIWpY87rICtpkX/4SX5MgmkvnxzD4JIC3BCUGzZCEfWb9I4D3M2gDp3xY + oXsQ9vRAYAJVbYNqAARf2M+aQa3Hr2QAdmH5TTPoDVz1BW7tA7ajvYP7sMmIAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAABzSURBVDhPxZBR + DsAgCEM9ukfzZowW9UdFmUtG8mR0UtiSiFwxFSPYkbO8gb31gXahDBOdb9MhsHCoUzsJ4J0WdNRiFaUU + 36BtgIsrXAPEcGHHsAFF+4yT/M8GCP4Pa2z5iw26EEUNMNyc4rAXxw1T8RxJD2E2VfJhfZIbAAAAAElF + TkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAH9JREFUOE+l + jgESgCAIBHk6T/NnxjFCVlBKzJyhc7sTEXH/FzmYqJSLYHdCAc40AMaOqQmGBJMKmOVx7B6UeUGgsMQk + +jV4RQDYAri1dsKTBPMqcBilG/z5BwZbIgkmFNxhl0ww7trdESDo2K7dTJBGOrZrNxLszENQiQvq4X4A + JbFDpxtWNlIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACFSURBVDhPpZNB + DsAgCAR9uk/zZ1S0i6CoDTUZQ5EdTk1EtFAPX0dkFoU0aivnTOnFrZVkCZvGjjpXSuki02c7F9g0gzdP + YD7mIDMGW3gV6KEdPOMJjOmECltBYLsIxHJjCg9BYDufIejXFYQ17Q1LwG7YIyTA4Tok0PwStB/LE0Dy + BSJKDySVfIiSNKD1AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vgAADr4B6kKxwAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACzSURBVDhPhZJR + EsUgCAN7dI7mzawRl1KLU2fygMimfryr9/6rcUY53FVmluDWmpoxFveViQSZuU4h72GMyMwm5AF2DPnA + QPTM9FIOCTiMBarSI1712qeZwwbkkApejBuqLLK8h7Cb5T8HGI8QBLPq8+wdzr722FUNL7+gEsuE06MI + qELk6T7DOhNcwTNAcuMJAZYAdQgiJAIk/kAZdr8OmCHD+5UWeRkBfKgEduUAYL/r1w0ie5EGNPvMCQAA + AABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAADBSURBVDhPhZAB + GoUgCIM9ukfrZj02mBJhb32U5v6JjpfmuGP0pQ8PAg4h0/6jbKj1xgcDniYEMGTDGpR0CLCJAIPnfV2X + 5lve4hTMXbirjVETQHQQtaX23LFN9mIRXtMCh14BIirctm/yiyGNkB7mHvxXAgTj/Os4jegzmHeVQ3KA + TWlAq7UUQOgUYE3KxCDMXd5drEGnADfz/Qj6d4QC569ZukoKUwfrq3ugewmgnmgP5eCztGaVFK0HnJUB + VdEYP35ybB/eOVN7AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAK5JREFUOE+V + kAESwyAIBH06T/Nnlju8FNFJ7c0w0sBuTVqNWRu15uh3sDzGXleiDJsZlnleiyTwloXgzGLVUTIfcqH3 + zhO/UZrlG20S/RNg9JLodSSUAD045gR/JUj0vsoeM/SEkRAosVBhQTgPgvy1lfVWBazw8KGxsiiDGdbr + gKfAWwJIFp3AuFF8WPAUaOBPwuJJSwuomjNmWcqiF/CBczbRLVjziP4Fay7A1j6MmatnPf0QdQAAAABJ + RU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vAAADrwBlbxySQAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAACMSURBVDhPnZAB + DsAgCAN9Ok/zZ4yiEINsMkkKRNezWWNmlZSM84wabVwyEX3ODNLCZXWiyUrsgEr13h2gZlmvAGZGKQAX + VRlAzfcJIAB+/gMiM5smIMbMBLO8uUMqCcxsOzww4/AIiGZ7eR4OQBYZ2uIGswOyWj72ArQMyOoVsMY+ + aQNok1HVambm9gBAYeI/oBSQZwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkQsSxCAMQj16bu4GFU3YdO2+Gaqi0F/7j96zfqKHqYiuByYBFfYJ + 1okT9uuef4slmG9gWjdzN4Wnf9bRT1RhaCN+KriGieyvkjr8Rl7AMMbywE0zCBiIBS9Awbn7tUD29xME + Q0rM8IHhPbziKRhMU0pqjVIfcgHAfB2oiugnuEnG/EkZ/4fLZEksutHaB6sGQO/gf7MbAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAALtJREFUOE91TwESBCEI6un9vBPRYqljhtEIyUZhzTkXKo8J1ZI4P3xjlAjsqpoN + upcBf0zA6+7r8QAxA9170IEPm6l7PWu9A1CLwNaVpSfWNEKLWCECDnkvAdFtMgBDLeHFaNaXEpQu22B9 + NsFA96i2yQlo00wejQG9VfuSCQ0IXAFAVAb468AVwJB3AHpsBFKn2uYkemh9hllezf4KcDKwtqkBpX5j + Dyj5DRIeDDh3wD3c5AYkh2QwOMYPtAJqglssjE8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJVJREFUOE+VkIESgCAIQ/10/pwasJrlkb27nUZsoqPHPbWNlYHCN9gKMTc7O31I + gIa0PM2EE32ErE9WNQEw1y6azbZGvkFAhnBcKMmwrQnCVI0MofA+a6UniIDYqKTx7JhBDeVaQd5fVT9m + M4JvowbwzjNlu4C5DVBgVyll4Zo8AzrK0gfo6ZBSFq7J6g0+ePWj8EPDD0i7RXV30HOWAAAAAElFTkSu + QmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wQAADsEBuJFr7QAAAJJJREFUOE+tkYEOgCAIRP10/tzk4FISZ7ZuuzDwnq4KJSL1aR/txc21llBfQVbh + EZJZZ5C+nEoEcIN0QDyxLVGzm6WAsMYTvRSSAqaw2jRBloApbJUBhLVub4ABqwMY1poCuEYzhPWjRkgK + 6EP7A+obqOc2EzIBeELmtqNFDECI9R3gYmPhCPH+qX6HfAJAQ7iUCwlxft5LSoDNAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + vwAADr8BOAVTJAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAAMSURBVBhXYzhw + 4AAABIQCQUtXaBsAAAAASUVORK5CYII= + + 92 diff --git a/Histacom2/OS/Win98/Win98.Designer.cs b/Histacom2/OS/Win98/Win98.Designer.cs index 52fb2f2..e2cf49c 100644 --- a/Histacom2/OS/Win98/Win98.Designer.cs +++ b/Histacom2/OS/Win98/Win98.Designer.cs @@ -200,11 +200,12 @@ namespace Histacom2.OS.Win98 this.startmenu.Controls.Add(this.ossidestartmenu); this.startmenu.Location = new System.Drawing.Point(0, 160); this.startmenu.Name = "startmenu"; - this.startmenu.Size = new System.Drawing.Size(174, 295); + this.startmenu.Size = new System.Drawing.Size(161, 295); this.startmenu.TabIndex = 3; // // startmenuitems // + this.startmenuitems.AutoSize = false; this.startmenuitems.BackColor = System.Drawing.Color.Silver; this.startmenuitems.Dock = System.Windows.Forms.DockStyle.None; this.startmenuitems.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -222,7 +223,7 @@ namespace Histacom2.OS.Win98 this.startmenuitems.Name = "startmenuitems"; this.startmenuitems.Padding = new System.Windows.Forms.Padding(6, 2, 0, 0); this.startmenuitems.RenderMode = System.Windows.Forms.ToolStripRenderMode.System; - this.startmenuitems.Size = new System.Drawing.Size(148, 292); + this.startmenuitems.Size = new System.Drawing.Size(137, 309); this.startmenuitems.TabIndex = 0; this.startmenuitems.Text = "StartMenu"; // @@ -250,7 +251,7 @@ namespace Histacom2.OS.Win98 this.ProgramsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ProgramsToolStripMenuItem.Name = "ProgramsToolStripMenuItem"; this.ProgramsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.ProgramsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.ProgramsToolStripMenuItem.Text = "Programs"; // // AccessoriesToolStripMenuItem @@ -275,7 +276,7 @@ namespace Histacom2.OS.Win98 this.AccessoriesToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.AccessoriesToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AccessoriesToolStripMenuItem.Name = "AccessoriesToolStripMenuItem"; - this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.AccessoriesToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AccessoriesToolStripMenuItem.Text = "Accessories"; // // CommunicationsToolStripMenuItem @@ -289,7 +290,7 @@ namespace Histacom2.OS.Win98 this.CommunicationsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.CommunicationsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CommunicationsToolStripMenuItem.Name = "CommunicationsToolStripMenuItem"; - this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CommunicationsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CommunicationsToolStripMenuItem.Text = "Communications"; // // InternetConnectionWizardToolStripMenuItem @@ -300,7 +301,7 @@ namespace Histacom2.OS.Win98 this.InternetConnectionWizardToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("InternetConnectionWizardToolStripMenuItem.Image"))); this.InternetConnectionWizardToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetConnectionWizardToolStripMenuItem.Name = "InternetConnectionWizardToolStripMenuItem"; - this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.InternetConnectionWizardToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.InternetConnectionWizardToolStripMenuItem.Text = "Internet Connection Wizard"; this.InternetConnectionWizardToolStripMenuItem.Click += new System.EventHandler(this.temp_for_std); // @@ -312,7 +313,7 @@ namespace Histacom2.OS.Win98 this.NetMeetingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NetMeetingToolStripMenuItem.Image"))); this.NetMeetingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NetMeetingToolStripMenuItem.Name = "NetMeetingToolStripMenuItem"; - this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(229, 22); + this.NetMeetingToolStripMenuItem.Size = new System.Drawing.Size(219, 22); this.NetMeetingToolStripMenuItem.Text = "NetMeeting"; this.NetMeetingToolStripMenuItem.Click += new System.EventHandler(this.WebChatToolStripMenuItem_Click); // @@ -329,7 +330,7 @@ namespace Histacom2.OS.Win98 this.MultimediaToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.MultimediaToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MultimediaToolStripMenuItem.Name = "MultimediaToolStripMenuItem"; - this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.MultimediaToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MultimediaToolStripMenuItem.Text = "Multimedia"; // // CDPlayerToolStripMenuItem @@ -340,7 +341,7 @@ namespace Histacom2.OS.Win98 this.CDPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CDPlayerToolStripMenuItem.Image"))); this.CDPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CDPlayerToolStripMenuItem.Name = "CDPlayerToolStripMenuItem"; - this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.CDPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.CDPlayerToolStripMenuItem.Text = "CD Player"; // // SoundRecorderToolStripMenuItem @@ -351,7 +352,7 @@ namespace Histacom2.OS.Win98 this.SoundRecorderToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("SoundRecorderToolStripMenuItem.Image"))); this.SoundRecorderToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SoundRecorderToolStripMenuItem.Name = "SoundRecorderToolStripMenuItem"; - this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.SoundRecorderToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.SoundRecorderToolStripMenuItem.Text = "Sound Recorder"; // // VolumeControlToolStripMenuItem @@ -362,7 +363,7 @@ namespace Histacom2.OS.Win98 this.VolumeControlToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("VolumeControlToolStripMenuItem.Image"))); this.VolumeControlToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.VolumeControlToolStripMenuItem.Name = "VolumeControlToolStripMenuItem"; - this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.VolumeControlToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.VolumeControlToolStripMenuItem.Text = "Volume Control"; // // WindowsMediaPlayerToolStripMenuItem @@ -373,7 +374,7 @@ namespace Histacom2.OS.Win98 this.WindowsMediaPlayerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WindowsMediaPlayerToolStripMenuItem.Image"))); this.WindowsMediaPlayerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsMediaPlayerToolStripMenuItem.Name = "WindowsMediaPlayerToolStripMenuItem"; - this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(201, 22); + this.WindowsMediaPlayerToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.WindowsMediaPlayerToolStripMenuItem.Text = "Windows Media Player"; // // SystemToolsToolStripMenuItem @@ -387,7 +388,7 @@ namespace Histacom2.OS.Win98 this.SystemToolsToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicProgramItem; this.SystemToolsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SystemToolsToolStripMenuItem.Name = "SystemToolsToolStripMenuItem"; - this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.SystemToolsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SystemToolsToolStripMenuItem.Text = "System Tools"; // // DiskDefragmenterToolStripMenuItem @@ -398,7 +399,7 @@ namespace Histacom2.OS.Win98 this.DiskDefragmenterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("DiskDefragmenterToolStripMenuItem.Image"))); this.DiskDefragmenterToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DiskDefragmenterToolStripMenuItem.Name = "DiskDefragmenterToolStripMenuItem"; - this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.DiskDefragmenterToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.DiskDefragmenterToolStripMenuItem.Text = "Disk Defragmenter"; // // ScanDiskToolStripMenuItem @@ -409,7 +410,7 @@ namespace Histacom2.OS.Win98 this.ScanDiskToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ScanDiskToolStripMenuItem.Image"))); this.ScanDiskToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ScanDiskToolStripMenuItem.Name = "ScanDiskToolStripMenuItem"; - this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(181, 22); + this.ScanDiskToolStripMenuItem.Size = new System.Drawing.Size(172, 22); this.ScanDiskToolStripMenuItem.Text = "ScanDisk"; // // AddressBookToolStripMenuItem @@ -420,7 +421,7 @@ namespace Histacom2.OS.Win98 this.AddressBookToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("AddressBookToolStripMenuItem.Image"))); this.AddressBookToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AddressBookToolStripMenuItem.Name = "AddressBookToolStripMenuItem"; - this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.AddressBookToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.AddressBookToolStripMenuItem.Text = "Address Book"; this.AddressBookToolStripMenuItem.Click += new System.EventHandler(this.AddressBookToolStripMenuItem_Click); // @@ -432,7 +433,7 @@ namespace Histacom2.OS.Win98 this.CalculatorToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("CalculatorToolStripMenuItem.Image"))); this.CalculatorToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.CalculatorToolStripMenuItem.Name = "CalculatorToolStripMenuItem"; - this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.CalculatorToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.CalculatorToolStripMenuItem.Text = "Calculator"; // // HyperTerminalToolStripMenuItem @@ -443,7 +444,7 @@ namespace Histacom2.OS.Win98 this.HyperTerminalToolStripMenuItem.Image = global::Histacom2.Properties.Resources.WinClassicFolderSmall; this.HyperTerminalToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.HyperTerminalToolStripMenuItem.Name = "HyperTerminalToolStripMenuItem"; - this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.HyperTerminalToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.HyperTerminalToolStripMenuItem.Text = "HyperTerminal"; // // ImagingToolStripMenuItem @@ -454,7 +455,7 @@ namespace Histacom2.OS.Win98 this.ImagingToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("ImagingToolStripMenuItem.Image"))); this.ImagingToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ImagingToolStripMenuItem.Name = "ImagingToolStripMenuItem"; - this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.ImagingToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ImagingToolStripMenuItem.Text = "Imaging"; // // NotePadToolStripMenuItem @@ -465,7 +466,7 @@ namespace Histacom2.OS.Win98 this.NotePadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("NotePadToolStripMenuItem.Image"))); this.NotePadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.NotePadToolStripMenuItem.Name = "NotePadToolStripMenuItem"; - this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.NotePadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.NotePadToolStripMenuItem.Text = "Notepad"; this.NotePadToolStripMenuItem.Click += new System.EventHandler(this.NotePadToolStripMenuItem_Click); // @@ -477,7 +478,7 @@ namespace Histacom2.OS.Win98 this.OnlineRegistrationToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("OnlineRegistrationToolStripMenuItem.Image"))); this.OnlineRegistrationToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnlineRegistrationToolStripMenuItem.Name = "OnlineRegistrationToolStripMenuItem"; - this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.OnlineRegistrationToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OnlineRegistrationToolStripMenuItem.Text = "Online Registration"; // // PaintToolStripMenuItem @@ -488,7 +489,7 @@ namespace Histacom2.OS.Win98 this.PaintToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PaintToolStripMenuItem.Image"))); this.PaintToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PaintToolStripMenuItem.Name = "PaintToolStripMenuItem"; - this.PaintToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PaintToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PaintToolStripMenuItem.Text = "Paintbrush"; // // PhoneDialerToolStripMenuItem @@ -499,7 +500,7 @@ namespace Histacom2.OS.Win98 this.PhoneDialerToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("PhoneDialerToolStripMenuItem.Image"))); this.PhoneDialerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PhoneDialerToolStripMenuItem.Name = "PhoneDialerToolStripMenuItem"; - this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.PhoneDialerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.PhoneDialerToolStripMenuItem.Text = "Phone Dialer"; // // WordPadToolStripMenuItem @@ -510,7 +511,7 @@ namespace Histacom2.OS.Win98 this.WordPadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("WordPadToolStripMenuItem.Image"))); this.WordPadToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WordPadToolStripMenuItem.Name = "WordPadToolStripMenuItem"; - this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(188, 28); + this.WordPadToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WordPadToolStripMenuItem.Text = "WordPad"; this.WordPadToolStripMenuItem.Click += new System.EventHandler(this.WordPadToolStripMenuItem_Click); // @@ -528,7 +529,7 @@ namespace Histacom2.OS.Win98 this.StartUpToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.StartUpToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.StartUpToolStripMenuItem.Name = "StartUpToolStripMenuItem"; - this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartUpToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartUpToolStripMenuItem.Text = "Online Services"; // // AOLInternetFREETrialToolStripMenuItem @@ -538,7 +539,7 @@ namespace Histacom2.OS.Win98 this.AOLInternetFREETrialToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.AOLInternetFREETrialToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.AOLInternetFREETrialToolStripMenuItem.Name = "AOLInternetFREETrialToolStripMenuItem"; - this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.AOLInternetFREETrialToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.AOLInternetFREETrialToolStripMenuItem.Text = "AOL & Internet FREE Trial!"; // // ATTWorldNetSignupToolStripMenuItem @@ -548,7 +549,7 @@ namespace Histacom2.OS.Win98 this.ATTWorldNetSignupToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ATTWorldNetSignupToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ATTWorldNetSignupToolStripMenuItem.Name = "ATTWorldNetSignupToolStripMenuItem"; - this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.ATTWorldNetSignupToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.ATTWorldNetSignupToolStripMenuItem.Text = "AT&T WorldNet Signup"; // // SetupCompuServe30ToolStripMenuItem @@ -558,7 +559,7 @@ namespace Histacom2.OS.Win98 this.SetupCompuServe30ToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupCompuServe30ToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SetupCompuServe30ToolStripMenuItem.Name = "SetupCompuServe30ToolStripMenuItem"; - this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupCompuServe30ToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupCompuServe30ToolStripMenuItem.Text = "Setup CompuServe 3.0"; // // SetupWOWFromCompuServeToolStripMenuItem @@ -567,7 +568,7 @@ namespace Histacom2.OS.Win98 this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SetupWOWFromCompuServeToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SetupWOWFromCompuServeToolStripMenuItem.Name = "SetupWOWFromCompuServeToolStripMenuItem"; - this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(248, 22); + this.SetupWOWFromCompuServeToolStripMenuItem.Size = new System.Drawing.Size(241, 22); this.SetupWOWFromCompuServeToolStripMenuItem.Text = "Setup WOW! from CompuServe"; // // MSDOSPromptToolStripMenuItem @@ -581,7 +582,7 @@ namespace Histacom2.OS.Win98 this.MSDOSPromptToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem.Name = "MSDOSPromptToolStripMenuItem"; - this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem.Text = "StartUp"; // // EmptyToolStripMenuItem @@ -590,7 +591,7 @@ namespace Histacom2.OS.Win98 this.EmptyToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.EmptyToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.EmptyToolStripMenuItem.Name = "EmptyToolStripMenuItem"; - this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(118, 22); + this.EmptyToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.EmptyToolStripMenuItem.Text = "(Empty)"; // // InternetExplorerToolStripMenuItem @@ -602,7 +603,7 @@ namespace Histacom2.OS.Win98 this.InternetExplorerToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.InternetExplorerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.InternetExplorerToolStripMenuItem.Name = "InternetExplorerToolStripMenuItem"; - this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.InternetExplorerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.InternetExplorerToolStripMenuItem.Text = "Internet Explorer"; this.InternetExplorerToolStripMenuItem.Click += new System.EventHandler(this.InternetExplorerToolStripMenuItem_Click); // @@ -615,7 +616,7 @@ namespace Histacom2.OS.Win98 this.MSDOSPromptToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.MSDOSPromptToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.MSDOSPromptToolStripMenuItem1.Name = "MSDOSPromptToolStripMenuItem1"; - this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.MSDOSPromptToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.MSDOSPromptToolStripMenuItem1.Text = "MS-DOS Prompt"; this.MSDOSPromptToolStripMenuItem1.Click += new System.EventHandler(this.MSDOSPromptToolStripMenuItem1_Click); // @@ -628,7 +629,7 @@ namespace Histacom2.OS.Win98 this.OutlookExpressToolStripMenuItem.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.OutlookExpressToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OutlookExpressToolStripMenuItem.Name = "OutlookExpressToolStripMenuItem"; - this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.OutlookExpressToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.OutlookExpressToolStripMenuItem.Text = "Outlook Express"; // // WindowsExplorerToolStripMenuItem1 @@ -640,7 +641,7 @@ namespace Histacom2.OS.Win98 this.WindowsExplorerToolStripMenuItem1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.WindowsExplorerToolStripMenuItem1.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.WindowsExplorerToolStripMenuItem1.Name = "WindowsExplorerToolStripMenuItem1"; - this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(186, 28); + this.WindowsExplorerToolStripMenuItem1.Size = new System.Drawing.Size(181, 28); this.WindowsExplorerToolStripMenuItem1.Text = "Windows Explorer"; this.WindowsExplorerToolStripMenuItem1.Click += new System.EventHandler(this.WindowsExplorerToolStripMenuItem1_Click); // @@ -650,7 +651,7 @@ namespace Histacom2.OS.Win98 this.GuessTheNumberToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.GuessTheNumberToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.GuessTheNumberToolStripMenuItem.Name = "GuessTheNumberToolStripMenuItem"; - this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.GuessTheNumberToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.GuessTheNumberToolStripMenuItem.Text = "Guess The Number"; this.GuessTheNumberToolStripMenuItem.Visible = false; // @@ -660,7 +661,7 @@ namespace Histacom2.OS.Win98 this.StartRunnerToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.StartRunnerToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.StartRunnerToolStripMenuItem.Name = "StartRunnerToolStripMenuItem"; - this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.StartRunnerToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.StartRunnerToolStripMenuItem.Text = "Start Runner"; this.StartRunnerToolStripMenuItem.Visible = false; // @@ -670,7 +671,7 @@ namespace Histacom2.OS.Win98 this.ErrorBlasterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.ErrorBlasterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.ErrorBlasterToolStripMenuItem.Name = "ErrorBlasterToolStripMenuItem"; - this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.ErrorBlasterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.ErrorBlasterToolStripMenuItem.Text = "Error Blaster"; this.ErrorBlasterToolStripMenuItem.Visible = false; // @@ -680,7 +681,7 @@ namespace Histacom2.OS.Win98 this.SkindowsToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.SkindowsToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.SkindowsToolStripMenuItem.Name = "SkindowsToolStripMenuItem"; - this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.SkindowsToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.SkindowsToolStripMenuItem.Text = "Skindows 95"; this.SkindowsToolStripMenuItem.Visible = false; // @@ -690,7 +691,7 @@ namespace Histacom2.OS.Win98 this.WebChatToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.WebChatToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.WebChatToolStripMenuItem.Name = "WebChatToolStripMenuItem"; - this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.WebChatToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.WebChatToolStripMenuItem.Text = "Web Chat"; this.WebChatToolStripMenuItem.Visible = false; // @@ -700,7 +701,7 @@ namespace Histacom2.OS.Win98 this.TimeDistorterToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.TimeDistorterToolStripMenuItem.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.TimeDistorterToolStripMenuItem.Name = "TimeDistorterToolStripMenuItem"; - this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(186, 28); + this.TimeDistorterToolStripMenuItem.Size = new System.Drawing.Size(181, 28); this.TimeDistorterToolStripMenuItem.Text = "Time Distorter"; this.TimeDistorterToolStripMenuItem.Visible = false; // @@ -717,7 +718,7 @@ namespace Histacom2.OS.Win98 this.DocumentsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.DocumentsToolStripMenuItem.Name = "DocumentsToolStripMenuItem"; this.DocumentsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.DocumentsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.DocumentsToolStripMenuItem.Text = "Documents"; // // downloaderTestToolStripMenuItem @@ -725,7 +726,7 @@ namespace Histacom2.OS.Win98 this.downloaderTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.downloaderTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("downloaderTestToolStripMenuItem.BackgroundImage"))); this.downloaderTestToolStripMenuItem.Name = "downloaderTestToolStripMenuItem"; - this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.downloaderTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.downloaderTestToolStripMenuItem.Text = "DownloaderTest"; this.downloaderTestToolStripMenuItem.Click += new System.EventHandler(this.downloaderTestToolStripMenuItem_Click); // @@ -734,7 +735,7 @@ namespace Histacom2.OS.Win98 this.installerTestToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.installerTestToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("installerTestToolStripMenuItem.BackgroundImage"))); this.installerTestToolStripMenuItem.Name = "installerTestToolStripMenuItem"; - this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.installerTestToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.installerTestToolStripMenuItem.Text = "InstallerTest"; this.installerTestToolStripMenuItem.Click += new System.EventHandler(this.installerTestToolStripMenuItem_Click); // @@ -742,7 +743,7 @@ namespace Histacom2.OS.Win98 // this.storyTest1ToolStripMenuItem.BackgroundImage = global::Histacom2.Properties.Resources.sliversilver; this.storyTest1ToolStripMenuItem.Name = "storyTest1ToolStripMenuItem"; - this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(165, 22); + this.storyTest1ToolStripMenuItem.Size = new System.Drawing.Size(159, 22); this.storyTest1ToolStripMenuItem.Text = "StoryTest1"; this.storyTest1ToolStripMenuItem.Click += new System.EventHandler(this.storyTest1ToolStripMenuItem_Click); // @@ -758,7 +759,7 @@ namespace Histacom2.OS.Win98 this.SettingsToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SettingsToolStripMenuItem.Name = "SettingsToolStripMenuItem"; this.SettingsToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.SettingsToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.SettingsToolStripMenuItem.Text = "Settings"; // // ControlPanelToolStripMenuItem @@ -767,7 +768,7 @@ namespace Histacom2.OS.Win98 this.ControlPanelToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ControlPanelToolStripMenuItem.BackgroundImage"))); this.ControlPanelToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ControlPanelToolStripMenuItem.Name = "ControlPanelToolStripMenuItem"; - this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.ControlPanelToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.ControlPanelToolStripMenuItem.Text = "Control Panel"; // // PrintersToolStripMenuItem @@ -776,7 +777,7 @@ namespace Histacom2.OS.Win98 this.PrintersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PrintersToolStripMenuItem.BackgroundImage"))); this.PrintersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PrintersToolStripMenuItem.Name = "PrintersToolStripMenuItem"; - this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.PrintersToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.PrintersToolStripMenuItem.Text = "Printers"; // // TaskbarToolStripMenuItem @@ -785,7 +786,7 @@ namespace Histacom2.OS.Win98 this.TaskbarToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("TaskbarToolStripMenuItem.BackgroundImage"))); this.TaskbarToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TaskbarToolStripMenuItem.Name = "TaskbarToolStripMenuItem"; - this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.TaskbarToolStripMenuItem.Size = new System.Drawing.Size(146, 22); this.TaskbarToolStripMenuItem.Text = "Taskbar"; // // FindToolStripMenuItem @@ -803,7 +804,7 @@ namespace Histacom2.OS.Win98 this.FindToolStripMenuItem.Name = "FindToolStripMenuItem"; this.FindToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.FindToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.FindToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.FindToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.FindToolStripMenuItem.Text = "Find"; // // FilesOrFoldersToolStripMenuItem @@ -812,7 +813,7 @@ namespace Histacom2.OS.Win98 this.FilesOrFoldersToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("FilesOrFoldersToolStripMenuItem.BackgroundImage"))); this.FilesOrFoldersToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FilesOrFoldersToolStripMenuItem.Name = "FilesOrFoldersToolStripMenuItem"; - this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.FilesOrFoldersToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.FilesOrFoldersToolStripMenuItem.Text = "Files or Folders..."; // // ComputerToolStripMenuItem @@ -821,7 +822,7 @@ namespace Histacom2.OS.Win98 this.ComputerToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("ComputerToolStripMenuItem.BackgroundImage"))); this.ComputerToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ComputerToolStripMenuItem.Name = "ComputerToolStripMenuItem"; - this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.ComputerToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.ComputerToolStripMenuItem.Text = "Computer..."; // // OnTheInternetToolStripMenuItem @@ -830,7 +831,7 @@ namespace Histacom2.OS.Win98 this.OnTheInternetToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("OnTheInternetToolStripMenuItem.BackgroundImage"))); this.OnTheInternetToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.OnTheInternetToolStripMenuItem.Name = "OnTheInternetToolStripMenuItem"; - this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.OnTheInternetToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.OnTheInternetToolStripMenuItem.Text = "On the Internet..."; // // PeopleToolStripMenuItem @@ -839,7 +840,7 @@ namespace Histacom2.OS.Win98 this.PeopleToolStripMenuItem.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("PeopleToolStripMenuItem.BackgroundImage"))); this.PeopleToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PeopleToolStripMenuItem.Name = "PeopleToolStripMenuItem"; - this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(169, 22); + this.PeopleToolStripMenuItem.Size = new System.Drawing.Size(163, 22); this.PeopleToolStripMenuItem.Text = "People..."; // // HelpToolStripMenuItem @@ -851,7 +852,7 @@ namespace Histacom2.OS.Win98 this.HelpToolStripMenuItem.Name = "HelpToolStripMenuItem"; this.HelpToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.HelpToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.HelpToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.HelpToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.HelpToolStripMenuItem.Text = "Help"; // // RunToolStripMenuItem @@ -863,7 +864,7 @@ namespace Histacom2.OS.Win98 this.RunToolStripMenuItem.Name = "RunToolStripMenuItem"; this.RunToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); this.RunToolStripMenuItem.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.RunToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.RunToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.RunToolStripMenuItem.Text = "Run..."; // // SuspendToolStripMenuItem @@ -874,7 +875,7 @@ namespace Histacom2.OS.Win98 this.SuspendToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.SuspendToolStripMenuItem.Name = "SuspendToolStripMenuItem"; this.SuspendToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.SuspendToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.SuspendToolStripMenuItem.Text = "Suspend"; // // ShutdownToolStripMenuItem @@ -885,7 +886,7 @@ namespace Histacom2.OS.Win98 this.ShutdownToolStripMenuItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.ShutdownToolStripMenuItem.Name = "ShutdownToolStripMenuItem"; this.ShutdownToolStripMenuItem.Padding = new System.Windows.Forms.Padding(4, 0, 25, 0); - this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(141, 36); + this.ShutdownToolStripMenuItem.Size = new System.Drawing.Size(130, 36); this.ShutdownToolStripMenuItem.Text = "Shut Down..."; this.ShutdownToolStripMenuItem.Click += new System.EventHandler(this.ShutdownToolStripMenuItem_Click); // @@ -954,7 +955,7 @@ namespace Histacom2.OS.Win98 this.PropertiesToolStripMenuItem1}); this.rightclickbackproperties.Name = "ContextMenuStrip1"; this.rightclickbackproperties.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; - this.rightclickbackproperties.Size = new System.Drawing.Size(135, 70); + this.rightclickbackproperties.Size = new System.Drawing.Size(128, 70); // // NewToolStripMenuItem1 // @@ -963,14 +964,14 @@ namespace Histacom2.OS.Win98 this.FolderToolStripMenuItem, this.TextDocumentToolStripMenuItem}); this.NewToolStripMenuItem1.Name = "NewToolStripMenuItem1"; - this.NewToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.NewToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); this.NewToolStripMenuItem1.Text = "New"; // // FolderToolStripMenuItem // this.FolderToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.FolderToolStripMenuItem.Name = "FolderToolStripMenuItem"; - this.FolderToolStripMenuItem.Size = new System.Drawing.Size(161, 22); + this.FolderToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.FolderToolStripMenuItem.Text = "Folder"; this.FolderToolStripMenuItem.Click += new System.EventHandler(this.FolderToolStripMenuItem_Click); // @@ -978,7 +979,7 @@ namespace Histacom2.OS.Win98 // this.TextDocumentToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.TextDocumentToolStripMenuItem.Name = "TextDocumentToolStripMenuItem"; - this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(161, 22); + this.TextDocumentToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.TextDocumentToolStripMenuItem.Text = "Text Document"; this.TextDocumentToolStripMenuItem.Click += new System.EventHandler(this.TextDocumentToolStripMenuItem_Click); // @@ -986,7 +987,7 @@ namespace Histacom2.OS.Win98 // this.deleteToolStripMenuItem.BackColor = System.Drawing.Color.Silver; this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(134, 22); + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(127, 22); this.deleteToolStripMenuItem.Text = "Delete"; this.deleteToolStripMenuItem.Click += new System.EventHandler(this.deleteToolStripMenuItem_Click); // @@ -994,7 +995,7 @@ namespace Histacom2.OS.Win98 // this.PropertiesToolStripMenuItem1.BackColor = System.Drawing.Color.Silver; this.PropertiesToolStripMenuItem1.Name = "PropertiesToolStripMenuItem1"; - this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(134, 22); + this.PropertiesToolStripMenuItem1.Size = new System.Drawing.Size(127, 22); this.PropertiesToolStripMenuItem1.Text = "Properties"; // // desktopupdate @@ -1009,8 +1010,8 @@ namespace Histacom2.OS.Win98 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.Teal; this.ClientSize = new System.Drawing.Size(640, 480); - this.Controls.Add(this.taskbar); this.Controls.Add(this.startmenu); + this.Controls.Add(this.taskbar); this.Controls.Add(this.panel1); this.Controls.Add(this.desktopicons); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; @@ -1025,7 +1026,6 @@ namespace Histacom2.OS.Win98 this.clockPanel.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.startbutton)).EndInit(); this.startmenu.ResumeLayout(false); - this.startmenu.PerformLayout(); this.startmenuitems.ResumeLayout(false); this.startmenuitems.PerformLayout(); this.ossidestartmenu.ResumeLayout(false); diff --git a/Histacom2/OS/Win98/Win98.resx b/Histacom2/OS/Win98/Win98.resx index d94fb94..2a3433f 100644 --- a/Histacom2/OS/Win98/Win98.resx +++ b/Histacom2/OS/Win98/Win98.resx @@ -382,7 +382,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADq - ggAAAk1TRnQBSQFMAgEBDAEAAZgBAQGYAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA + ggAAAk1TRnQBSQFMAgEBDAEAAaABAQGgAQEBIAEAASABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAGA AwABgAMAAQEBAAEgBwABAf8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8AXAAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/x8AAf8DAAH/ diff --git a/Histacom2/Resources/WinClassic/Win95SideBar.png b/Histacom2/Resources/WinClassic/Win95SideBar.png index f0ae5ab..a32d783 100644 Binary files a/Histacom2/Resources/WinClassic/Win95SideBar.png and b/Histacom2/Resources/WinClassic/Win95SideBar.png differ diff --git a/Histacom2/Resources/WinClassic/WinClassicPrograms.png b/Histacom2/Resources/WinClassic/WinClassicPrograms.png index 0a8b54a..1dbb3e8 100644 Binary files a/Histacom2/Resources/WinClassic/WinClassicPrograms.png and b/Histacom2/Resources/WinClassic/WinClassicPrograms.png differ diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs index e810d5d..37539d9 100644 --- a/Histacom2/TitleScreen.cs +++ b/Histacom2/TitleScreen.cs @@ -105,11 +105,7 @@ namespace Histacom2 private void VM_WidthHeight_KeyPress(object sender, KeyPressEventArgs e) { - if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar) && - (e.KeyChar != '.')) - { - e.Handled = true; - } + if (!char.IsControl(e.KeyChar) && !char.IsDigit(e.KeyChar) && (e.KeyChar != '.')) e.Handled = true; // only allow one decimal point if ((e.KeyChar == '.') && ((sender as TextBox).Text.IndexOf('.') > -1)) e.Handled = true; -- cgit v1.2.3 From ca482366718339b0684f64980dc67587222b4850 Mon Sep 17 00:00:00 2001 From: lempamo Date: Wed, 13 Sep 2017 15:23:58 -0400 Subject: fixed the calc buttons font and a namespace issue --- Histacom2.Engine/Histacom2.Engine.csproj | 2 +- Histacom2.Engine/UI/ClassicButton.cs | 12 ++---------- Histacom2.Engine/UI/IProgressBar.cs | 2 +- Histacom2/GlobalPrograms/WinClassicCalculator.cs | 18 +++--------------- .../GlobalPrograms/WinClassicDownloader.Designer.cs | 4 ++-- .../OS/Win95/Win95Apps/Win95Installer.Designer.cs | 4 ++-- 6 files changed, 11 insertions(+), 31 deletions(-) (limited to 'Histacom2.Engine/Histacom2.Engine.csproj') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 050ad0c..889c071 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -15,7 +15,7 @@ true full - true + false bin\Debug\ DEBUG;TRACE prompt diff --git a/Histacom2.Engine/UI/ClassicButton.cs b/Histacom2.Engine/UI/ClassicButton.cs index 26dbd26..9b1db72 100644 --- a/Histacom2.Engine/UI/ClassicButton.cs +++ b/Histacom2.Engine/UI/ClassicButton.cs @@ -28,25 +28,17 @@ namespace Histacom2.Engine.UI } } - public bool AdaptForeColorWithTheme { get; set; } - public bool AdaptFontWithTheme { get; set; } + public bool AdaptForeColorWithTheme = true; + public bool AdaptFontWithTheme = true; public ClassicButton() : base() { - AdaptForeColorWithTheme = true; - AdaptFontWithTheme = true; if (SaveSystem.currentTheme != null) BackColor = SaveSystem.currentTheme.threeDObjectsColor; else BackColor = Color.Silver; _lightBack = ControlPaint.Light(BackColor, 50); _darkBack = ControlPaint.Dark(BackColor, 50); - if (SaveSystem.currentTheme != null) ForeColor = SaveSystem.currentTheme.threeDObjectsTextColor; - else ForeColor = Color.Black; - - if (SaveSystem.currentTheme != null) Font = SaveSystem.currentTheme.buttonFont; - else Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular); - MouseDown += (s, e) => { _pressing = true; Invalidate(); }; MouseUp += (s, e) => { _pressing = false; Invalidate(); }; Invalidate(); diff --git a/Histacom2.Engine/UI/IProgressBar.cs b/Histacom2.Engine/UI/IProgressBar.cs index 071da18..2cd916d 100644 --- a/Histacom2.Engine/UI/IProgressBar.cs +++ b/Histacom2.Engine/UI/IProgressBar.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace Histacom2.UI +namespace Histacom2.Engine.UI { public class ProgressBar : Control { diff --git a/Histacom2/GlobalPrograms/WinClassicCalculator.cs b/Histacom2/GlobalPrograms/WinClassicCalculator.cs index 7f04e85..2fecae8 100644 --- a/Histacom2/GlobalPrograms/WinClassicCalculator.cs +++ b/Histacom2/GlobalPrograms/WinClassicCalculator.cs @@ -19,18 +19,6 @@ namespace Histacom2.OS.Win95.Win95Apps public WinClassicCalculator() { InitializeComponent(); - foreach (Control c in Controls) - { - if (c is Button) - { - c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Bold, GraphicsUnit.Point, ((byte)(0))); - c.Paint += (sender, args) => Paintbrush.PaintClassicBorders(sender, args, 2); - } - else - { - c.Font = new Font(TitleScreen.pfc.Families[0], 16F, FontStyle.Regular, GraphicsUnit.Point, ((byte)(0))); - } - } txtNumbers.Paint += (sender, args) => Paintbrush.PaintClassicBordersIndented(sender, args, 2); } private void number_click(object sender, EventArgs e) @@ -40,7 +28,7 @@ namespace Histacom2.OS.Win95.Win95Apps if ((txtNumbers.Text == "0") || (operation_pressed)) txtNumbers.Text = ""; operation_pressed = false; - Button num = (Button)sender; + Engine.UI.ClassicButton num = (Engine.UI.ClassicButton)sender; if (num.Text == ".") { if (!txtNumbers.Text.Contains(".")) @@ -77,7 +65,7 @@ namespace Histacom2.OS.Win95.Win95Apps private void arithmitic_click(object sender, EventArgs e) { - Button num = (Button)sender; + Engine.UI.ClassicButton num = (Engine.UI.ClassicButton)sender; if (txtNumbers.Text.Contains("∞")) txtNumbers.Clear(); if (prevnum != 0) @@ -135,7 +123,7 @@ namespace Histacom2.OS.Win95.Win95Apps txtNumbers.Text = (prevnum / double.Parse(txtNumbers.Text)).ToString(); break; } - prevnum = Int32.Parse(txtNumbers.Text); + prevnum = int.Parse(txtNumbers.Text); operation = ""; } diff --git a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs index d62f676..78fb92b 100644 --- a/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs +++ b/Histacom2/GlobalPrograms/WinClassicDownloader.Designer.cs @@ -36,7 +36,7 @@ this.dlTimer = new System.Windows.Forms.Timer(this.components); this.dlSpeed = new System.Windows.Forms.Timer(this.components); this.progBar = new System.Windows.Forms.ProgressBar(); - this.progressBar1 = new Histacom2.UI.ProgressBar(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); this.SuspendLayout(); // // amountLbl @@ -139,6 +139,6 @@ private System.Windows.Forms.Timer dlTimer; private System.Windows.Forms.Timer dlSpeed; private System.Windows.Forms.ProgressBar progBar; - private UI.ProgressBar progressBar1; + private Engine.UI.ProgressBar progressBar1; } } diff --git a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs index e53ceb3..20a51c7 100644 --- a/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs +++ b/Histacom2/OS/Win95/Win95Apps/Win95Installer.Designer.cs @@ -48,7 +48,7 @@ this.label6 = new System.Windows.Forms.Label(); this.panel4 = new System.Windows.Forms.Panel(); this.label7 = new System.Windows.Forms.Label(); - this.progressBar1 = new Histacom2.UI.ProgressBar(); + this.progressBar1 = new Histacom2.Engine.UI.ProgressBar(); ((System.ComponentModel.ISupportInitialize)(this.installPic)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); @@ -317,7 +317,7 @@ private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label5; private System.Windows.Forms.Panel panel3; - private UI.ProgressBar progressBar1; + private Engine.UI.ProgressBar progressBar1; private System.Windows.Forms.Label label6; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.Label label7; -- cgit v1.2.3